[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQueryParser.java,1.6,1.7 XQuery.g,1.5,1.6

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

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

Modified Files:
	XQueryParser.java XQuery.g 
Log Message:
* class BrokerPool now detects if a thread does already hold a
broker object and increments a reference count instead of
returning a new object. Otherwise, deadlock situations could
occurr.

* documentCache in RpcConnection should be cleared if changes
have been made to the database.

* implemented missing getMembersAsResource method in
RemoteResourceSet.

Index: XQueryParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XQueryParser.java	2 Mar 2004 08:35:51 -0000	1.6
--- XQueryParser.java	8 Mar 2004 11:21:22 -0000	1.7
***************
*** 367,370 ****
--- 367,371 ----
  			case LITERAL_every:
  			case LITERAL_if:
+ 			case LITERAL_return:
  			case LITERAL_order:
  			case LITERAL_by:
***************
*** 2868,2871 ****
--- 2869,2873 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 3107,3110 ****
--- 3109,3113 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 3365,3368 ****
--- 3368,3372 ----
  					case LITERAL_every:
  					case LITERAL_if:
+ 					case LITERAL_return:
  					case LITERAL_order:
  					case LITERAL_by:
***************
*** 3863,3866 ****
--- 3867,3871 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 3929,3932 ****
--- 3934,3938 ----
  			case LITERAL_every:
  			case LITERAL_if:
+ 			case LITERAL_return:
  			case LITERAL_order:
  			case LITERAL_by:
***************
*** 4180,4183 ****
--- 4186,4190 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 4254,4257 ****
--- 4261,4265 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 4404,4407 ****
--- 4412,4416 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 4531,4534 ****
--- 4540,4544 ----
  		case LITERAL_every:
  		case LITERAL_if:
+ 		case LITERAL_return:
  		case LITERAL_order:
  		case LITERAL_by:
***************
*** 5934,5937 ****
--- 5944,5959 ----
  			break;
  		}
+ 		case LITERAL_return:
+ 		{
+ 			org.exist.xquery.parser.XQueryAST tmp366_AST = null;
+ 			tmp366_AST = (org.exist.xquery.parser.XQueryAST)astFactory.create(LT(1));
+ 			astFactory.addASTChild(currentAST, tmp366_AST);
+ 			match(LITERAL_return);
+ 			if ( inputState.guessing==0 ) {
+ 				name = "return";
+ 			}
+ 			reservedKeywords_AST = (org.exist.xquery.parser.XQueryAST)currentAST.root;
+ 			break;
+ 		}
  		default:
  		{
***************
*** 6115,6134 ****
  	
  	private static final long[] mk_tokenSet_0() {
! 		long[] data = { -1468195881072197632L, -6760403073825249L, 237823L, 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 = { -1468195881072197630L, -6760403073825249L, 237823L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
  	private static final long[] mk_tokenSet_2() {
! 		long[] data = { -8392629979174666240L, -35576541255629281L, 229411L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
  	private static final long[] mk_tokenSet_3() {
! 		long[] data = { -8390378179360980992L, -35576541255629281L, 229603L, 0L, 0L, 0L};
  		return data;
  	}
--- 6137,6156 ----
  	
  	private static final long[] mk_tokenSet_0() {
! 		long[] data = { -1468195881072197632L, -6760403073825185L, 237823L, 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 = { -1468195881072197630L, -6760403073825185L, 237823L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
  	private static final long[] mk_tokenSet_2() {
! 		long[] data = { -8392629979174666240L, -35576541255629217L, 229411L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
  	private static final long[] mk_tokenSet_3() {
! 		long[] data = { -8390378179360980992L, -35576541255629217L, 229603L, 0L, 0L, 0L};
  		return data;
  	}
***************
*** 6140,6144 ****
  	public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
  	private static final long[] mk_tokenSet_5() {
! 		long[] data = { -1468336618560552960L, -6760403073825249L, 237823L, 0L, 0L, 0L};
  		return data;
  	}
--- 6162,6166 ----
  	public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
  	private static final long[] mk_tokenSet_5() {
! 		long[] data = { -1468336618560552960L, -6760403073825185L, 237823L, 0L, 0L, 0L};
  		return data;
  	}
***************
*** 6155,6169 ****
  	public static final BitSet _tokenSet_7 = new BitSet(mk_tokenSet_7());
  	private static final long[] mk_tokenSet_8() {
! 		long[] data = { -6084535170147287040L, -8554943491406305L, 229603L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_8 = new BitSet(mk_tokenSet_8());
  	private static final long[] mk_tokenSet_9() {
! 		long[] data = { -8388117446015320064L, -33887691393268193L, 237631L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_9 = new BitSet(mk_tokenSet_9());
  	private static final long[] mk_tokenSet_10() {
! 		long[] data = { -6086786969960972288L, -35576541255629281L, 229411L, 0L, 0L, 0L};
  		return data;
  	}
--- 6177,6191 ----
  	public static final BitSet _tokenSet_7 = new BitSet(mk_tokenSet_7());
  	private static final long[] mk_tokenSet_8() {
! 		long[] data = { -6084535170147287040L, -8554943491406241L, 229603L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_8 = new BitSet(mk_tokenSet_8());
  	private static final long[] mk_tokenSet_9() {
! 		long[] data = { -8388117446015320064L, -33887691393268129L, 237631L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_9 = new BitSet(mk_tokenSet_9());
  	private static final long[] mk_tokenSet_10() {
! 		long[] data = { -6086786969960972288L, -35576541255629217L, 229411L, 0L, 0L, 0L};
  		return data;
  	}

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XQuery.g	2 Mar 2004 08:35:51 -0000	1.5
--- XQuery.g	8 Mar 2004 11:21:22 -0000	1.6
***************
*** 908,911 ****
--- 908,913 ----
      |
      "cast" { name = "cast"; }
+ 	|
+ 	"return" { name = "return"; }
  	;