d3dcompiler: Don't take the sign as part of the numeric token.

This commit is contained in:
Matteo Bruni 2012-11-09 15:20:36 +01:00 committed by Alexandre Julliard
parent a7956c4c4f
commit a5203e1a79
1 changed files with 4 additions and 4 deletions

View File

@ -184,15 +184,15 @@ row_major {return KW_ROW_MAJOR; }
return NEW_IDENTIFIER; return NEW_IDENTIFIER;
} }
[+-]?[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { [0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? {
hlsl_lval.floatval = atof(yytext); hlsl_lval.floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
[+-]?[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { [0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? {
hlsl_lval.floatval = atof(yytext); hlsl_lval.floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
[+-]?[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { [0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] {
hlsl_lval.floatval = atof(yytext); hlsl_lval.floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
@ -204,7 +204,7 @@ row_major {return KW_ROW_MAJOR; }
sscanf(yytext, "0%o", &hlsl_lval.intval); sscanf(yytext, "0%o", &hlsl_lval.intval);
return C_INTEGER; return C_INTEGER;
} }
\-?[0-9]+ { [0-9]+ {
hlsl_lval.intval = (atoi(yytext)); hlsl_lval.intval = (atoi(yytext));
return C_INTEGER; return C_INTEGER;
} }