Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relational-rags
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
relational-rags
Commits
1afaf270
Commit
1afaf270
authored
5 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
Fix parser for NTAToken with implicit (String) type.
parent
95d16c44
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/jastadd/RelAst.parser
+5
-5
5 additions, 5 deletions
src/main/jastadd/RelAst.parser
with
5 additions
and
5 deletions
src/main/jastadd/RelAst.parser
+
5
−
5
View file @
1afaf270
...
@@ -70,11 +70,11 @@ Component component =
...
@@ -70,11 +70,11 @@ Component component =
| ID COL s_type_use.u STAR {: return new ListComponent(ID, u); :}
| ID COL s_type_use.u STAR {: return new ListComponent(ID, u); :}
| s_type_use.u STAR {: return new ListComponent(u.getID(), u); :}
| s_type_use.u STAR {: return new ListComponent(u.getID(), u); :}
// Opt
// Opt
| LBRACKET ID COL s_type_use.u RBRACKET {: return new OptComponent(ID, u); :}
| LBRACKET ID COL s_type_use.u RBRACKET
{: return new OptComponent(ID, u); :}
| LBRACKET s_type_use.u RBRACKET {: return new OptComponent(u.getID(), u); :}
| LBRACKET s_type_use.u RBRACKET
{: return new OptComponent(u.getID(), u); :}
// NTA list
// NTA list
| SLASH ID COL s_type_use.u STAR SLASH {: return new NTAListComponent(ID, u); :}
| SLASH ID COL s_type_use.u STAR SLASH
{: return new NTAListComponent(ID, u); :}
| SLASH s_type_use.u STAR SLASH {: return new NTAListComponent(u.getID(), u); :}
| SLASH s_type_use.u STAR SLASH
{: return new NTAListComponent(u.getID(), u); :}
// NTA opt
// NTA opt
| SLASH LBRACKET ID COL s_type_use.u RBRACKET SLASH {: return new NTAOptComponent(ID, u); :}
| SLASH LBRACKET ID COL s_type_use.u RBRACKET SLASH {: return new NTAOptComponent(ID, u); :}
| SLASH LBRACKET s_type_use.u RBRACKET SLASH {: return new NTAOptComponent(u.getID(), u); :}
| SLASH LBRACKET s_type_use.u RBRACKET SLASH {: return new NTAOptComponent(u.getID(), u); :}
...
@@ -83,7 +83,7 @@ Component component =
...
@@ -83,7 +83,7 @@ Component component =
| SLASH s_type_use.u SLASH {: return new NTAComponent(u.getID(), u); :}
| SLASH s_type_use.u SLASH {: return new NTAComponent(u.getID(), u); :}
// NTA Token (same as NTA)
// NTA Token (same as NTA)
| SLASH LT ID COL s_type_use.u GT SLASH {: return new NTATokenComponent(ID, u); :}
| SLASH LT ID COL s_type_use.u GT SLASH {: return new NTATokenComponent(ID, u); :}
| SLASH LT
s_type_use.u GT SLASH
{: return new NTATokenComponent(
u.getID(), u
); :}
| SLASH LT
ID GT SLASH
{: return new NTATokenComponent(
ID, new SimpleTypeUse("String")
); :}
// Token
// Token
| LT ID COL type_use.u GT {: return new TokenComponent(ID, u); :}
| LT ID COL type_use.u GT {: return new TokenComponent(ID, u); :}
| LT ID GT {: return new TokenComponent(ID, new SimpleTypeUse("String")); :}
| LT ID GT {: return new TokenComponent(ID, new SimpleTypeUse("String")); :}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment