[Mulgara-svn] r612 - branches/mgr-61-sparql/src/jar/sparql/grammar

[pag at mulgara.org]

Author: pag
Date: 2007-12-10 11:22:22 -0600 (Mon, 10 Dec 2007)
New Revision: 612

Modified:
   branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex
   branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar
Log:
Cleaned up some of the terminals

Modified: branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex	2007-12-10 16:03:25 UTC (rev 611)
+++ branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex	2007-12-10 17:22:22 UTC (rev 612)
@@ -60,8 +60,8 @@
 StringLiteralLongDelim1 = "'''"
 StringLiteralLongDelim2 = \"\"\"
 Echar = "\\" [tbnrf'\"\\]
-LiteralChar1 = (([^\x27\x5C\x0A\x0D]) | {Echar})*
-LiteralChar2 = (([^\x22\x5C\x0A\x0D]) | {Echar})*
+LiteralChars1 = (([^\x27\x5C\x0A\x0D]) | {Echar})*
+LiteralChars2 = (([^\x22\x5C\x0A\x0D]) | {Echar})*
 WS = \u0020 | \u0009 | \u000D | \u000A
 Nil = "(" {WS}* ")"
 Anon = "[" {WS}* "]"
@@ -74,7 +74,7 @@
 PnLocal = ({PnCharsU} | [0-9]) (({PnChars} | ".")* {PnChars})?
 
 
-OrderBy = "ORDER" {WhiteSpace}+ "BY" 
+OrderBy = "ORDER" {WhiteSpace}+ "BY"
 
 
 %state YYSTRING_LITERAL_LONG1
@@ -104,8 +104,8 @@
   {Nil}                       { return newToken(NIL); }
   {StringLiteralLongDelim1}   { string.setLength(0); yybegin(YYSTRING_LITERAL_LONG1); }
   {StringLiteralLongDelim2}   { string.setLength(0); yybegin(YYSTRING_LITERAL_LONG2); }
-  "'" {LiteralChar1} "'"      { return newToken(STRING_LITERAL, unquote(yytext())); }
-  \" {LiteralChar2} \"        { return newToken(STRING_LITERAL, unquote(yytext())); }
+  "'" {LiteralChars1} "'"     { return newToken(STRING_LITERAL, unquote(yytext())); }
+  \" {LiteralChars2} \"       { return newToken(STRING_LITERAL, unquote(yytext())); }
   "TRUE" | "true"             { return newToken(BOOLEAN, yytext()); }
   "FALSE" | "false"           { return newToken(BOOLEAN, yytext()); }
 
@@ -162,13 +162,13 @@
 
 <YYSTRING_LITERAL_LONG1> {
   {StringLiteralLongDelim1}      { yybegin(YYINITIAL); return newToken(STRING_LITERAL, string.toString()); }
-  ([^'\\] | {Echar})*           { string.append(yytext()); }
+  ([^'\\] | {Echar})*            { string.append(yytext()); }
   "'"                            { string.append("'"); }
 }
 
 <YYSTRING_LITERAL_LONG2> {
   {StringLiteralLongDelim2}      {yybegin(YYINITIAL); return newToken(STRING_LITERAL, string.toString()); }
-  ([^\"\\] | {Echar})*          { string.append(yytext()); }
+  ([^\"\\] | {Echar})*           { string.append(yytext()); }
   \"                             { string.append("\""); }
 }
 

Modified: branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar	2007-12-10 16:03:25 UTC (rev 611)
+++ branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar	2007-12-10 17:22:22 UTC (rev 612)
@@ -558,14 +558,10 @@
   
 iri_ref
   = IRI_REF
-  | pname_ln
+  | PNAME_NS.ns PN_LOCAL.local                              {: return new Symbol(ns + local); :}
   | PNAME_NS
   ;
 
-pname_ln
-  = PNAME_NS.ns PN_LOCAL.local                              {: return new Symbol(ns + local); :}
-  ;
-
 blank_node
   = BLANK_NODE.bn
   | ANON              {: return new BlankNode(); :}