Update of /cvsroot/monetdb/pathfinder/compiler/parser
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27482/compiler/parser
Modified Files:
scanner.l
Log Message:
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.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- scanner.l 10 Nov 2009 09:44:52 -0000 1.69
+++ scanner.l 4 Dec 2009 14:39:34 -0000 1.70
@@ -692,7 +692,7 @@
pf_yield (StringLiteral);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<OPERATOR>{
@@ -792,7 +792,7 @@
"with" { gotoState (DEFAULT); pf_yield (with);}
"modify" { gotoState (DEFAULT); pf_yield (modify);}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<NAMESPACEDECL>{
@@ -805,7 +805,7 @@
}
"=" { pf_yield (equals); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<NAMESPACEKEYWORD>{
@@ -817,7 +817,7 @@
pf_yield (StringLiteral);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<VARNAME>{
@@ -827,7 +827,7 @@
gotoState (OPERATOR);
pf_yield (QName);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<SINGLETYPE>{
@@ -838,7 +838,7 @@
pf_yield (QName);
}
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<ITEMTYPE>{
@@ -882,7 +882,7 @@
")" { gotoState (OCCURRENCEINDICATOR);
pf_yield (rparen); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<OCCURRENCEINDICATOR>{
@@ -893,7 +893,7 @@
"+" { gotoState (OPERATOR);
pf_yield (plus); }
{_} ;
-. { unput (yytext[yyleng-1]);
+([\300-\377][\200-\277]*|.) { unput (yytext[yyleng-1]);
gotoState (OPERATOR); }
}
@@ -912,7 +912,7 @@
")" { popState (); pf_yield (rparen); }
"*" { pf_yield (star); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<KINDTESTFORPI>{
@@ -924,7 +924,7 @@
}
")" { popState (); pf_yield (rparen); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<START_TAG>{
@@ -942,7 +942,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>{
@@ -962,7 +962,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>{
@@ -983,7 +983,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>{
@@ -1013,7 +1013,7 @@
{ElementContentChar} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (ElementContentChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<XML_COMMENT>{
@@ -1021,7 +1021,7 @@
{Char} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PFChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PROCESSING_INSTRUCTION>{
@@ -1031,7 +1031,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>{
@@ -1039,7 +1039,7 @@
{Char} { pflval.str = PFstrndup (yytext, yyleng);
pf_yield (PFChar);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<CDATA_SECTION>{
@@ -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); }
}
<END_TAG>{
@@ -1058,7 +1058,7 @@
pf_yield (QName);
}
{S} { pf_yield (S); }
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRESERVE_MODE>{
@@ -1067,7 +1067,7 @@
"," { gotoState (INHERIT_MODE);
pf_yield (comma); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<INHERIT_MODE>{
@@ -1076,7 +1076,7 @@
";" { gotoState (DEFAULT);
pf_yield (semicolon); }
{_} ;
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRAGMA_TARGET>{
@@ -1087,7 +1087,7 @@
yyleng));
pf_yield (QName);
}
-. { pf_yield (invalid_character); }
+([\300-\377][\200-\277]*|.) { pf_yield (invalid_character); }
}
<PRAGMA_CONTENT>{
@@ -1095,7 +1095,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>{
@@ -1105,7 +1105,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
