From 1afaf270b7a9c1c92b162455e461021f3b993329 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 9 Jan 2020 20:06:46 +0100
Subject: [PATCH] Fix parser for NTAToken with implicit (String) type.
---
src/main/jastadd/RelAst.parser | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/jastadd/RelAst.parser b/src/main/jastadd/RelAst.parser
index c6aad99..32236a4 100644
--- a/src/main/jastadd/RelAst.parser
+++ b/src/main/jastadd/RelAst.parser
@@ -70,11 +70,11 @@ Component component =
| ID COL s_type_use.u STAR {: return new ListComponent(ID, u); :}
| s_type_use.u STAR {: return new ListComponent(u.getID(), u); :}
// Opt
- | 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 ID COL s_type_use.u RBRACKET {: return new OptComponent(ID, u); :}
+ | LBRACKET s_type_use.u RBRACKET {: return new OptComponent(u.getID(), u); :}
// NTA list
- | 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 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); :}
// NTA opt
| 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); :}
@@ -83,7 +83,7 @@ Component component =
| SLASH s_type_use.u SLASH {: return new NTAComponent(u.getID(), u); :}
// NTA Token (same as NTA)
| 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
| LT ID COL type_use.u GT {: return new TokenComponent(ID, u); :}
| LT ID GT {: return new TokenComponent(ID, new SimpleTypeUse("String")); :}
--
GitLab