From a4468abb56953ed70de9c611c57da6790099a010 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <anders.nilsson@cs.lth.se>
Date: Sun, 26 Nov 2006 22:06:49 +0100
Subject: [PATCH] Synching
---
CompilerGeneration.jrag | 2 +-
siaras/Siaras.jjt | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index 42eb2ff..1bb803d 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -15,7 +15,7 @@ aspect AbsGrammarGeneration {
pStream.println("Start ::= ComplexElement;");
pStream.println("abstract Thing ::=;");
pStream.println("abstract Element;");
- pStream.println("ComplexElement ::= OwlIdentifier Attribute* Element*;");
+ pStream.println("ComplexElement : Element ::= OwlIdentifier Attribute* Element*;");
// pStream.println("ComplexElement ::= id1:OwlIdentifier id2:OwlIdentifier;");
pStream.println("abstract SimpleElement : Element;");
pStream.println("StringElement : SimpleElement ::= <IDENTIFIER>;");
diff --git a/siaras/Siaras.jjt b/siaras/Siaras.jjt
index 2f21fde..dc33755 100644
--- a/siaras/Siaras.jjt
+++ b/siaras/Siaras.jjt
@@ -236,6 +236,7 @@ SPECIAL_TOKEN : /* COMMENTS */
< ASSIGN : "=" >
| < GT : ">" >
| < LT : "<" >
+ | < END_TAG : "/>" >
// | < BANG : "!" >
// | < TILDE : "~" >
// | < HOOK : "?" >
@@ -273,10 +274,14 @@ SPECIAL_TOKEN : /* COMMENTS */
}// OPERATORS
-// <DEFAULT,BOUNDS> TOKEN : /* TEXT */
-// {
-// < TEXT : <LETTER> (~["<",">"])* >
-// }// TEXT
+<DEFAULT,BOUNDS> TOKEN : /* TEXT */
+{
+ < VALUE_LITERAL:
+ (<LETTER> | <DIGIT>) ( ~["<"] )*
+ >
+}// TEXT
+
+
//--------------------------------------------------------------------//
@@ -359,7 +364,7 @@ void FloatElement() #FloatElement : { Token t; }
void StringElement() #StringElement : { Token t; }
{
- t = <IDENTIFIER>
+ t = <VALUE_LITERAL>
{jjtThis.setIDENTIFIER(t.image);}
}
--
GitLab