Update of /cvsroot/monetdb/pathfinder/compiler/parser
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29150/compiler/parser
Modified Files:
Tag: M5XQ
scanner.l
Log Message:
propagated changes of Friday Dec 04 2009
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/04 - sjoerd: compiler/parser/scanner.l,1.68.2.1
propagated changes of Friday Dec 04 2009
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/04 - sjoerd: compiler/parser/scanner.l,1.70
propagated changes of Friday Dec 04 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/04 - sjoerd: compiler/parser/scanner.l,1.67.6.1
Report full UTF-8 characters when encountering invalid input.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: scanner.l
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/parser/scanner.l,v
retrieving revision 1.66.4.2
retrieving revision 1.66.4.3
diff -u -d -r1.66.4.2 -r1.66.4.3
--- scanner.l 9 Nov 2009 00:04:38 -0000 1.66.4.2
+++ scanner.l 4 Dec 2009 14:49:32 -0000 1.66.4.3
@@ -694,7 +694,7 @@
pf_yield (StringLiteral);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<OPERATOR>{
@@ -800,7 +800,7 @@
"ftand" { gotoState (DEFAULT); pf_yield (ftand);}
"not"{_}"in" { gotoState (DEFAULT); pf_yield
(ftmildnot);}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<NAMESPACEDECL>{
@@ -813,7 +813,7 @@
}
"=" { pf_yield (equals); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<NAMESPACEKEYWORD>{
@@ -825,7 +825,7 @@
pf_yield (StringLiteral);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<VARNAME>{
@@ -835,7 +835,7 @@
gotoState (OPERATOR);
pf_yield (QName);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<SINGLETYPE>{
@@ -846,7 +846,7 @@
pf_yield (QName);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<ITEMTYPE>{
@@ -890,7 +890,7 @@
")" { gotoState (OCCURRENCEINDICATOR);
pf_yield (rparen); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<OCCURRENCEINDICATOR>{
@@ -901,7 +901,7 @@
"+" { gotoState (OPERATOR);
pf_yield (plus); }
{_} ;
-. { unput (yytext[yyleng-1]);
+([\300-\377][\200-\277]*|.) { unput (yytext[yyleng-1]);
gotoState (OPERATOR); }
}
@@ -920,7 +920,7 @@
")" { popState (); pf_yield (rparen); }
"*" { pf_yield (star); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<KINDTESTFORPI>{
@@ -932,7 +932,7 @@
}
")" { popState (); pf_yield (rparen); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<START_TAG>{
@@ -950,7 +950,7 @@
"/>" { popState (); pf_yield (slash_gt); }
">" { gotoState (ELEMENT_CONTENT);
pf_yield (greater_than); }
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<QUOT_ATTRIBUTE_CONTENT>{
@@ -970,7 +970,7 @@
{CharRef} { pflval.str = entity_ref (yytext, NULL);
pf_yield (CharRef);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<APOS_ATTRIBUTE_CONTENT>{
@@ -991,7 +991,7 @@
{CharRef} { pflval.str = entity_ref (yytext, NULL);
pf_yield (CharRef);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<ELEMENT_CONTENT>{
@@ -1021,7 +1021,7 @@
{ElementContentChar} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (ElementContentChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<XML_COMMENT>{
@@ -1029,7 +1029,7 @@
{Char} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PFChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PROCESSING_INSTRUCTION>{
@@ -1039,7 +1039,7 @@
{PITarget} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PITarget);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PROCESSING_INSTRUCTION_CONTENT>{
@@ -1047,7 +1047,7 @@
{Char} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PFChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<CDATA_SECTION>{
@@ -1055,7 +1055,7 @@
{Char} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PFChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<END_TAG>{
@@ -1066,7 +1066,7 @@
pf_yield (QName);
}
{S} { pf_yield (S); }
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRESERVE_MODE>{
@@ -1075,7 +1075,7 @@
"," { gotoState (INHERIT_MODE);
pf_yield (comma); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<INHERIT_MODE>{
@@ -1084,7 +1084,7 @@
";" { gotoState (DEFAULT);
pf_yield (semicolon); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRAGMA_TARGET>{
@@ -1095,7 +1095,7 @@
yyleng));
pf_yield (QName);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRAGMA_CONTENT>{
@@ -1103,7 +1103,7 @@
pf_yield (PragmaContents); }
"#)" { gotoState (NEXT_PRAGMA);
pf_yield (hash_paren); }
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<NEXT_PRAGMA>{
@@ -1113,7 +1113,7 @@
gotoState (DEFAULT);
pf_yield (lbrace); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
%%
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
