Menu
▾
▴
[Exist-commits] SF.net SVN: exist: [6994] trunk/eXist/src/org/exist/xquery/parser
|
From: <el...@us...> - 2007-11-28 07:30:09
|
Revision: 6994
http://exist.svn.sourceforge.net/exist/?rev=6994&view=rev
Author: ellefj
Date: 2007-11-27 23:30:03 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Halfly revert 6981 to a symmetrical behaviour between attribute::name and @name selectors again, in wait for thinking time for a fix.
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/parser/DeclScanner.java
trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.java
trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.txt
trunk/eXist/src/org/exist/xquery/parser/XQueryLexer.java
trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java
trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.java
trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.txt
trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java
trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.java
trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.txt
Modified: trunk/eXist/src/org/exist/xquery/parser/DeclScanner.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/DeclScanner.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/DeclScanner.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "DeclScanner.g" -> "DeclScanner.java"$
+// $ANTLR 2.7.7 (2006-11-01): "DeclScanner.g" -> "DeclScanner.java"$
package org.exist.xquery.parser;
Modified: trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "DeclScanner.g" -> "DeclScanner.java"$
+// $ANTLR 2.7.7 (2006-11-01): "DeclScanner.g" -> "DeclScanner.java"$
package org.exist.xquery.parser;
Modified: trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.txt
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.txt 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/DeclScannerTokenTypes.txt 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: DeclScanner.g -> DeclScannerTokenTypes.txt$
+// $ANTLR 2.7.7 (2006-11-01): DeclScanner.g -> DeclScannerTokenTypes.txt$
DeclScanner // output token vocab name
QNAME=4
PREDICATE=5
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryLexer.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryLexer.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryLexer.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "XQuery.g" -> "XQueryLexer.java"$
+// $ANTLR 2.7.7 (2006-11-01): "XQuery.g" -> "XQueryLexer.java"$
package org.exist.xquery.parser;
@@ -3820,7 +3820,7 @@
synPredMatched509 = false;
}
rewind(_m509);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched509 ) {
match('-');
@@ -3876,7 +3876,7 @@
synPredMatched517 = false;
}
rewind(_m517);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched517 ) {
match('?');
@@ -3927,7 +3927,7 @@
synPredMatched524 = false;
}
rewind(_m524);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched524 ) {
match(']');
@@ -3951,7 +3951,7 @@
synPredMatched527 = false;
}
rewind(_m527);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched527 ) {
{
@@ -4201,7 +4201,7 @@
synPredMatched547 = false;
}
rewind(_m547);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched547 ) {
mDOUBLE_LITERAL(false);
@@ -4270,7 +4270,7 @@
synPredMatched556 = false;
}
rewind(_m556);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched556 ) {
mDOUBLE_LITERAL(false);
@@ -4305,7 +4305,7 @@
synPredMatched542 = false;
}
rewind(_m542);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched542 ) {
mXML_PI(false);
@@ -4369,7 +4369,7 @@
synPredMatched544 = false;
}
rewind(_m544);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched544 ) {
mPARENT(false);
@@ -4511,7 +4511,7 @@
synPredMatched549 = false;
}
rewind(_m549);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched549 ) {
mDECIMAL_LITERAL(false);
@@ -4534,7 +4534,7 @@
synPredMatched551 = false;
}
rewind(_m551);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched551 ) {
mSELF(false);
@@ -4558,7 +4558,7 @@
synPredMatched558 = false;
}
rewind(_m558);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched558 ) {
mDECIMAL_LITERAL(false);
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryParser.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "XQuery.g" -> "XQueryParser.java"$
+// $ANTLR 2.7.7 (2006-11-01): "XQuery.g" -> "XQueryParser.java"$
package org.exist.xquery.parser;
@@ -470,7 +470,7 @@
synPredMatched8 = false;
}
rewind(_m8);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched8 ) {
versionDecl();
@@ -501,7 +501,7 @@
synPredMatched11 = false;
}
rewind(_m11);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched11 ) {
libraryModule();
@@ -805,7 +805,7 @@
synPredMatched21 = false;
}
rewind(_m21);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched21 ) {
setter();
@@ -834,7 +834,7 @@
synPredMatched23 = false;
}
rewind(_m23);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched23 ) {
optionDecl();
@@ -859,7 +859,7 @@
synPredMatched25 = false;
}
rewind(_m25);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched25 ) {
functionDecl();
@@ -884,7 +884,7 @@
synPredMatched27 = false;
}
rewind(_m27);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched27 ) {
varDecl();
@@ -979,7 +979,7 @@
synPredMatched31 = false;
}
rewind(_m31);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched31 ) {
moduleImport();
@@ -1026,7 +1026,7 @@
synPredMatched37 = false;
}
rewind(_m37);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched37 ) {
match(LITERAL_declare);
@@ -1142,7 +1142,7 @@
synPredMatched41 = false;
}
rewind(_m41);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched41 ) {
match(LITERAL_declare);
@@ -1191,7 +1191,7 @@
synPredMatched44 = false;
}
rewind(_m44);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched44 ) {
match(LITERAL_declare);
@@ -1220,7 +1220,7 @@
synPredMatched46 = false;
}
rewind(_m46);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched46 ) {
match(LITERAL_declare);
@@ -1269,7 +1269,7 @@
synPredMatched49 = false;
}
rewind(_m49);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched49 ) {
match(LITERAL_declare);
@@ -1318,7 +1318,7 @@
synPredMatched52 = false;
}
rewind(_m52);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched52 ) {
match(LITERAL_declare);
@@ -1348,7 +1348,7 @@
synPredMatched54 = false;
}
rewind(_m54);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched54 ) {
namespaceDecl();
@@ -1993,7 +1993,7 @@
synPredMatched333 = false;
}
rewind(_m333);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched333 ) {
name=ncnameOrKeyword();
@@ -2227,7 +2227,7 @@
synPredMatched90 = false;
}
rewind(_m90);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched90 ) {
org.exist.xquery.parser.XQueryAST tmp126_AST = null;
@@ -2254,7 +2254,7 @@
synPredMatched92 = false;
}
rewind(_m92);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched92 ) {
org.exist.xquery.parser.XQueryAST tmp129_AST = null;
@@ -2367,7 +2367,7 @@
synPredMatched98 = false;
}
rewind(_m98);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched98 ) {
org.exist.xquery.parser.XQueryAST tmp134_AST = null;
@@ -2394,7 +2394,7 @@
synPredMatched100 = false;
}
rewind(_m100);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched100 ) {
kindTest();
@@ -2669,7 +2669,7 @@
synPredMatched111 = false;
}
rewind(_m111);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched111 ) {
flworExpr();
@@ -2709,7 +2709,7 @@
synPredMatched114 = false;
}
rewind(_m114);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched114 ) {
quantifiedExpr();
@@ -2732,7 +2732,7 @@
synPredMatched116 = false;
}
rewind(_m116);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched116 ) {
ifExpr();
@@ -2755,7 +2755,7 @@
synPredMatched118 = false;
}
rewind(_m118);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched118 ) {
typeswitchExpr();
@@ -2810,7 +2810,7 @@
synPredMatched121 = false;
}
rewind(_m121);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched121 ) {
updateExpr();
@@ -5471,7 +5471,7 @@
synPredMatched241 = false;
}
rewind(_m241);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched241 ) {
org.exist.xquery.parser.XQueryAST tmp248_AST = null;
@@ -5743,7 +5743,7 @@
synPredMatched249 = false;
}
rewind(_m249);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched249 ) {
axisStep();
@@ -5813,7 +5813,7 @@
synPredMatched252 = false;
}
rewind(_m252);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched252 ) {
filterStep();
@@ -5864,7 +5864,7 @@
synPredMatched255 = false;
}
rewind(_m255);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched255 ) {
filterStep();
@@ -6029,7 +6029,7 @@
synPredMatched258 = false;
}
rewind(_m258);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched258 ) {
filterStep();
@@ -6132,7 +6132,7 @@
synPredMatched267 = false;
}
rewind(_m267);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched267 ) {
forwardAxis();
@@ -6157,7 +6157,7 @@
synPredMatched269 = false;
}
rewind(_m269);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched269 ) {
reverseAxis();
@@ -6338,7 +6338,7 @@
synPredMatched278 = false;
}
rewind(_m278);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched278 ) {
kindTest();
@@ -6803,7 +6803,7 @@
synPredMatched282 = false;
}
rewind(_m282);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched282 ) {
wildcard();
@@ -6852,7 +6852,7 @@
synPredMatched285 = false;
}
rewind(_m285);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched285 ) {
match(STAR);
@@ -7010,7 +7010,7 @@
synPredMatched290 = false;
}
rewind(_m290);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched290 ) {
computedConstructor();
@@ -7061,7 +7061,7 @@
synPredMatched293 = false;
}
rewind(_m293);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched293 ) {
computedConstructor();
@@ -7084,7 +7084,7 @@
synPredMatched295 = false;
}
rewind(_m295);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched295 ) {
orderedExpr();
@@ -7107,7 +7107,7 @@
synPredMatched297 = false;
}
rewind(_m297);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched297 ) {
unorderedExpr();
@@ -8500,7 +8500,7 @@
synPredMatched365 = false;
}
rewind(_m365);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched365 ) {
elementWithAttributes();
@@ -8585,7 +8585,7 @@
synPredMatched338 = false;
}
rewind(_m338);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched338 ) {
match(LITERAL_element);
@@ -8914,7 +8914,7 @@
synPredMatched352 = false;
}
rewind(_m352);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched352 ) {
match(LITERAL_attribute);
@@ -9043,7 +9043,7 @@
synPredMatched359 = false;
}
rewind(_m359);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched359 ) {
match(168);
@@ -9140,7 +9140,7 @@
synPredMatched344 = false;
}
rewind(_m344);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched344 ) {
localNamespaceDecl();
@@ -9177,7 +9177,7 @@
synPredMatched348 = false;
}
rewind(_m348);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched348 ) {
localNamespaceDecl();
@@ -9867,7 +9867,7 @@
synPredMatched387 = false;
}
rewind(_m387);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched387 ) {
org.exist.xquery.parser.XQueryAST tmp383_AST = null;
@@ -10036,7 +10036,7 @@
synPredMatched393 = false;
}
rewind(_m393);
- inputState.guessing--;
+inputState.guessing--;
}
if ( synPredMatched393 ) {
org.exist.xquery.parser.XQueryAST tmp391_AST = null;
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "XQuery.g" -> "XQueryParser.java"$
+// $ANTLR 2.7.7 (2006-11-01): "XQuery.g" -> "XQueryParser.java"$
package org.exist.xquery.parser;
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.txt
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.txt 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTokenTypes.txt 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: XQuery.g -> XQueryTokenTypes.txt$
+// $ANTLR 2.7.7 (2006-11-01): XQuery.g -> XQueryTokenTypes.txt$
XQuery // output token vocab name
QNAME=4
PREDICATE=5
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTree.g 2007-11-28 07:30:03 UTC (rev 6994)
@@ -720,10 +720,7 @@
(
qn2:QNAME
{
- QName qname= QName.parse(staticContext, qn2.getText());
- // WM: namespace should not be null as null means: incomplete
- // QName == wildcard
- qname.setNamespaceURI("");
+ QName qname= QName.parse(staticContext, qn2.getText(), "");
type.setNodeName(qname);
}
|
@@ -1630,10 +1627,7 @@
(
attr:QNAME
{
- qname= QName.parse(staticContext, attr.getText());
- // WM: namespace should not be null as null means: incomplete
- // QName == wildcard
-// qname.setNamespaceURI(null);
+ qname= QName.parse(staticContext, attr.getText(), "");
}
|
#( PREFIX_WILDCARD nc2:NCNAME )
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParser.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "XQueryTree.g" -> "XQueryTreeParser.java"$
+// $ANTLR 2.7.7 (2006-11-01): "XQueryTree.g" -> "XQueryTreeParser.java"$
package org.exist.xquery.parser;
@@ -4056,10 +4056,7 @@
match(_t,QNAME);
_t = _t.getNextSibling();
- QName qname= QName.parse(staticContext, qn2.getText());
- // WM: namespace should not be null as null means: incomplete
- // QName == wildcard
- qname.setNamespaceURI("");
+ QName qname= QName.parse(staticContext, qn2.getText(), "");
type.setNodeName(qname);
break;
@@ -6095,10 +6092,7 @@
match(_t,QNAME);
_t = _t.getNextSibling();
- qname= QName.parse(staticContext, attr.getText());
- // WM: namespace should not be null as null means: incomplete
- // QName == wildcard
- // qname.setNamespaceURI(null);
+ qname= QName.parse(staticContext, attr.getText(), "");
break;
}
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.java 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.java 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: "XQueryTree.g" -> "XQueryTreeParser.java"$
+// $ANTLR 2.7.7 (2006-11-01): "XQueryTree.g" -> "XQueryTreeParser.java"$
package org.exist.xquery.parser;
Modified: trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.txt
===================================================================
--- trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.txt 2007-11-27 17:03:30 UTC (rev 6993)
+++ trunk/eXist/src/org/exist/xquery/parser/XQueryTreeParserTokenTypes.txt 2007-11-28 07:30:03 UTC (rev 6994)
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.4: XQueryTree.g -> XQueryTreeParserTokenTypes.txt$
+// $ANTLR 2.7.7 (2006-11-01): XQueryTree.g -> XQueryTreeParserTokenTypes.txt$
XQueryTreeParser // output token vocab name
QNAME=4
PREDICATE=5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|