@bablr/language-en-bablr-cli-verbose-output 0.10.7 → 0.11.0

package/lib/grammar.js

@@ -1,34 +1,49 @@
-import { re, spam as m } from '@bablr/boot';
-import { eat, eatMatch, match } from '@bablr/helpers/grammar';
+import { m, eat, eatMatch, match } from '@bablr/helpers/grammar';
 import CSTML from '@bablr/language-en-cstml';
 import Instruction from '@bablr/language-en-bablr-vm-instruction';
 import Space from '@bablr/language-en-blank-space';
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/bablr-cli-verbose-output';
-
-export const dependencies = { Space, CSTML, Instruction };
-
-export const defaultMatcher = m`<Output />`;
+import { printSource } from '@bablr/agast-helpers/tree';
+import { freezeRecord, freeze, freezeClass } from '@bablr/agast-helpers/object';
 
 export function* eatMatchTrivia() {
-  if (yield match(re`/[ \t\n]/`)) {
+  if (yield match(m`/[ \t\n]/`)) {
     return yield eat(m`#: :Space: <*Space />`);
   }
   return null;
 }
 
-export const grammar = class VerboseOutputGrammar {
+export default class VerboseOutput {
+  static canonicalURL = 'https://bablr.org/languages/core/en/bablr-cli-verbose-output';
+  static dependencies = freeze({ Space, CSTML, Instruction });
+  static defaultMatcher = m`<Output />`;
+  static fragmentProduction = null;
+  static context = freezeRecord({});
+
   *Output() {
-    while ((yield match(re`/./`)) && (yield eat(m`lines[]$: <_Line />`)));
+    while ((yield match(m`/./`)) && (yield eat(m`lines[]$: <_Line />`)));
   }
 
   *Line() {
-    if (yield eatMatch(m`<ExecInstructionLine /(?:    )?\>\>\>/ />`)) {
-    } else if (yield eatMatch(m`<EmitLine '<<<' />`)) {
-    } else if (yield eatMatch(m`<EnterProductionLine '-->' />`)) {
-    } else if (yield eatMatch(m`<LeaveProductionLine /[x<]--/ />`)) {
-    } else {
-      yield eatMatch(m`<OutputLine /./s />`);
+    let res = yield match(m`/(?:    )?[>]{3}|[<]{3}|--[>]|[x<]--/`);
+
+    switch (printSource(res)) {
+      case '<<<':
+        yield eat(m`<EmitLine />`);
+        break;
+      case '>>>':
+      case '    >>>':
+        yield eat(m`<ExecInstructionLine />`);
+        break;
+      case '-->':
+        yield eat(m`<EnterProductionLine />`);
+        break;
+      case '<--':
+      case 'x--':
+        yield eat(m`<LeaveProductionLine />`);
+        break;
+      default:
+        yield eat(m`<OutputLine />`);
+        break;
     }
   }
 
@@ -74,11 +89,11 @@ export const grammar = class VerboseOutputGrammar {
 
     yield eatMatch(m`#: :Space: <*Space /[ \t]/ />`);
 
-    while (yield eatMatch(m`expressions[]: :CSTML: <_Tag />`)) {
+    while (yield eatMatch(m`expressions[]: :CSTML: <_Tag /./ />`)) {
       yield eatMatch(m`#: :Space: <*Space /[ \t]/ />`);
     }
     yield eat(m`lineTerminatorToken: <* '\n' />`);
   }
-};
+}
 
-export default { canonicalURL, dependencies, grammar, defaultMatcher };
+freezeClass(VerboseOutput);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-bablr-cli-verbose-output",
-  "version": "0.10.7",
+  "version": "0.11.0",
   "description": "A BABLR language for BABLR CLI verbose output",
   "engines": {
     "node": ">=12.0.0"
@@ -15,16 +15,15 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.4",
-    "@bablr/agast-vm-helpers": "0.10.4",
-    "@bablr/boot": "0.11.3",
-    "@bablr/helpers": "0.25.2",
-    "@bablr/language-en-bablr-vm-instruction": "0.11.7",
-    "@bablr/language-en-blank-space": "0.10.12",
-    "@bablr/language-en-cstml": "0.12.5"
+    "@bablr/agast-helpers": "0.11.3",
+    "@bablr/agast-vm-helpers": "0.11.3",
+    "@bablr/helpers": "0.26.4",
+    "@bablr/language-en-bablr-vm-instruction": "0.12.0",
+    "@bablr/language-en-blank-space": "0.11.1",
+    "@bablr/language-en-cstml": "0.13.0"
   },
   "devDependencies": {
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#23b94fb3bdfdbc3ac7ed9cb58d7979d8f07dce2b",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",