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

486 output parsing #490

Merged
merged 6 commits into from
Nov 24, 2023
Merged

486 output parsing #490

merged 6 commits into from
Nov 24, 2023

Conversation

reid-spencer
Copy link
Contributor

@reid-spencer reid-spencer commented Nov 24, 2023 •
edited
Loading

  • Make keywords require space or end-of-input after them
  • Keywords are now cuts
  • Comments are allowed after every definition
  • Comments are allowed at Root scope before and after the definitions
  • Comments are two slashes until the end of line

Corollary changes:

  • Cleaned up the top level parsing so RootContainer includes comments
  • Removed language.parsing.Terminals and split its content out to separate files for ease of use

@reid-spencer
WIP: Add comment parsing support, change whitespace handling
d97f1f8 
Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
@reid-spencer
WIP: Get language module working
3583c53 
Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
@reid-spencer
WIP: Commit to merge comment support branch
eb696fd 
Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
@reid-spencer
Merge branch '6-handle-comments-in-ast' into 486-output-parsing
83b78aa 
# Conflicts:
#	language/src/main/scala/com/reactific/riddl/language/parsing/CommonParser.scala
#	testkit/src/test/input/issues/486.riddl
#	testkit/src/test/scala/com/reactific/riddl/testkit/ReportedIssuesTest.scala
@reid-spencer
WIP: Merge and implement end-of-definition comment
57c1ce8 
Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
@reid-spencer
All tests pass
e7c00ca 
Summary of changes:
* Issue #6 is now implemented. Single line comments are allowed at the
  start and end of the parse and after every kind of definition. The
  comments are captured in the AST
* Keywords are not required to have non-alphanumeric characters after
  them and they introduce a cut

Signed-off-by: reidspencer <reid.spencer@yoppworks.com>
@reid-spencer reid-spencer added the bug Something isn't working label Nov 24, 2023
@reid-spencer reid-spencer added this to the 1.0 - First Full Release milestone Nov 24, 2023
@reid-spencer reid-spencer self-assigned this Nov 24, 2023
This was linked to issues Nov 24, 2023
AST Should Represent Comments Too #6
Closed
multiple issues with output declarations #486
Closed
@reid-spencer reid-spencer merged commit 7ce792e into main Nov 24, 2023
2 of 3 checks passed
@reid-spencer reid-spencer deleted the 486-output-parsing branch November 24, 2023 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@reid-spencer reid-spencer

Labels
bug Something isn't working
Projects
riddl
Status: Done
Milestone
1.0 - First Full Release
Development

Successfully merging this pull request may close these issues.

multiple issues with output declarations AST Should Represent Comments Too
1 participant
@reid-spencer