[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQuery.g,1.22,1.23

[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-serv796/src/org/exist/xquery/parser

Modified Files:
	XQuery.g 
Log Message:
Fixed wrong handling of default namespaces, introduced by my previous changes.

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** XQuery.g	7 Aug 2004 16:28:03 -0000	1.22
--- XQuery.g	8 Aug 2004 19:03:26 -0000	1.23
***************
*** 844,855 ****
  }
  :
! 	name=q:qName! EQ! QUOT!
! 	{ lexer.inAttributeContent= true; }
! 	value:attributeValue { lexer.inAttributeContent= false; }
! 	QUOT! { lexer.parseStringLiterals= true; }
  	{ 
!         #attributeDef= #(#[ATTRIBUTE, name], #value);
!         #attributeDef.copyLexInfo(#q);
!     }
  	;
  
--- 844,862 ----
  }
  :
! 	name=q:qName! EQ! 
! 	( 
! 		QUOT!
! 		{ lexer.inAttributeContent= true; }
! 		attributeValue { lexer.inAttributeContent= false; }
! 		QUOT! { lexer.parseStringLiterals= true; }
! 		| 
! 		APOS! { lexer.inAttributeContent= true; }
! 		attributeValue { lexer.inAttributeContent= false; }
! 		APOS! { lexer.parseStringLiterals= true; }
! 	)
  	{ 
! 		#attributeDef= #(#[ATTRIBUTE, name], #attributeDef);
! 		#attributeDef.copyLexInfo(#q);
! 	}
  	;
  
***************
*** 2633,2636 ****
--- 2640,2644 ----
  protected GTEQ : ">=" ;
  protected QUOT : '"' ;
+ protected APOS : "'";
  protected LTEQ : "<=" ;