[XQilla-devel] xqilla/src/lexer XQLexer.cpp, 1.4, 1.5 XQLexer.l, 1.3, 1.4

[John S. <jp...@us...>]

Update of /cvsroot/xqilla/xqilla/src/lexer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13136/src/lexer

Modified Files:
	XQLexer.cpp XQLexer.l 
Log Message:
Fixed a couple of minor bugs. Made some code exception safe.

Committing an known errors file for XQTS 1.0.


Index: XQLexer.cpp
===================================================================
RCS file: /cvsroot/xqilla/xqilla/src/lexer/XQLexer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XQLexer.cpp	22 Aug 2006 15:55:52 -0000	1.4
--- XQLexer.cpp	28 Aug 2006 12:47:15 -0000	1.5
***************
*** 1,5 ****
  #define yyFlexLexer xqFlexLexer
  
! #line 4 "XQLexer.cpp"
  /* A lexical scanner generated by flex */
  
--- 1,5 ----
  #define yyFlexLexer xqFlexLexer
  
! #line 4 "../src/lexer/XQLexer.cpp"
  /* A lexical scanner generated by flex */
[...2666 lines suppressed...]
--- 15213,15220 ----
  case 243:
  YY_RULE_SETUP
! #line 872 "../src/lexer/XQLexer.l"
  YY_FATAL_ERROR( "flex scanner jammed" );
  	YY_BREAK
! #line 15219 "../src/lexer/XQLexer.cpp"
  
  	case YY_END_OF_BUFFER:
***************
*** 16011,16014 ****
  	}
  #endif
! #line 875 "XQLexer.l"
  
--- 16007,16010 ----
  	}
  #endif
! #line 872 "../src/lexer/XQLexer.l"
  

Index: XQLexer.l
===================================================================
RCS file: /cvsroot/xqilla/xqilla/src/lexer/XQLexer.l,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XQLexer.l	22 Aug 2006 15:55:52 -0000	1.3
--- XQLexer.l	28 Aug 2006 12:47:15 -0000	1.4
***************
*** 61,64 ****
--- 61,65 ----
  #define REJECT_NOT_XQUERY { if(!isXQuery()) { undoUserAction(); REJECT; } }
  #define REJECT_NOT_FULLTEXT { if(!isFullText()) { undoUserAction(); REJECT; } }
+ #define REJECT_XQUERY { if(isXQuery()) { undoUserAction(); REJECT; } }
  #define REJECT_IF_XPATH { if(getLanguage() == XQilla::XPATH2) { undoUserAction(); REJECT; } }
  
***************
*** 507,516 ****
  <INITIAL>"preceding"{WhitespaceChar}*"::"					RECOGNIZE(_AXIS_PRECEDING_);
  <INITIAL>"self"{WhitespaceChar}*"::"						RECOGNIZE(_AXIS_SELF_);
! <INITIAL>"namespace"{WhitespaceChar}*"::"					{
!                                                             if(isXQuery()) 
!                                                                 return error("Axis 'namespace' is not part of the XQuery language"); 
!                                                             else
!                                                                 RECOGNIZE(_AXIS_NAMESPACE_); 
!                                                             }
  <INITIAL,OPERATOR,ITEMTYPE,CLOSEKINDTEST,THESAURUS2,STOPWORDS>","				{
  																switch(YYSTATE) {
--- 508,513 ----
  <INITIAL>"preceding"{WhitespaceChar}*"::"					RECOGNIZE(_AXIS_PRECEDING_);
  <INITIAL>"self"{WhitespaceChar}*"::"						RECOGNIZE(_AXIS_SELF_);
! <INITIAL>"namespace"{WhitespaceChar}*"::"					REJECT_XQUERY; RECOGNIZE(_AXIS_NAMESPACE_);
! 
  <INITIAL,OPERATOR,ITEMTYPE,CLOSEKINDTEST,THESAURUS2,STOPWORDS>","				{
  																switch(YYSTATE) {