cmap-cvs

[Denis P. <dy...@us...>]

Update of /cvsroot/cmap/libs/eval
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27389

Modified Files:
	tokenizer.cpp 
Log Message:
Fix work with chars above 127.

Index: tokenizer.cpp
===================================================================
RCS file: /cvsroot/cmap/libs/eval/tokenizer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tokenizer.cpp	25 Sep 2005 11:57:36 -0000	1.9
+++ tokenizer.cpp	21 Oct 2005 07:58:12 -0000	1.10
@@ -130,7 +130,7 @@
       if (c == '\n')
         c = read();
       if (eolIsSignificantP) {
-        peekc = (char)c;
+        peekc = c;
         return ttype = TT_EOL;
       }
     } else {
@@ -152,7 +152,7 @@
     if (c == '-') {
       c = read();
       if (c < '0' || c > '9') {
-        peekc = (char)c;
+        peekc = c;
         return ttype = '-';
       }
       neg = true;
@@ -171,7 +171,7 @@
           else
             break;
         }
-        peekc = (char)c;
+        peekc = c;
         nval = v;
         return ttype = TT_NUMBER;
       }
@@ -195,11 +195,11 @@
         } else
           break;
       }
-      peekc = (char)c;
+      peekc = c;
       dval = neg ? -(v + fr) : (v + fr);
       return ttype = TT_FLOAT;
     }
-    peekc = (char)c;
+    peekc = c;
     nval = neg ? -v : v;
     return ttype = TT_NUMBER;
   }
@@ -211,7 +211,7 @@
       c = read();
       _ctype = c < 0 ? CT_WHITESPACE : c < 256 ? ct[c] : CT_ALPHA;
     } while ((_ctype & (CT_ALPHA | CT_DIGIT)) != 0);
-    peekc = (char)c;
+    peekc = c;
     if (forceLower)
       for (unsigned int i = 0; i < sval.length(); i++)
         sval[i] = tolower(sval[i]);
@@ -222,12 +222,12 @@
     if (produceCommentsP) {
       sval = "";
       while ((c = read()) != '\n' && c != '\r' && c >= 0)
-        sval += (unsigned char)c;
-      peekc = (char)c;
+        sval += c;
+      peekc = c;
       return ttype = TT_COMMENT;
     }
     while ((c = read()) != '\n' && c != '\r' && c >= 0);
-    peekc = (char)c;
+    peekc = c;
 
     return nextToken();
   }
@@ -253,9 +253,9 @@
               c = (c << 3) + (c2 - '0');
               peekc = read();
             } else
-              peekc = (char)c2;
+              peekc = c2;
           } else
-            peekc = (char)c2;
+            peekc = c2;
         } else {
           switch (c) {
           case 'a':
@@ -321,10 +321,10 @@
       return nextToken();
     } else if (c == '/' && slashSlashCommentsP) {
       while ((c = read()) != '\n' && c != '\r' && c >= 0);
-      peekc = (char)c;
+      peekc = c;
       return nextToken();
     } else {
-      peekc = (char)c;
+      peekc = c;
       return ttype = '/';
     }
   }