Fixed parse_num().

icculus · Feb 12, 2009 · d26f1aa · d26f1aa
1 parent 71e3dfe
commit d26f1aa
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c
@@ -982,13 +982,23 @@ static int parse_args_NULL(Context *ctx)
 static int parse_num(Context *ctx, const int floatok, uint32 *value)
 {
     union { float f; int32 si32; uint32 ui32; } cvt;
+    int negative = 0;
+    Token token = nexttoken(ctx);
+
+    if (token == ((Token) '-'))
+    {
+        negative = 1;
+        token = nexttoken(ctx);
+    } // if
 
-    const Token token = nexttoken(ctx);
     if (token == TOKEN_INT_LITERAL)
     {
         int d = 0;
         sscanf(ctx->token, "%d", &d);
-        cvt.si32 = (int32) d;
+        if (floatok)
+            cvt.f = (float) ((negative) ? -d : d);
+        else
+            cvt.si32 = (int32) ((negative) ? -d : d);
     } // if
     else if (token == TOKEN_FLOAT_LITERAL)
     {
@@ -999,6 +1009,8 @@ static int parse_num(Context *ctx, const int floatok, uint32 *value)
             return 0;
         } // if
         sscanf(ctx->token, "%f", &cvt.f);
+        if (negative)
+            cvt.f = -cvt.f;
     } // if
     else
     {