pacc 6.7.2 → 6.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "6.7.2",
+  "version": "6.8.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/tokens.mjs

@@ -56,6 +56,20 @@ export /** @type {Token} */ const DOUBLE_BAR = createToken("||", 30, "infixr");
 export /** @type {Token} */ const IDENTIFIER = createToken("IDENTIFIER", 0);
 export /** @type {Token} */ const EOF = createToken("EOF", -1, "eof");
 
+const keywords = {
+  true: [true],
+  false: [false]
+};
+
+const esc = {
+  b: "\b",
+  f: "\f",
+  n: "\n",
+  r: "\r",
+  t: "\t",
+  v: "\v"
+};
+
 /**
  * Split property path into tokens
  * @generator
@@ -63,18 +77,14 @@ export /** @type {Token} */ const EOF = createToken("EOF", -1, "eof");
  * @yields {Token}
  */
 export function* tokens(string) {
-  let state, value, hex, divider, quote;
+  let state, value, hex, quote;
 
-  function maybeKeyword() {
-    switch (value) {
-      case "true":
-        return [true];
-      case "false":
-        return [false];
-      default:
-        return [IDENTIFIER, value];
-    }
-  }
+  const keywordOrIdentifier = () => keywords[value] || [IDENTIFIER, value];
+  const startString = c => {
+    value = "";
+    state = "string";
+    quote = c;
+  };
 
   for (const c of string) {
     switch (state) {
@@ -92,13 +102,6 @@ export function* tokens(string) {
           state = "string-escaping-hex";
           hex = "";
         } else {
-          const esc = {
-            b: "\b",
-            f: "\f",
-            n: "\n",
-            r: "\r",
-            t: "\t"
-          };
           value += esc[c] || c;
           state = "string";
         }
@@ -109,11 +112,11 @@ export function* tokens(string) {
       case "\n":
       case "\r":
       case "\t":
+      case "\v":
       case " ":
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
             state = undefined;
           case undefined:
             break;
@@ -121,7 +124,7 @@ export function* tokens(string) {
             value += c;
             break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             value = undefined;
             state = undefined;
             break;
@@ -142,12 +145,9 @@ export function* tokens(string) {
       case "'":
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
           case undefined:
-            value = "";
-            state = "string";
-            quote = c;
+            startString(c);
             break;
           case "string":
             if (c === quote) {
@@ -158,16 +158,12 @@ export function* tokens(string) {
             }
             break;
           case "identifier":
-            yield maybeKeyword();
-            value = "";
-            state = "string";
-            quote = c;
+            yield keywordOrIdentifier();
+            startString(c);
             break;
           default:
             yield lookup[state];
-            value = "";
-            state = "string";
-            quote = c;
+            startString(c);
         }
         break;
       case "!":
@@ -177,8 +173,7 @@ export function* tokens(string) {
       case "|":
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -197,7 +192,7 @@ export function* tokens(string) {
             value += c;
             break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             state = c;
             break;
           default:
@@ -209,33 +204,38 @@ export function* tokens(string) {
       case "=":
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
           case undefined:
             state = c;
             break;
-          case "string":
-            value += c;
-            break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             state = c;
             break;
+          case "string":
+            value += c;
+            break;
           default:
             state += c;
         }
         break;
+
       case ".":
         if (state === "number") {
-          state = "number-fraction";
-          divider = 10;
+          value += '.';
           break;
         }
+        else if (state === "-") {
+          value = '-.';
+          state="number";
+          break;
+        }
+
+      case "-":
       case ":":
       case ";":
       case ",":
       case "+":
-      case "-":
       case "*":
       case "/":
       case "(":
@@ -246,18 +246,17 @@ export function* tokens(string) {
       case "}":
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
           case undefined:
             state = c;
             break;
-          case "string":
-            value += c;
-            break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             state = c;
             break;
+          case "string":
+            value += c;
+            break;
           default:
             yield lookup[state];
             state = c;
@@ -277,21 +276,17 @@ export function* tokens(string) {
           default:
             yield lookup[state];
           case undefined:
-            value = c.charCodeAt(0) - 48;
+            value = c;
             state = "number";
             break;
+          case "-":
+            state = "number";
+            value = "-" + c;
+          break;
           case ".":
-            state = "number-fraction";
-            value = 0;
-            divider = 10;
-          case "number-fraction":
-            value = value + (c.charCodeAt(0) - 48) / divider;
-            divider *= 10;
-            break;
+            state = "number";
+            value = ".";
           case "number":
-            // @ts-ignore
-            value = value * 10 + c.charCodeAt(0) - 48;
-            break;
           case "string":
           case "identifier":
             value += c;
@@ -302,8 +297,7 @@ export function* tokens(string) {
       default:
         switch (state) {
           case "number":
-          case "number-fraction":
-            yield [value];
+            yield [parseFloat(value)];
           case undefined:
             state = "identifier";
             value = c;
@@ -325,12 +319,11 @@ export function* tokens(string) {
       break;
     case "string":
       throw new Error("unterminated string", { cause: string });
-    case "number-fraction":
     case "number":
-      yield [value];
+      yield [parseFloat(value)];
       break;
     case "identifier":
-      yield maybeKeyword();
+      yield keywordOrIdentifier();
       break;
     default:
       yield lookup[state];