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

Addressing #1200 and #1162 by additional priorities for the Sym non-terminal. The bootstrap and tests all run, but this change requires peer review and manual testing, for which I currently do not have the concentration. #1201

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Addressing #1200 and #1162 by additional priorities for the Sym non-terminal. The bootstrap and tests all run, but this change requires peer review and manual testing, for which I currently do not have the concentration. #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/org/rascalmpl/library/lang/rascal/syntax/Rascal.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,29 +103,25 @@ syntax Sym
| parameter: "&" Nonterminal nonterminal
| parametrized: Nonterminal nonterminal >> "[" "[" {Sym ","}+ parameters "]"
| \start: "start" "[" Nonterminal nonterminal "]"
| labeled: Sym symbol NonterminalLabel label
// literals
| characterClass: Class charClass
| literal: StringConstant string
| caseInsensitiveLiteral: CaseInsensitiveStringConstant cistring
// regular expressions
| iter: Sym symbol "+"
| iterStar: Sym symbol "*"
| iterSep: "{" Sym symbol Sym sep "}" "+"
| iterStarSep: "{" Sym symbol Sym sep "}" "*"
| optional: Sym symbol "?"
| alternative: "(" Sym first "|" {Sym "|"}+ alternatives ")"
| sequence: "(" Sym first Sym+ sequence ")"
// TODO: MinimalIter: Sym symbol IntegerConstant minimal "+"
// TODO: MinimalIterSep: "{" Sym symbol Symbol sep "}" IntegerConstant minimal "+"
// TODO | Permutation: "(" Sym first "~" {Sym "~"}+ participants ")"
// TODO | Combination: "(" Sym first "#" {Sym "#"}+ elements ")"
| empty: "(" ")"
// conditionals
| column: Sym symbol "@" IntegerLiteral column
| endOfLine: Sym symbol "$"
| startOfLine: "^" Sym symbol
> column: Sym symbol "@" IntegerLiteral column
| labeled: Sym symbol NonterminalLabel label
| optional: Sym symbol "?"
| endOfLine: Sym symbol "$"
| except: Sym symbol "!" NonterminalLabel label
| iter: Sym symbol "+"
| iterStar: Sym symbol "*"
>
assoc (
left ( follow: Sym symbol "\>\>" Sym match
Expand Down
Loading