X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fparser.lex;h=b2b49480a633ff43a7cfdf2f597b2553f9db466a;hb=4a80dbd0b6295f958f7408df06d8801327a6a675;hp=43e50fee33ad982aab19a919834b3b2cb801d9ba;hpb=e82d0f958e0db1d1a5f815cb7fc2a183c14bfff9;p=swftools.git

diff --git a/src/parser.lex b/src/parser.lex
index 43e50fe..b2b4948 100644
--- a/src/parser.lex
+++ b/src/parser.lex
@@ -99,10 +99,13 @@ static void unescapeString(string_t * tmp)
 	    case 'n': p[0] = '\n'; break;
 	    case 'r': p[0] = '\r'; break;
 	    case 't': p[0] = '\t'; break;
-	    case 'x':  {
+	    case 'x':  case 'u': {
+		int max=2;
 		int num=0;
 		char*utf8;
-		while(strchr("0123456789abcdefABCDEF", p[nr])) {
+		if(p[1] == 'u')
+		    max = 4;
+		while(strchr("0123456789abcdefABCDEF", p[nr]) && nr < max+2) {
 		    num <<= 4;
 		    if(p[nr]>='0' && p[nr]<='9') num |= p[nr] - '0';
 		    if(p[nr]>='a' && p[nr]<='f') num |= p[nr] - 'a' + 10;
@@ -111,7 +114,6 @@ static void unescapeString(string_t * tmp)
 		}
 		utf8 = getUTF8(num);
 		new = strlen(utf8);
-
 		memcpy(p, utf8, new); // do not copy the terminating zero
 		break;
 	    }
@@ -244,7 +246,6 @@ NUMBER	 -?[0-9]+(\.[0-9]*)?
 PERCENT	 {NUMBER}%
 STRING   (\\.|[^\\"\n])*
 S	 [ \n\r\t]
-NS	 [^ \n\r\t]
 RVALUE	 \"{STRING}\"|([^ \n\r\t]+)
 
 %%
@@ -266,7 +267,7 @@ RVALUE	 \"{STRING}\"|([^ \n\r\t]+)
 }
 \.include{S}.*\n		    {handleInclude(yytext, yyleng);}
 \.{NAME}	            {s(COMMAND);c();}
-:({NS}|{S}[^.]|{S}\.[^e]|{S}\.e[^n]|{S}\.en[^d])*{S}\.end	    {s(RAWDATA);c();}
+:([^.]|\.[^e]|\.e[^n]|\.en[^d]|\.end[^ \n\r\t]|[ \n\r\t])*\.end	    {s(RAWDATA);c();}
 {NAME}                      {s(IDENTIFIER);c();}
 "["		            {c();BEGIN(BINARY);}
 {S} 		            {c();}