diff options
| author | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-11-02 14:17:03 (GMT) |
|---|---|---|
| committer | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-11-02 14:17:03 (GMT) |
| commit | 7f0551e5380929cd57a7bef5a4694ba5dea94aab (patch) | |
| tree | 0fe9c8d1de2dc3699a2560fb4e75436433583af0 | |
| parent | ae97a22883812f13939e14bb4ce7411c5ecadfe8 (diff) | |
TOK_NUMBER lexer improvement by Steven Dick
git-svn-id: http://svn.clifford.at/openscad/trunk@579 b57f626f-c46c-0410-a088-ec61d464b74c
| -rw-r--r-- | src/lexer.l | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lexer.l b/src/lexer.l index e0e70eb..49243fd 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -65,6 +65,8 @@ extern const char *parser_source_path; %x comment +DIGIT [0-9] + %% include[ \t\r\n>]*"<"[^ \t\r\n>]+">" { @@ -135,7 +137,7 @@ use[ \t\r\n>]*"<"[^ \t\r\n>]+">" { "false" return TOK_FALSE; "undef" return TOK_UNDEF; -[0-9][0-9.]* { parserlval.number = QString(yytext).toDouble(); return TOK_NUMBER; } +{DIGIT}+|{DIGIT}*\.{DIGIT}+|{DIGIT}+\.{DIGIT}* { parserlval.number = QString(yytext).toDouble(); return TOK_NUMBER; } "$"?[a-zA-Z0-9_]+ { parserlval.text = strdup(yytext); return TOK_ID; } \"[^"]*\" { |