@bablr/boot 0.1.3 → 0.1.5

package/lib/index.js

@@ -2,6 +2,7 @@ const instruction = require('./languages/instruction.js');
 const regex = require('./languages/regex.js');
 const spamex = require('./languages/spamex.js');
 const string = require('./languages/string.js');
+const number = require('./languages/number.js');
 const cstml = require('./languages/cstml.js');
 const { TemplateParser } = require('./miniparser.js');
 
@@ -33,6 +34,7 @@ const i = buildTag(instruction, 'Call');
 const spam = buildTag(spamex, 'Matcher');
 const re = buildTag(regex, 'Pattern');
 const str = buildTag(string, 'String');
+const num = buildTag(number, 'Number');
 const cst = buildTag(cstml, 'Node');
 
-module.exports = { re, spam, str, i, cst };
+module.exports = { re, spam, str, num, i, cst };

package/lib/languages/cstml.js

@@ -1,28 +1,44 @@
 const Regex = require('./regex.js');
 const StringLanguage = require('./string.js');
+const Number = require('./number.js');
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
 
 const _ = /\s+/y;
 const PN = 'Punctuator';
 const ID = 'Identifier';
+const LIT = 'Literal';
 
 const name = 'CSTML';
 
-const dependencies = { Regex, String: StringLanguage };
+const dependencies = { Regex, String: StringLanguage, Number };
 
 const covers = buildCovers({
-  [sym.node]: ['Attribute', 'Property', 'TagType', 'Node', 'OpenNodeTag', 'CloseNodeTag'],
+  [sym.node]: [
+    'Attribute',
+    'Property',
+    'TagType',
+    'Node',
+    'OpenNodeTag',
+    'CloseNodeTag',
+    'Terminal',
+  ],
   [sym.fragment]: ['Attributes'],
-  Attribute: ['StringAttribute', 'BooleanAttribute'],
+  Attribute: ['MappingAttribute', 'BooleanAttribute'],
+  AttributeValue: ['String:String', 'Number:Number'],
   TagType: ['Identifier', 'GlobalIdentifier'],
+  Terminal: ['Literal', 'Trivia', 'Escape'],
 });
 
 const grammar = class CSTMLMiniparserGrammar {
   Fragment(p) {
     p.eatMatchTrivia(_);
-    while (p.match(/<[^/]/y) || p.atExpression) {
-      p.eatProduction('Property', { path: 'properties[]' });
+    while (p.match(/['"]|<[^/]/y) || p.atExpression) {
+      if (p.match(/['"]/y)) {
+        p.eatProduction('Terminal', { path: 'properties[]' });
+      } else {
+        p.eatProduction('Property', { path: 'properties[]' });
+      }
       p.eatMatchTrivia(_);
     }
   }
@@ -62,7 +78,7 @@ const grammar = class CSTMLMiniparserGrammar {
   // @Node
   CloseNodeTag(p) {
     p.eat('</', PN, { path: 'open', startSpan: 'Tag', balanced: '>' });
-
+    // TODO permit .type
     p.eat('>', PN, { path: 'close', endSpan: 'Tag', balancer: true });
   }
 
@@ -86,7 +102,7 @@ const grammar = class CSTMLMiniparserGrammar {
   // @Cover
   Attribute(p) {
     if (p.match(/\w+\s*=/y)) {
-      p.eatProduction('StringAttribute');
+      p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
     }
@@ -98,12 +114,21 @@ const grammar = class CSTMLMiniparserGrammar {
   }
 
   // @Node
-  StringAttribute(p) {
-    p.eat(/\w+/y, ID, { path: 'key' });
+  MappingAttribute(p) {
+    p.eat(/\w+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapOperator' });
     p.eatMatchTrivia(_);
-    p.eatProduction('String:String', { path: 'value' });
+    p.eatProduction('AttributeValue', { path: 'value' });
+  }
+
+  // @Cover
+  AttributeValue(p) {
+    if (p.match(/['"]/y)) {
+      p.eatProduction('String:String');
+    } else if (p.match(/-|\d/y)) {
+      p.eatProduction('Number:Number');
+    }
   }
 
   // @Cover
@@ -126,6 +151,37 @@ const grammar = class CSTMLMiniparserGrammar {
   Identifier(p) {
     p.eatLiteral(/\w+/y);
   }
+
+  // @Cover
+  Terminal(p) {
+    if (p.match(/!['"]/y)) {
+      p.eatProduction('Escape');
+    } else if (p.match(/#['"]/y)) {
+      p.eatProduction('Trivia');
+    } else {
+      p.eatProduction('Literal');
+    }
+  }
+
+  // @Node
+  Escape(p) {
+    p.eat('!', PN, { path: 'escapeOperator' });
+    p.eatProduction('String:String', { path: 'rawValue' });
+    p.eatMatchTrivia(_);
+    p.eat(':', PN, { path: 'rawOperator' });
+    p.eatProduction('String:String', { path: 'value' });
+  }
+
+  // @Node
+  Trivia(p) {
+    p.eat('#', PN, { path: 'trivializeOperator' });
+    p.eatProduction('String:String', { path: 'value' });
+  }
+
+  // @Node
+  Literal(p) {
+    p.eatProduction('String:String', { path: 'value' });
+  }
 };
 
 module.exports = { name, dependencies, covers, grammar };

package/lib/languages/instruction.js

@@ -34,6 +34,7 @@ const grammar = class InstructionMiniparserGrammar {
   Call(p) {
     p.eat(/\w+/y, ID, { path: 'verb' });
     p.eatMatchTrivia(_);
+    p.eatMatch(/[!#]/y, PN, { path: 'verbSuffix' });
     p.eatProduction('Tuple', { path: 'arguments' });
   }
 

package/lib/languages/number.js

@@ -0,0 +1,38 @@
+const { buildCovers } = require('../utils.js');
+const sym = require('../symbols.js');
+
+const name = 'Number';
+
+const dependencies = {};
+
+const covers = buildCovers({
+  [sym.node]: ['Number', 'Digit'],
+  Number: ['LiteralNumber', 'SymbolicNumber'],
+});
+
+const grammar = class NumberMiniparserGrammar {
+  // @Node
+  LiteralNumber(p) {
+    p.eatMatch('-', 'Punctuator', { path: 'negative' });
+    p.eatProduction('Digits', { path: 'digits[]' });
+  }
+
+  // @Node
+  SymbolicNumber(p) {
+    p.eatMatch('-', 'Punctuator', { path: 'negative' });
+    p.eat('Infinity', 'Keyword', { path: 'value' });
+  }
+
+  Digits(p) {
+    while (p.match(/\d/y)) {
+      p.eatProduction('Digit');
+    }
+  }
+
+  // @Node
+  Digit(p) {
+    p.eatLiteral(/\d/y);
+  }
+};
+
+module.exports = { name, dependencies, covers, grammar };

package/lib/languages/regex.js

@@ -76,7 +76,7 @@ const cookEscape = (escape, span) => {
   }
 
   if (hexMatch) {
-    return parseInt(hexMatch[1], 16);
+    return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
   let litMatch = /\\([nrt0])/y.exec(escape);
@@ -306,7 +306,7 @@ const grammar = class RegexMiniparserGrammar {
         max = p.eatMatch(/\d+/y, 'Number', { path: 'max' });
       }
 
-      attrs = { min, max };
+      attrs = { min: min && parseInt(min, 10), max: max && parseInt(max, 10) };
 
       p.eat('}', PN, { path: 'close', balancer: true });
     }

package/lib/languages/spamex.js

@@ -1,5 +1,6 @@
 const Regex = require('./regex.js');
 const StringLanguage = require('./string.js');
+const Number = require('./number.js');
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
 
@@ -11,11 +12,12 @@ const LIT = 'Literal';
 
 const name = 'Spamex';
 
-const dependencies = { Regex, String: StringLanguage };
+const dependencies = { Regex, String: StringLanguage, Number };
 
 const covers = buildCovers({
   [sym.node]: ['Attribute', 'TagType', 'Matcher', 'Literal'],
-  Attribute: ['StringAttribute', 'BooleanAttribute'],
+  Attribute: ['MappingAttribute', 'BooleanAttribute'],
+  AttributeValue: ['String:String', 'Number:Number'],
   Matcher: ['NodeMatcher', 'TerminalMatcher', 'TriviaTerminalMatcher', 'StringMatcher'],
   StringMatcher: ['String:String', 'Regex:Pattern'],
   TagType: ['Identifier', 'GlobalIdentifier'],
@@ -96,7 +98,7 @@ const grammar = class SpamexMiniparserGrammar {
   // @Cover
   Attribute(p) {
     if (p.match(/\w+\s*=/y)) {
-      p.eatProduction('StringAttribute');
+      p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
     }
@@ -108,12 +110,21 @@ const grammar = class SpamexMiniparserGrammar {
   }
 
   // @Node
-  StringAttribute(p) {
+  MappingAttribute(p) {
     p.eat(/\w+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapOperator' });
     p.eatMatchTrivia(_);
-    p.eatProduction('String:String', { path: 'value' });
+    p.eatProduction('AttributeValue', { path: 'value' });
+  }
+
+  // @Cover
+  AttributeValue(p) {
+    if (p.match(/['"]/y)) {
+      p.eatProduction('String:String');
+    } else if (p.match(/-|\d/y)) {
+      p.eatProduction('Number:Number');
+    }
   }
 
   // @Cover

package/lib/languages/string.js

@@ -14,10 +14,10 @@ const PN = 'Punctuator';
 
 const escapables = new Map(
   objectEntries({
-    n: '\n'.codePointAt(0),
-    r: '\r'.codePointAt(0),
-    t: '\t'.codePointAt(0),
-    0: '\0'.codePointAt(0),
+    n: '\n',
+    r: '\r',
+    t: '\t',
+    0: '\0',
   }),
 );
 
@@ -41,7 +41,7 @@ const cookEscape = (escape, span) => {
   }
 
   if (hexMatch) {
-    return parseInt(hexMatch[1], 16);
+    return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
   const litPattern = span === 'String:Single' ? /\\([\\nrt0'])/y : /\\([\\nrt0"])/y;
@@ -79,8 +79,8 @@ const grammar = class StringMiniparserGrammar {
           : p.eatMatchEscape(/\\(u(\{\d{1,6}\}|\d{4})|x[0-9a-fA-F]{2}|[\\nrt0"])/y);
       lit =
         p.span.type === 'Single'
-          ? p.eatMatchLiteral(/[^\r\n\\']+/y)
-          : p.eatMatchLiteral(/[^\r\n\\"]+/y);
+          ? p.eatMatchLiteral(/[^\r\n\0\\']+/y)
+          : p.eatMatchLiteral(/[^\r\n\0\\"]+/y);
       i++;
     } while (esc || lit);
     if (i === 1 && !esc && !lit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"

package/shorthand.macro.js

@@ -11,6 +11,7 @@ const i = require('./lib/languages/instruction.js');
 const re = require('./lib/languages/regex.js');
 const spam = require('./lib/languages/spamex.js');
 const str = require('./lib/languages/string.js');
+const num = require('./lib/languages/number.js');
 const cstml = require('./lib/languages/cstml.js');
 const { addNamespace, addNamed } = require('@babel/helper-module-imports');
 const { PathResolver } = require('@bablr/boot-helpers/path');
@@ -146,6 +147,7 @@ const languages = {
   re,
   spam,
   str,
+  num,
   cst: cstml,
 };
 
@@ -154,6 +156,7 @@ const topTypes = {
   re: 'Pattern',
   spam: 'Matcher',
   str: 'String',
+  num: 'Number',
   cst: 'Node',
 };
 
@@ -173,6 +176,7 @@ const shorthandMacro = ({ references }) => {
     references.spam,
     references.re,
     references.str,
+    references.num,
     references.cst,
   )) {
     if (!bindings.t) {