Some basic tokenizer logic fixes.

icculus · Dec 10, 2008 · 4644dae · 4644dae
1 parent 462fe79
commit 4644dae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c
@@ -220,7 +220,7 @@ static int _tokenize(Context *ctx)
             ch = '\n';
         } // else if
 
-        if ((ch > '0') && (ch < '9'))
+        if ((ch >= '0') && (ch <= '9'))
         {
             // starting a number, but rest of current token was not number.
             if ((idx > 0) && ((ctx->prevchar < '0') || (ctx->prevchar > '9')))
@@ -232,7 +232,7 @@ static int _tokenize(Context *ctx)
         else
         {
             // starting a non-number, but rest of current token was numbers.
-            if ((idx > 0) && ((ctx->prevchar >= '0') || (ctx->prevchar <= '9')))
+            if ((idx > 0) && ((ctx->prevchar >= '0') && (ctx->prevchar <= '9')))
             {
                 ctx->token[idx++] = '\0';
                 return NOFAIL;
@@ -249,7 +249,7 @@ static int _tokenize(Context *ctx)
                 {
                     ctx->token[idx++] = ch;
                     ctx->source++;
-                    if ((ch == '/') && (ctx->source[1] == '/'))
+                    if ((ch == '/') && (*ctx->source == '/'))
                     {
                         ctx->token[idx++] = '/';
                         ctx->source++;