Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PEG grammars for UWDs #944

Merged
merged 55 commits into from
Dec 20, 2024
Merged

PEG grammars for UWDs #944

merged 55 commits into from
Dec 20, 2024

Conversation

jpfairbanks
Copy link
Member

This PR migrates the UWD grammar from SyntacticModels.jl to upstream Catlab.

cscaff added 30 commits October 14, 2024 15:50
@cscaff
Imported Base Relational Parser into CatLab
105528c
@cscaff
Added RelationalParser from SyntacticModels into CatLab. Need to clea…
ee40bf5 
…n up.
@cscaff
Added PEG Dependencies
992a04e
@cscaff
Constructed New Folder for ADT Representations
fc065a7
@cscaff
Imported core SyntacticModels components needed for RelationTerm.jl. …
11df8de 
…Not yet functional.
@cscaff
ADTsbase replaced with ADTsCore - Only contains neccessary ADT featur…
b21091f 
…es for RelationTerm so far.

RelationTerm now compiling.
@cscaff
commit for draft pr
6d8953b
@cscaff
RelationTerm Now Compiling
a39a432
@cscaff
Removed UWDModel from RelationTerm
5eb0e39
@cscaff
Modified UWDExpr to hold list of outer ports, added getter for outer …
5e655d9 
…ports, modified construct for outer ports.
@cscaff
Implementing UWD Construct to mimic relationProgram parser ACSet Cons…
85c66f4 
…truction
@cscaff
Construct Implemented for relations without names
2868210
@cscaff
Added Typed UWD Test
471ecd4
@cscaff
ADT now supports port names
b76268f
@cscaff
Implemented Port Names into Show Function
a6c41f8
@cscaff
Modified a few comments
27434d2
@cscaff
Overhauling "parse_relation_diagram" to build ADT. WIP
bb9c57d
@cscaff
Added Outer ports to show for debugging purposes. Not finished show i…
501b7ce 
…mplementation.
@cscaff
Fixing inference in RelationTerm - Bed Time
c33c34e
@cscaff
Inferred Test Case for RelationTerm Passing
da4ed19
@cscaff
Moved RelationalProgram.jl data type definitions into RelationTerm.jl
7e6e569
@cscaff
Implemented Port Naming Inference inside RelationTerm.
dc1ed9d
@cscaff
Updated Imports for RelationDiagrams
d568a19
@cscaff
Updated Show function in RelationTerm to mimic @relation macro more.
f95d74d
@cscaff
Modified arguments in PEG Parser to support named ports.
01d09f8
@cscaff
Outer Ports added to PEG Parser for UWD's
ece9f91
@cscaff
Statement updated based on new arg implmentation and port naming.
1484fed
@cscaff
Context updated to support untyped vars.
ee72bbb
@cscaff
Added ability to have zero args/judgements
69539d3
@cscaff
Implemented Error Handling for uninferred vars.
0e0c76d
@jpfairbanks
Copy link
Member Author

@cscaff, this branch has conflicts with main. Please fix them so that we can merge this.

@cscaff
Copy link
Contributor

cscaff commented Dec 18, 2024

@cscaff, this branch has conflicts with main. Please fix them so that we can merge this.

Sounds good. I'll get on that and update you.

@cscaff
Copy link
Contributor

cscaff commented Dec 18, 2024

Ok, @jpfairbanks I should have fixed the conflicting issues.

@jpfairbanks
Copy link
Member Author

It looks like the build failed on linux. It can't find the ADTs.jl file, I know that paths are case sensitive on linux, but not windows and mac, so that might be the problem.

@quffaro
Copy link
Member

quffaro commented Dec 19, 2024 •
edited
Loading

That's the issue. I've verified locally that changing to the include statement in the main file to include("ADTs/ADTs.jl") will resolve this issue. I don't have permission to push the fix to your fork @cscaff but it's a small change.

@cscaff
Copy link
Contributor

cscaff commented Dec 20, 2024

Ok, I think I've resolved it. I made that change in the main src and test files. Looks like everything still runs on my end on Windows 10.

quffaro
quffaro reviewed Dec 20, 2024
View reviewed changes
test/runtests.jl
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change was not necessary because it correctly specified the path of the file, but the folders are inconsistently capitalized.

@quffaro quffaro merged commit 4ed09a1 into AlgebraicJulia:main Dec 20, 2024
9 checks passed
@epatters epatters changed the title WIP: Cscaff/peg uwd PEG grammars for UWDs Dec 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quffaro quffaro quffaro approved these changes

Assignees
No one assigned
Labels
enhancement wiring diagrams
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jpfairbanks @cscaff @quffaro @epatters