pacc 6.7.1 → 6.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "6.7.1",
+  "version": "6.7.3",
   "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;
+  let state, value, hex, divider, 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";
         }
@@ -106,9 +109,10 @@ export function* tokens(string) {
     }
 
     switch (c) {
-      case '\n':
-      case '\r':
+      case "\n":
+      case "\r":
       case "\t":
+      case "\v":
       case " ":
         switch (state) {
           case "number":
@@ -121,7 +125,7 @@ export function* tokens(string) {
             value += c;
             break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             value = undefined;
             state = undefined;
             break;
@@ -145,22 +149,23 @@ export function* tokens(string) {
           case "number-fraction":
             yield [value];
           case undefined:
-            value = "";
-            state = "string";
+            startString(c);
             break;
           case "string":
-            yield [value];
-            state = undefined;
+            if (c === quote) {
+              yield [value];
+              state = undefined;
+            } else {
+              value += c;
+            }
             break;
           case "identifier":
-            yield maybeKeyword();
-            value = "";
-            state = "string";
+            yield keywordOrIdentifier();
+            startString(c);
             break;
           default:
             yield lookup[state];
-            value = "";
-            state = "string";
+            startString(c);
         }
         break;
       case "!":
@@ -190,7 +195,7 @@ export function* tokens(string) {
             value += c;
             break;
           case "identifier":
-            yield maybeKeyword();
+            yield keywordOrIdentifier();
             state = c;
             break;
           default:
@@ -207,13 +212,13 @@ export function* tokens(string) {
           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;
         }
@@ -244,13 +249,13 @@ export function* tokens(string) {
           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;
@@ -317,16 +322,13 @@ export function* tokens(string) {
     case undefined:
       break;
     case "string":
-      const error = new Error("unterminated string");
-      // @ts-ignore
-      error.expression = string;
-      throw error;
+      throw new Error("unterminated string", { cause: string });
     case "number-fraction":
     case "number":
       yield [value];
       break;
     case "identifier":
-      yield maybeKeyword();
+      yield keywordOrIdentifier();
       break;
     default:
       yield lookup[state];