pacc 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },

package/src/tokens.mjs

@@ -1,17 +1,14 @@
-
-
 const lookup = {};
 
-function createToken(str)
-{
-  const token = {str};
+function createToken(str) {
+  const token = { str };
   lookup[str] = token;
   return token;
 }
 
 export const PLUS = createToken("+");
 export const MINUS = createToken("-");
-export const STAR =createToken("*");
+export const STAR = createToken("*");
 export const DIVIDE = createToken("/");
 export const NOT = createToken("!");
 export const NOT_EQUAL = createToken("!=");
@@ -31,10 +28,10 @@ export const COLON = createToken(":");
 export const SEMICOLON = createToken(";");
 export const COMMA = createToken(",");
 export const DOT = createToken(".");
-export const AMPERSAND = createToken('&');
-export const DOUBBLE_AMPERSAND = createToken('&&');
+export const AMPERSAND = createToken("&");
+export const DOUBLE_AMPERSAND = createToken("&&");
 export const BAR = createToken("|");
-export const DOUBBLE_BAR = createToken('||');
+export const DOUBLE_BAR = createToken("||");
 
 /**
  * Split property path into tokens
@@ -81,13 +78,14 @@ export function* tokens(string) {
           case "string":
             buffer += c;
             break;
+          case "number":
           case "identifier":
             yield buffer;
             buffer = "";
             state = undefined;
             break;
           default:
-            yield lookup[state] || state;
+            yield lookup[state];
             state = undefined;
         }
         break;
@@ -110,13 +108,14 @@ export function* tokens(string) {
             yield buffer;
             state = undefined;
             break;
+          case "number":
           case "identifier":
             yield buffer;
             buffer = "";
             state = "string";
             break;
           default:
-            yield lookup[state] || state;
+            yield lookup[state];
             buffer = "";
             state = "string";
         }
@@ -131,10 +130,10 @@ export function* tokens(string) {
           case "|":
             if (state === c) {
               state += c;
-              yield lookup[state] || state;
+              yield lookup[state];
               state = undefined;
             } else {
-              yield lookup[state] || state;
+              yield lookup[state];
               state = c;
             }
             break;
@@ -144,12 +143,13 @@ export function* tokens(string) {
           case "string":
             buffer += c;
             break;
+          case "number":
           case "identifier":
             yield buffer;
             state = c;
             break;
           default:
-            yield lookup[state] || state;
+            yield lookup[state];
             state = c;
         }
         break;
@@ -162,6 +162,7 @@ export function* tokens(string) {
           case "string":
             buffer += c;
             break;
+          case "number":
           case "identifier":
             yield buffer;
             state = c;
@@ -191,15 +192,44 @@ export function* tokens(string) {
           case "string":
             buffer += c;
             break;
+          case "number":
           case "identifier":
             yield buffer;
             state = c;
             break;
           default:
-            yield lookup[state] || state;
+            yield lookup[state];
             state = c;
         }
         break;
+
+      case "0":
+      case "1":
+      case "2":
+      case "3":
+      case "4":
+      case "5":
+      case "6":
+      case "7":
+      case "8":
+      case "9":
+        switch (state) {
+          default:
+            yield lookup[state];
+          case undefined:
+            buffer = c.charCodeAt(0) - "0".charCodeAt(0);
+            state = "number";
+            break;
+          case "number":
+            buffer = buffer * 10 + c.charCodeAt(0) - "0".charCodeAt(0);
+            break;
+          case "string":
+          case "identifier":
+            buffer += c;
+            break;
+        }
+        break;
+
       default:
         switch (state) {
           case undefined:
@@ -211,13 +241,8 @@ export function* tokens(string) {
             buffer += c;
             break;
           default:
-            if (
-              (c >= "a" && c <= "z") ||
-              (c >= "A" && c <= "Z") ||
-              (c >= "0" && c <= "9") ||
-              c === "_"
-            ) {
-              yield lookup[state] || state;
+            if ((c >= "a" && c <= "z") || (c >= "A" && c <= "Z") || c === "_") {
+              yield lookup[state];
               state = "identifier";
               buffer = c;
             } else {
@@ -232,10 +257,11 @@ export function* tokens(string) {
       break;
     case "string":
       throw new Error("unterminated string");
+    case "number":
     case "identifier":
       yield buffer;
       break;
     default:
-      yield lookup[state] || state;
+      yield lookup[state];
   }
 }