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.

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

1720 grammar simplification #1732

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Conversation

michaelhkay
Copy link
Contributor

This PR primarily affects the grammar file, simplifying it to remove most of the material that is only there to support the generation of a JavaCC parser (which has probably not been achievable since XPath/XQuery 2.0).

The section of the grammar that defines the binary operators starting with OrExpr is now expressed using conventional production rules, rather than the precedence-based grammar previously used. This allows deletion of some convoluted code in grammar2spec.xsl.

The DTD for the grammar file is revised to exclude many constructs that are no longer used.

Many simple token definitions (especially those that consist of a simple constant string) have been inlined.

Fix #1720

@michaelhkay michaelhkay requested a review from ndw as a code owner January 26, 2025 22:12
@michaelhkay michaelhkay added Editorial Minor typos, wording clarifications, example fixes, etc. Build Affects the build infrastructure only Decluttering Cut out dead wood labels Jan 26, 2025
@ndw ndw added the Propose Merge without Discussion Change is editorial or minor label Jan 27, 2025
@ndw
Copy link
Contributor

ndw commented Jan 28, 2025

At meeting 107, the CG agreed to merge this PR without discussion.

@ndw ndw merged commit 917a5c7 into qt4cg:master Jan 28, 2025
3 checks passed
@michaelhkay michaelhkay added Completed PR has been applied, tests written and tagged, no further action needed and removed Propose Merge without Discussion Change is editorial or minor labels Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build Affects the build infrastructure only Completed PR has been applied, tests written and tagged, no further action needed Decluttering Cut out dead wood Editorial Minor typos, wording clarifications, example fixes, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grammar overhaul
2 participants