Changeset 3912

Timestamp:

08/25/08 22:36:45 (3 months ago)

Author:

kris

Message:

made parser a bit faster

Files:

• trunk/tango/text/json/JsonParser.d (modified) (4 diffs)

trunk/tango/text/json/JsonParser.d

@@ -171 +171 @@
-                    ++p;
-                
-p < e && *p <= 32)
+*p <= 32) 
-                       ++p;
-
@@ -234 +234 @@
-
-                       case 'f':
-
+ 
-
-                       default:
@@ -241 +241 @@
-
-                return parseNumber;
-        }
-        
-        /***********************************************************************
-        
-        ***********************************************************************/
-        
-        private bool parseNumber ()
-        {
-                auto p = str.ptr;
-                auto e = str.end;
-
-                curLoc = p;
-                curType = Token.Number;
-
-                while (p < e)
-                      {
-                      auto c = *p;
-                      if ((c >= '0' && c <= '9') || c is '.' || c is 'e') 
-                           ++p;
-                      else
-                         break;
-                      }                 
-
-                if (p < e) 
-                    curLen = p - curLoc;
-                else
-                   unexpectedEOF ("after number");
-
-                str.ptr = p;
-                return true;
-        }
-        
@@ -295 +265 @@
-
-                str.ptr = p + 1;
+                return true;
+        }
+        
+        /***********************************************************************
+        
+        ***********************************************************************/
+        
+        private bool parseNumber ()
+        {
+                auto p = str.ptr;
+                auto e = str.end;
+                auto c = *(curLoc = p);
+
+                curType = Token.Number;
+
+                while (c >= '0' && c <= '9') c = *++p;                 
+
+                if (c is '.')
+                    while (c = *++p, c >= '0' && c <= '9') {}                 
+
+                if (c is 'e')
+                    while (c = *++p, c >= '0' && c <= '9') {}
+
+                if (p < e) 
+                    curLen = p - curLoc;
+                else
+                   unexpectedEOF ("after number");
+
+                str.ptr = p;
-                return true;
-        }