From 4644dae7d622286837ce72d44b99760214308e69 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 10 Dec 2008 03:51:01 -0500
Subject: [PATCH] Some basic tokenizer logic fixes.

---
 mojoshader_assembler.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c
index 166e66a3..27d7f0cd 100644
--- 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++;