diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-11-05 18:17:06 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-11-05 18:17:06 (GMT) |
| commit | 273672c418e4ff2400a9cbc1dacb510a2452b734 (patch) | |
| tree | 68d4cba8d98064482c1cdf68b514351468864b34 /src/lexer.l | |
| parent | 88b8080f30d6ca1a9a74b8005a7408d4066f481b (diff) | |
| parent | d14a24a2b63d7d3815e02a79ef9dacd76cd01f4d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lexer.l b/src/lexer.l index d9ccd76..2760b07 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -88,7 +88,8 @@ QString filepath; %x comment string %x include -DIGIT [0-9] +D [0-9] +E [Ee][+-]?{D}+ %% @@ -155,8 +156,10 @@ use[ \t\r\n>]*"<"[^\t\r\n>]+">" { "false" return TOK_FALSE; "undef" return TOK_UNDEF; -{DIGIT}+|{DIGIT}*\.{DIGIT}+|{DIGIT}+\.{DIGIT}* { parserlval.number = QString(yytext).toDouble(); return TOK_NUMBER; } -"$"?[a-zA-Z0-9_]+ { parserlval.text = strdup(yytext); return TOK_ID; } +{D}+{E}? | +{D}*\.{D}+{E}? | +{D}+\.{D}*{E}? { parserlval.number = QString(yytext).toDouble(); return TOK_NUMBER; } +"$"?[a-zA-Z0-9_]+ { parserlval.text = strdup(yytext); return TOK_ID; } \" { BEGIN(string); stringcontents = new QString(); } <string>{ |