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

Parser #132

Merged
merged 50 commits into from
Jul 19, 2024
Merged

Parser #132

merged 50 commits into from
Jul 19, 2024

Conversation

marcelfloe
Copy link
Contributor

@marcelfloe marcelfloe commented Jul 11, 2024 •
edited by danieldietzler
Loading

Closes #44

marcelfloe and others added 20 commits June 27, 2024 13:44
@marcelfloe
implemented yml parser and added first ucdl-tokens
6e40eb8
@marcelfloe
Specification of existing Ucdl-Tokens.
1a92eb6
@marcelfloe
Adding more ucdl-Tokens and comments.
e84eff2
@marcelfloe
Moved ucdl-Tokens and renamed dto-package from parser to ucdl.
0efe9b1
@marcelfloe
Moved AST-components into their own subpackage.
18d8f7d
@marcelfloe
Implementing the 4 existing AST-Components.
eebbb50
@danieldietzler
add parser
b8dc9ee
@marcelfloe
Replaced javacc classes.
0fe3667
@marcelfloe
Including ucdl-file with 3 valid definitions and modifies UftosApplic…
ba5ec19 
…ation.java for automatic testing of the definitions in the ucdl.yml file on startup.
@marcelfloe
Updated Parser.
d634b62
@marcelfloe
Updated Parser again.
97bcf45 
Seems to work unless there will be new grammar changes.
@marcelfloe
Updated Parser again.
75c393a 
Fixed problem with expecting <EOF> after each DEFINITION instead of START.
@marcelfloe
Updated Parser again: Nodes now keep their tokens.
6a92d40 
Also started implementing translation from javacc to AbstractSyntaxTree.
@marcelfloe
Implemented sematic check for legal flatmap operations and parses Ele…
22789c6 
…ments.
@marcelfloe
Added grammar-file.
22b079d 
Fixed Exception-forwarding.
Replaced wrong ParseException with correct one.
@marcelfloe
Parser implementation finished.
3cf3042 
Requires a lot of refactoring, but should work.
@marcelfloe
Startet refactoring and resolved checkstyle (suppressed checkstyle in…
5b0a6c4 
… generated files from javacc).
@marcelfloe
Further minor refactoring.
def1730
@marcelfloe
Adjusted grammar file.
57227aa 
Fixed error forwarding inside SyntaxChecker.parseString().
Removed unnecessary import in UftosApplication.
Fixed consistency check for if-bodies.
Updated warning suppression in generated javacc-files.
@marcelfloe
Removed automatic parsing of ucdl.yml whenever the application starts.
a5aa4c7
danieldietzler
danieldietzler reviewed Jul 13, 2024
View reviewed changes
Copy link
Contributor

@danieldietzler danieldietzler left a comment

Choose a reason for hiding this comment

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

Haven't looked at the DefinitionParser yet but everything else looks super clean actually! Much better than I expected 😅

server/src/main/java/de/uftos/dto/ucdl/ast/ControlSequenceDto.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/UcdlParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/UcdlParser.java Outdated Show resolved Hide resolved
server/ucdl/ucdl.yml Outdated Show resolved Hide resolved
danieldietzler
danieldietzler reviewed Jul 17, 2024
View reviewed changes
Copy link
Contributor

@danieldietzler danieldietzler left a comment

Choose a reason for hiding this comment

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

TBH I didn't completely understand (and thus validate) the logic of the parser. I tried my best and I think it looks good, but it's also very complex, so.... My focus was on readability and refactoring stuff for the most part

server/checkstyle.xml Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/UcdlRepositoryImpl.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Show resolved Hide resolved
server/src/main/java/de/uftos/repositories/ucdl/parser/DefinitionParser.java Outdated Show resolved Hide resolved
@marcelfloe
Trying to revert the changes in the checkstyle.xml.
2f49857
@marcelfloe
Removed unnecessary method in UcdlRepositoryImpl.
f47dae6 
Cloning Hashmaps in DefinitionParser.
Removed unnecessary line break in DefinitionParser.
Parsing boolean in DefinitionParser.
Added comment about magic numbers in DefinitionParser.
Fixed Typo in DefinitionParser.
And even more...
@marcelfloe
Updated comments to reflect the actual implementation.
115c3aa
@marcelfloe
Refactoring code duplication for quantifiers, binary operators and un…
9d19f25 
…ary operators.
@marcelfloe
Updated parser.
1b2bc42 
Removed Option "=" for equals.
Including "_" in the names of Nodes.
@marcelfloe
Updated comment because of missing '_'.
f932de7
@marcelfloe
Updated IOException to BadRequestException.
19743e4
@marcelfloe
Refactoring some if-conditions.
2523a22
@marcelfloe
Updated return statements in "IF"-case.
64a1af8
@marcelfloe
Updated if-conditions in "FILTER"-case.
3c2ee7a
@marcelfloe
Now throwing a ParseException if a parameter called "this" gets defined.
a079d45
@marcelfloe
Changing the switch-types and including new Exception in ValueReferen…
41cd970 
…ce-case.
@marcelfloe
Reduced code duplication.
50024a2
danieldietzler
danieldietzler approved these changes Jul 18, 2024
View reviewed changes
Copy link
Contributor

@danieldietzler danieldietzler left a comment

Choose a reason for hiding this comment

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

Thank you very much for putting all this effort into this!

@marcelfloe marcelfloe merged commit c9fcc07 into main Jul 19, 2024
3 checks passed
@marcelfloe marcelfloe deleted the parser branch July 19, 2024 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danieldietzler danieldietzler danieldietzler approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

server: parser
3 participants
@marcelfloe @danieldietzler @SuperMarcomen