[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQueryParserTokenTypes.txt,1.11,1.12 XQueryLexer.java,1.12,1.13 XQueryParser.java,1.18,1.19 XQueryTreeParser.java,1.18,1.19 XQueryParserTokenTypes.java,1.9,1.10

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24902/src/org/exist/xquery/parser

Modified Files:
	XQueryParserTokenTypes.txt XQueryLexer.java XQueryParser.java 
	XQueryTreeParser.java XQueryParserTokenTypes.java 
Log Message:
Refactored some methods to improve performance during storage and indexing.

Index: XQueryTreeParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryTreeParser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** XQueryTreeParser.java	7 Aug 2004 16:28:03 -0000	1.18
--- XQueryTreeParser.java	10 Aug 2004 20:27:17 -0000	1.19
***************
*** 114,118 ****
  			case XPOINTER:
  			{
! 				AST __t277 = _t;
  				org.exist.xquery.parser.XQueryAST tmp1_AST_in = (org.exist.xquery.parser.XQueryAST)_t;
  				match(_t,XPOINTER);
--- 114,118 ----
  			case XPOINTER:
  			{
! 				AST __t278 = _t;
  				org.exist.xquery.parser.XQueryAST tmp1_AST_in = (org.exist.xquery.parser.XQueryAST)_t;
[...2999 lines suppressed...]
  	private static final long[] mk_tokenSet_0() {
! 		long[] data = { 1442915454462623632L, -5765733423243055566L, 201850867L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
  	private static final long[] mk_tokenSet_1() {
! 		long[] data = { 1152925765217026048L, 0L, 134217731L, 0L, 0L, 0L};
  		return data;
  	}
--- 5414,5423 ----
  	
  	private static final long[] mk_tokenSet_0() {
! 		long[] data = { 1442915454462623632L, -5765733423243055566L, 403177459L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
  	private static final long[] mk_tokenSet_1() {
! 		long[] data = { 1152925765217026048L, 0L, 268435459L, 0L, 0L, 0L};
  		return data;
  	}

Index: XQueryParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryParser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** XQueryParser.java	7 Aug 2004 16:28:03 -0000	1.18
--- XQueryParser.java	10 Aug 2004 20:27:16 -0000	1.19
***************
*** 5917,5921 ****
  		
  		{
! 		_loop268:
  		do {
  			if ((_tokenSet_13.member(LA(1)))) {
--- 5917,5921 ----
  		
  		{
! 		_loop269:
  		do {
[...1208 lines suppressed...]
  		data[1]=-18014400656965633L;
! 		data[2]=35184372088831L;
  		return data;
  	}
  	public static final BitSet _tokenSet_12 = new BitSet(mk_tokenSet_12());
  	private static final long[] mk_tokenSet_13() {
! 		long[] data = { 1152921504606846976L, 1073741824L, 4194307L, 0L, 0L, 0L};
  		return data;
  	}
--- 7115,7124 ----
  		data[0]=-16L;
  		data[1]=-18014400656965633L;
! 		data[2]=70368744177663L;
  		return data;
  	}
  	public static final BitSet _tokenSet_12 = new BitSet(mk_tokenSet_12());
  	private static final long[] mk_tokenSet_13() {
! 		long[] data = { 1152921504606846976L, 1073741824L, 8388611L, 0L, 0L, 0L};
  		return data;
  	}

Index: XQueryParserTokenTypes.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryParserTokenTypes.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XQueryParserTokenTypes.java	29 Jun 2004 14:23:26 -0000	1.9
--- XQueryParserTokenTypes.java	10 Aug 2004 20:27:17 -0000	1.10
***************
*** 172,198 ****
  	int END_TAG_START = 147;
  	int QUOT = 148;
! 	int ATTRIBUTE_CONTENT = 149;
! 	int ELEMENT_CONTENT = 150;
! 	int XML_COMMENT_END = 151;
! 	int XML_PI_END = 152;
! 	int LITERAL_collection = 153;
! 	int LITERAL_preceding = 154;
! 	int COMP_DOC_CONSTRUCTOR = 155;
! 	int XML_PI_START = 156;
! 	int LETTER = 157;
! 	int DIGITS = 158;
! 	int HEX_DIGITS = 159;
! 	int NMSTART = 160;
! 	int NMCHAR = 161;
! 	int WS = 162;
! 	int EXPR_COMMENT = 163;
! 	int PREDEFINED_ENTITY_REF = 164;
! 	int CHAR_REF = 165;
! 	int NEXT_TOKEN = 166;
! 	int CHAR = 167;
! 	int BASECHAR = 168;
! 	int IDEOGRAPHIC = 169;
! 	int COMBINING_CHAR = 170;
! 	int DIGIT = 171;
! 	int EXTENDER = 172;
  }
--- 172,199 ----
  	int END_TAG_START = 147;
  	int QUOT = 148;
! 	int APOS = 149;
! 	int ATTRIBUTE_CONTENT = 150;
! 	int ELEMENT_CONTENT = 151;
! 	int XML_COMMENT_END = 152;
! 	int XML_PI_END = 153;
! 	int LITERAL_collection = 154;
! 	int LITERAL_preceding = 155;
! 	int COMP_DOC_CONSTRUCTOR = 156;
! 	int XML_PI_START = 157;
! 	int LETTER = 158;
! 	int DIGITS = 159;
! 	int HEX_DIGITS = 160;
! 	int NMSTART = 161;
! 	int NMCHAR = 162;
! 	int WS = 163;
! 	int EXPR_COMMENT = 164;
! 	int PREDEFINED_ENTITY_REF = 165;
! 	int CHAR_REF = 166;
! 	int NEXT_TOKEN = 167;
! 	int CHAR = 168;
! 	int BASECHAR = 169;
! 	int IDEOGRAPHIC = 170;
! 	int COMBINING_CHAR = 171;
! 	int DIGIT = 172;
! 	int EXTENDER = 173;
  }

Index: XQueryLexer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryLexer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XQueryLexer.java	7 Aug 2004 16:28:02 -0000	1.12
--- XQueryLexer.java	10 Aug 2004 20:27:16 -0000	1.13
***************
*** 84,88 ****
  	literals.put(new ANTLRHashString("where", this), new Integer(76));
  	literals.put(new ANTLRHashString("then", this), new Integer(87));
! 	literals.put(new ANTLRHashString("preceding", this), new Integer(154));
  	literals.put(new ANTLRHashString("document-node", this), new Integer(125));
  	literals.put(new ANTLRHashString("to", this), new Integer(109));
--- 84,88 ----
  	literals.put(new ANTLRHashString("where", this), new Integer(76));
  	literals.put(new ANTLRHashString("then", this), new Integer(87));
! 	literals.put(new ANTLRHashString("preceding", this), new Integer(155));
  	literals.put(new ANTLRHashString("document-node", this), new Integer(125));
  	literals.put(new ANTLRHashString("to", this), new Integer(109));
***************
*** 112,116 ****
  	literals.put(new ANTLRHashString("following-sibling", this), new Integer(138));
  	literals.put(new ANTLRHashString("node", this), new Integer(121));
! 	literals.put(new ANTLRHashString("collection", this), new Integer(153));
  	literals.put(new ANTLRHashString("some", this), new Integer(73));
  	literals.put(new ANTLRHashString("ge", this), new Integer(101));
--- 112,116 ----
  	literals.put(new ANTLRHashString("following-sibling", this), new Integer(138));
  	literals.put(new ANTLRHashString("node", this), new Integer(121));
! 	literals.put(new ANTLRHashString("collection", this), new Integer(154));
  	literals.put(new ANTLRHashString("some", this), new Integer(73));
  	literals.put(new ANTLRHashString("ge", this), new Integer(101));
***************
*** 510,513 ****
--- 510,526 ----
  	}
  	
+ 	protected final void mAPOS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+ 		int _ttype; Token _token=null; int _begin=text.length();
+ 		_ttype = APOS;
+ 		int _saveIndex;
+ 		
+ 		match("'");
+ 		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+ 			_token = makeToken(_ttype);
+ 			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+ 		}
+ 		_returnToken = _token;
+ 	}
+ 	
  	protected final void mLTEQ(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
  		int _ttype; Token _token=null; int _begin=text.length();
***************
*** 2165,2170 ****
  		
  		{
! 		int _cnt502=0;
! 		_loop502:
  		do {
  			if ((_tokenSet_3.member(LA(1)))) {
--- 2178,2183 ----
  		
  		{
! 		int _cnt504=0;
! 		_loop504:
  		do {
  			if ((_tokenSet_3.member(LA(1)))) {
***************
*** 2172,2179 ****
  			}
  			else {
! 				if ( _cnt502>=1 ) { break _loop502; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			
! 			_cnt502++;
  		} while (true);
  		}
--- 2185,2192 ----
  			}
  			else {
! 				if ( _cnt504>=1 ) { break _loop504; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			
! 			_cnt504++;
  		} while (true);
  		}
***************
*** 2316,2321 ****
  		
  		{
! 		int _cnt505=0;
! 		_loop505:
  		do {
  			switch ( LA(1)) {
--- 2329,2334 ----
  		
  		{
! 		int _cnt507=0;
! 		_loop507:
  		do {
  			switch ( LA(1)) {
***************
*** 2341,2348 ****
  			default:
  			{
! 				if ( _cnt505>=1 ) { break _loop505; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt505++;
  		} while (true);
  		}
--- 2354,2361 ----
  			default:
  			{
! 				if ( _cnt507>=1 ) { break _loop507; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt507++;
  		} while (true);
  		}
***************
*** 3068,3072 ****
  		mNMSTART(false);
  		{
! 		_loop512:
  		do {
  			if ((_tokenSet_6.member(LA(1)))) {
--- 3081,3085 ----
  		mNMSTART(false);
  		{
! 		_loop514:
  		do {
  			if ((_tokenSet_6.member(LA(1)))) {
***************
*** 3074,3078 ****
  			}
  			else {
! 				break _loop512;
  			}
  			
--- 3087,3091 ----
  			}
  			else {
! 				break _loop514;
  			}
  			
***************
*** 3093,3098 ****
  		
  		{
! 		int _cnt515=0;
! 		_loop515:
  		do {
  			switch ( LA(1)) {
--- 3106,3111 ----
  		
  		{
! 		int _cnt517=0;
! 		_loop517:
  		do {
  			switch ( LA(1)) {
***************
*** 3122,3129 ****
  			default:
  			{
! 				if ( _cnt515>=1 ) { break _loop515; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt515++;
  		} while (true);
  		}
--- 3135,3142 ----
  			default:
  			{
! 				if ( _cnt517>=1 ) { break _loop517; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt517++;
  		} while (true);
  		}
***************
*** 3142,3151 ****
  		match("(:");
  		{
! 		_loop521:
  		do {
! 			boolean synPredMatched520 = false;
  			if (((LA(1)==':') && (_tokenSet_7.member(LA(2))) && (_tokenSet_7.member(LA(3))))) {
! 				int _m520 = mark();
! 				synPredMatched520 = true;
  				inputState.guessing++;
  				try {
--- 3155,3164 ----
  		match("(:");
  		{
! 		_loop523:
  		do {
! 			boolean synPredMatched522 = false;
  			if (((LA(1)==':') && (_tokenSet_7.member(LA(2))) && (_tokenSet_7.member(LA(3))))) {
! 				int _m522 = mark();
! 				synPredMatched522 = true;
  				inputState.guessing++;
  				try {
***************
*** 3158,3167 ****
  				}
  				catch (RecognitionException pe) {
! 					synPredMatched520 = false;
  				}
! 				rewind(_m520);
  				inputState.guessing--;
  			}
! 			if ( synPredMatched520 ) {
  				match(':');
  			}
--- 3171,3180 ----
  				}
  				catch (RecognitionException pe) {
! 					synPredMatched522 = false;
  				}
! 				rewind(_m522);
  				inputState.guessing--;
  			}
! 			if ( synPredMatched522 ) {
  				match(':');
  			}
***************
*** 3170,3174 ****
  			}
  			else {
! 				break _loop521;
  			}
  			
--- 3183,3187 ----
  			}
  			else {
! 				break _loop523;
  			}
  			
***************
*** 3273,3277 ****
  				match('.');
  				{
! 				_loop529:
  				do {
  					if ((_tokenSet_3.member(LA(1)))) {
--- 3286,3290 ----
  				match('.');
  				{
! 				_loop531:
  				do {
  					if ((_tokenSet_3.member(LA(1)))) {
***************
*** 3279,3283 ****
  					}
  					else {
! 						break _loop529;
  					}
  					
--- 3292,3296 ----
  					}
  					else {
! 						break _loop531;
  					}
  					
***************
*** 3367,3371 ****
  				match('.');
  				{
! 				_loop537:
  				do {
  					if ((_tokenSet_3.member(LA(1)))) {
--- 3380,3384 ----
  				match('.');
  				{
! 				_loop539:
  				do {
  					if ((_tokenSet_3.member(LA(1)))) {
***************
*** 3373,3377 ****
  					}
  					else {
! 						break _loop537;
  					}
  					
--- 3386,3390 ----
  					}
  					else {
! 						break _loop539;
  					}
  					
***************
*** 3481,3485 ****
  			text.setLength(_saveIndex);
  			{
! 			_loop547:
  			do {
  				if ((LA(1)=='&') && (LA(2)=='a'||LA(2)=='g'||LA(2)=='l'||LA(2)=='q')) {
--- 3494,3498 ----
  			text.setLength(_saveIndex);
  			{
! 			_loop549:
  			do {
  				if ((LA(1)=='&') && (LA(2)=='a'||LA(2)=='g'||LA(2)=='l'||LA(2)=='q')) {
***************
*** 3503,3507 ****
  				}
  				else {
! 					break _loop547;
  				}
  				
--- 3516,3520 ----
  				}
  				else {
! 					break _loop549;
  				}
  				
***************
*** 3519,3523 ****
  			text.setLength(_saveIndex);
  			{
! 			_loop551:
  			do {
  				if ((LA(1)=='&') && (LA(2)=='a'||LA(2)=='g'||LA(2)=='l'||LA(2)=='q')) {
--- 3532,3536 ----
  			text.setLength(_saveIndex);
  			{
! 			_loop553:
  			do {
  				if ((LA(1)=='&') && (LA(2)=='a'||LA(2)=='g'||LA(2)=='l'||LA(2)=='q')) {
***************
*** 3541,3545 ****
  				}
  				else {
! 					break _loop551;
  				}
  				
--- 3554,3558 ----
  				}
  				else {
! 					break _loop553;
  				}
  				
***************
*** 3569,3574 ****
  		
  		{
! 		int _cnt554=0;
! 		_loop554:
  		do {
  			switch ( LA(1)) {
--- 3582,3587 ----
  		
  		{
! 		int _cnt556=0;
! 		_loop556:
  		do {
  			switch ( LA(1)) {
***************
*** 3642,3649 ****
  				}
  			else {
! 				if ( _cnt554>=1 ) { break _loop554; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt554++;
  		} while (true);
  		}
--- 3655,3662 ----
  				}
  			else {
! 				if ( _cnt556>=1 ) { break _loop556; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt556++;
  		} while (true);
  		}
***************
*** 3661,3666 ****
  		
  		{
! 		int _cnt557=0;
! 		_loop557:
  		do {
  			switch ( LA(1)) {
--- 3674,3679 ----
  		
  		{
! 		int _cnt559=0;
! 		_loop559:
  		do {
  			switch ( LA(1)) {
***************
*** 3724,3731 ****
  				}
  			else {
! 				if ( _cnt557>=1 ) { break _loop557; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt557++;
  		} while (true);
  		}
--- 3737,3744 ----
  				}
  			else {
! 				if ( _cnt559>=1 ) { break _loop559; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  			}
  			}
! 			_cnt559++;
  		} while (true);
  		}
***************
*** 3746,3751 ****
  		text.setLength(_saveIndex);
  		{
! 		int _cnt564=0;
! 		_loop564:
  		do {
  			if ((_tokenSet_12.member(LA(1)))) {
--- 3759,3764 ----
  		text.setLength(_saveIndex);
  		{
! 		int _cnt566=0;
! 		_loop566:
  		do {
  			if ((_tokenSet_12.member(LA(1)))) {
***************
*** 3755,3762 ****
  			}
  			else {
! 				boolean synPredMatched563 = false;
  				if (((LA(1)=='-'))) {
! 					int _m563 = mark();
! 					synPredMatched563 = true;
  					inputState.guessing++;
  					try {
--- 3768,3775 ----
  			}
  			else {
! 				boolean synPredMatched565 = false;
  				if (((LA(1)=='-'))) {
! 					int _m565 = mark();
! 					synPredMatched565 = true;
  					inputState.guessing++;
  					try {
***************
*** 3769,3785 ****
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched563 = false;
  					}
! 					rewind(_m563);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched563 ) {
  					match('-');
  				}
  				else {
! 					if ( _cnt564>=1 ) { break _loop564; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  				}
  				}
! 				_cnt564++;
  			} while (true);
  			}
--- 3782,3798 ----
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched565 = false;
  					}
! 					rewind(_m565);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched565 ) {
  					match('-');
  				}
  				else {
! 					if ( _cnt566>=1 ) { break _loop566; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  				}
  				}
! 				_cnt566++;
  			} while (true);
  			}
***************
*** 3802,3807 ****
  		match(' ');
  		{
! 		int _cnt571=0;
! 		_loop571:
  		do {
  			if ((_tokenSet_13.member(LA(1)))) {
--- 3815,3820 ----
  		match(' ');
  		{
! 		int _cnt573=0;
! 		_loop573:
  		do {
  			if ((_tokenSet_13.member(LA(1)))) {
***************
*** 3811,3818 ****
  			}
  			else {
! 				boolean synPredMatched570 = false;
  				if (((LA(1)=='?'))) {
! 					int _m570 = mark();
! 					synPredMatched570 = true;
  					inputState.guessing++;
  					try {
--- 3824,3831 ----
  			}
  			else {
! 				boolean synPredMatched572 = false;
  				if (((LA(1)=='?'))) {
! 					int _m572 = mark();
! 					synPredMatched572 = true;
  					inputState.guessing++;
  					try {
***************
*** 3825,3841 ****
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched570 = false;
  					}
! 					rewind(_m570);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched570 ) {
  					match('?');
  				}
  				else {
! 					if ( _cnt571>=1 ) { break _loop571; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  				}
  				}
! 				_cnt571++;
  			} while (true);
  			}
--- 3838,3854 ----
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched572 = false;
  					}
! 					rewind(_m572);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched572 ) {
  					match('?');
  				}
  				else {
! 					if ( _cnt573>=1 ) { break _loop573; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
  				}
  				}
! 				_cnt573++;
  			} while (true);
  			}
***************
*** 3882,3889 ****
  			}
  			else {
! 				boolean synPredMatched588 = false;
  				if (((_tokenSet_15.member(LA(1))) && (_tokenSet_16.member(LA(2))) && (_tokenSet_17.member(LA(3))))) {
! 					int _m588 = mark();
! 					synPredMatched588 = true;
  					inputState.guessing++;
  					try {
--- 3895,3902 ----
  			}
  			else {
! 				boolean synPredMatched590 = false;
  				if (((_tokenSet_15.member(LA(1))) && (_tokenSet_16.member(LA(2))) && (_tokenSet_17.member(LA(3))))) {
! 					int _m590 = mark();
! 					synPredMatched590 = true;
  					inputState.guessing++;
  					try {
***************
*** 3939,3948 ****
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched588 = false;
  					}
! 					rewind(_m588);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched588 ) {
  					mDOUBLE_LITERAL(false);
  					if ( inputState.guessing==0 ) {
--- 3952,3961 ----
  					}
  					catch (RecognitionException pe) {
! 						synPredMatched590 = false;
  					}
! 					rewind(_m590);
  					inputState.guessing--;
  				}
! 				if ( synPredMatched590 ) {
  					mDOUBLE_LITERAL(false);
  					if ( inputState.guessing==0 ) {
***************
*** 3963,3970 ****
  				}
  				else {
! 					boolean synPredMatched574 = false;
  					if (((LA(1)=='<') && (LA(2)=='?'))) {
! 						int _m574 = mark();
! 						synPredMatched574 = true;
  						inputState.guessing++;
  						try {
--- 3976,3983 ----
  				}
  				else {
! 					boolean synPredMatched576 = false;
  					if (((LA(1)=='<') && (LA(2)=='?'))) {
! 						int _m576 = mark();
! 						synPredMatched576 = true;
  						inputState.guessing++;
  						try {
***************
*** 3974,3983 ****
  						}
  						catch (RecognitionException pe) {
! 							synPredMatched574 = false;
  						}
! 						rewind(_m574);
  						inputState.guessing--;
  					}
! 					if ( synPredMatched574 ) {
  						mXML_PI(false);
  						if ( inputState.guessing==0 ) {
--- 3987,3996 ----
  						}
  						catch (RecognitionException pe) {
! 							synPredMatched576 = false;
  						}
! 						rewind(_m576);
  						inputState.guessing--;
  					}
! 					if ( synPredMatched576 ) {
  						mXML_PI(false);
  						if ( inputState.guessing==0 ) {
***************
*** 4008,4015 ****
  					}
  					else {
! 						boolean synPredMatched576 = false;
  						if (((LA(1)=='.') && (LA(2)=='.') && (true))) {
! 							int _m576 = mark();
! 							synPredMatched576 = true;
  							inputState.guessing++;
  							try {
--- 4021,4028 ----
  					}
  					else {
! 						boolean synPredMatched578 = false;
  						if (((LA(1)=='.') && (LA(2)=='.') && (true))) {
! 							int _m578 = mark();
! 							synPredMatched578 = true;
  							inputState.guessing++;
  							try {
***************
*** 4020,4029 ****
  							}
  							catch (RecognitionException pe) {
! 								synPredMatched576 = false;
  							}
! 							rewind(_m576);
  							inputState.guessing--;
  						}
! 						if ( synPredMatched576 ) {
  							mPARENT(false);
  							if ( inputState.guessing==0 ) {
--- 4033,4042 ----
  							}
  							catch (RecognitionException pe) {
! 								synPredMatched578 = false;
  							}
! 							rewind(_m578);
  							inputState.guessing--;
  						}
! 						if ( synPredMatched578 ) {
  							mPARENT(false);
  							if ( inputState.guessing==0 ) {
***************
*** 4115,4122 ****
  						}
  						else {
! 							boolean synPredMatched579 = false;
  							if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 								int _m579 = mark();
! 								synPredMatched579 = true;
  								inputState.guessing++;
  								try {
--- 4128,4135 ----
  						}
  						else {
! 							boolean synPredMatched581 = false;
  							if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 								int _m581 = mark();
! 								synPredMatched581 = true;
  								inputState.guessing++;
  								try {
***************
*** 4145,4154 ****
  								}
  								catch (RecognitionException pe) {
! 									synPredMatched579 = false;
  								}
! 								rewind(_m579);
  								inputState.guessing--;
  							}
! 							if ( synPredMatched579 ) {
  								mDECIMAL_LITERAL(false);
  								if ( inputState.guessing==0 ) {
--- 4158,4167 ----
  								}
  								catch (RecognitionException pe) {
! 									synPredMatched581 = false;
  								}
! 								rewind(_m581);
  								inputState.guessing--;
  							}
! 							if ( synPredMatched581 ) {
  								mDECIMAL_LITERAL(false);
  								if ( inputState.guessing==0 ) {
***************
*** 4157,4164 ****
  							}
  							else {
! 								boolean synPredMatched581 = false;
  								if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 									int _m581 = mark();
! 									synPredMatched581 = true;
  									inputState.guessing++;
  									try {
--- 4170,4177 ----
  							}
  							else {
! 								boolean synPredMatched583 = false;
  								if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 									int _m583 = mark();
! 									synPredMatched583 = true;
  									inputState.guessing++;
  									try {
***************
*** 4169,4178 ****
  									}
  									catch (RecognitionException pe) {
! 										synPredMatched581 = false;
  									}
! 									rewind(_m581);
  									inputState.guessing--;
  								}
! 								if ( synPredMatched581 ) {
  									mDECIMAL_LITERAL(false);
  									if ( inputState.guessing==0 ) {
--- 4182,4191 ----
  									}
  									catch (RecognitionException pe) {
! 										synPredMatched583 = false;
  									}
! 									rewind(_m583);
  									inputState.guessing--;
  								}
! 								if ( synPredMatched583 ) {
  									mDECIMAL_LITERAL(false);
  									if ( inputState.guessing==0 ) {
***************
*** 4181,4188 ****
  								}
  								else {
! 									boolean synPredMatched583 = false;
  									if (((LA(1)=='.') && (true) && (true))) {
! 										int _m583 = mark();
! 										synPredMatched583 = true;
  										inputState.guessing++;
  										try {
--- 4194,4201 ----
  								}
  								else {
! 									boolean synPredMatched585 = false;
  									if (((LA(1)=='.') && (true) && (true))) {
! 										int _m585 = mark();
! 										synPredMatched585 = true;
  										inputState.guessing++;
  										try {
***************
*** 4192,4201 ****
  										}
  										catch (RecognitionException pe) {
! 											synPredMatched583 = false;
  										}
! 										rewind(_m583);
  										inputState.guessing--;
  									}
! 									if ( synPredMatched583 ) {
  										mSELF(false);
  										if ( inputState.guessing==0 ) {
--- 4205,4214 ----
  										}
  										catch (RecognitionException pe) {
! 											synPredMatched585 = false;
  										}
! 										rewind(_m585);
  										inputState.guessing--;
  									}
! 									if ( synPredMatched585 ) {
  										mSELF(false);
  										if ( inputState.guessing==0 ) {
***************
*** 4204,4211 ****
  									}
  									else {
! 										boolean synPredMatched590 = false;
  										if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 											int _m590 = mark();
! 											synPredMatched590 = true;
  											inputState.guessing++;
  											try {
--- 4217,4224 ----
  									}
  									else {
! 										boolean synPredMatched592 = false;
  										if (((_tokenSet_15.member(LA(1))) && (true) && (true))) {
! 											int _m592 = mark();
! 											synPredMatched592 = true;
  											inputState.guessing++;
  											try {
***************
*** 4216,4225 ****
  											}
  											catch (RecognitionException pe) {
! 												synPredMatched590 = false;
  											}
! 											rewind(_m590);
  											inputState.guessing--;
  										}
! 										if ( synPredMatched590 ) {
  											mDECIMAL_LITERAL(false);
  											if ( inputState.guessing==0 ) {
--- 4229,4238 ----
  											}
  											catch (RecognitionException pe) {
! 												synPredMatched592 = false;
  											}
! 											rewind(_m592);
  											inputState.guessing--;
  										}
! 										if ( synPredMatched592 ) {
  											mDECIMAL_LITERAL(false);
  											if ( inputState.guessing==0 ) {

Index: XQueryParserTokenTypes.txt
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryParserTokenTypes.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** XQueryParserTokenTypes.txt	4 Aug 2004 19:00:06 -0000	1.11
--- XQueryParserTokenTypes.txt	10 Aug 2004 20:27:16 -0000	1.12
***************
*** 146,171 ****
  END_TAG_START=147
  QUOT=148
! ATTRIBUTE_CONTENT=149
! ELEMENT_CONTENT=150
! XML_COMMENT_END=151
! XML_PI_END=152
! LITERAL_collection="collection"=153
! LITERAL_preceding="preceding"=154
! COMP_DOC_CONSTRUCTOR=155
! XML_PI_START=156
! LETTER=157
! DIGITS=158
! HEX_DIGITS=159
! NMSTART=160
! NMCHAR=161
! WS=162
! EXPR_COMMENT=163
! PREDEFINED_ENTITY_REF=164
! CHAR_REF=165
! NEXT_TOKEN=166
! CHAR=167
! BASECHAR=168
! IDEOGRAPHIC=169
! COMBINING_CHAR=170
! DIGIT=171
! EXTENDER=172
--- 146,172 ----
  END_TAG_START=147
  QUOT=148
! APOS=149
! ATTRIBUTE_CONTENT=150
! ELEMENT_CONTENT=151
! XML_COMMENT_END=152
! XML_PI_END=153
! LITERAL_collection="collection"=154
! LITERAL_preceding="preceding"=155
! COMP_DOC_CONSTRUCTOR=156
! XML_PI_START=157
! LETTER=158
! DIGITS=159
! HEX_DIGITS=160
! NMSTART=161
! NMCHAR=162
! WS=163
! EXPR_COMMENT=164
! PREDEFINED_ENTITY_REF=165
! CHAR_REF=166
! NEXT_TOKEN=167
! CHAR=168
! BASECHAR=169
! IDEOGRAPHIC=170
! COMBINING_CHAR=171
! DIGIT=172
! EXTENDER=173