@bablr/language-en-bablr-vm-instruction 0.5.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/cstml.grammar.js +11 -9
  2. package/lib/grammar.js +363 -373
  3. package/lib/grammar.macro.js +20 -20
  4. package/lib/spamex.grammar.js +15 -13
  5. package/package.json +10 -10
package/lib/grammar.macro.js CHANGED
@@ -17,9 +17,9 @@ export function* eatMatchTrivia() {
17
17
  export const grammar = class BABLRVMInstructionGrammar {
18
18
  @Node
19
19
  *Call() {
20
- yield i`eat(<*Identifier /> 'callee')`;
20
+ yield i`eat(<*Identifier /> 'callee$')`;
21
21
  yield* eatMatchTrivia();
22
- yield i`eat(<Tuple /> 'arguments')`;
22
+ yield i`eat(<Tuple /> 'arguments$')`;
23
23
  }
24
24
 
25
25
  *Expression() {
@@ -37,64 +37,64 @@ export const grammar = class BABLRVMInstructionGrammar {
37
37
  @CoveredBy('Expression')
38
38
  @Node
39
39
  *Array() {
40
- yield i`eat(<~*Punctuator '[' balanced=']' /> 'openToken')`;
40
+ yield i`eat(<*Punctuator '[' balanced=']' /> 'openToken')`;
41
41
  let sp = yield* eatMatchTrivia();
42
42
  let first = true;
43
43
  while ((first || sp) && (yield i`match(/./y)`)) {
44
- yield i`eat(<Expression /> 'elements[]')`;
44
+ yield i`eat(<Expression /> 'elements[]$')`;
45
45
  sp = yield* eatMatchTrivia();
46
46
  first = false;
47
47
  }
48
- yield i`eat(<~*Punctuator ']' balancer /> 'closeToken')`;
48
+ yield i`eat(<*Punctuator ']' balancer /> 'closeToken')`;
49
49
  }
50
50
 
51
51
  @CoveredBy('Expression')
52
52
  @Node
53
53
  *Object() {
54
- yield i`eat(<~*Punctuator '{' balanced='}' /> 'openToken')`;
54
+ yield i`eat(<*Punctuator '{' balanced='}' /> 'openToken')`;
55
55
  let sp = yield* eatMatchTrivia();
56
56
  let first = true;
57
57
  while ((first || sp) && (yield i`match(/./y)`)) {
58
- yield i`eat(<Property /> 'properties[]')`;
58
+ yield i`eat(<Property /> 'properties[]$')`;
59
59
  sp = yield* eatMatchTrivia();
60
60
  first = false;
61
61
  }
62
- yield i`eat(<~*Punctuator '}' balancer /> 'closeToken')`;
62
+ yield i`eat(<*Punctuator '}' balancer /> 'closeToken')`;
63
63
  }
64
64
 
65
65
  @Node
66
66
  *Property() {
67
- yield i`eat(<*Identifier /> 'key')`;
67
+ yield i`eat(<*Identifier /> 'key$')`;
68
68
  yield* eatMatchTrivia();
69
- yield i`eat(<~*Punctuator ':' /> 'mapToken')`;
69
+ yield i`eat(<*Punctuator ':' /> 'mapToken')`;
70
70
  yield* eatMatchTrivia();
71
- yield i`eat(<Expression /> 'value')`;
71
+ yield i`eat(<Expression /> 'value$')`;
72
72
  }
73
73
 
74
74
  @CoveredBy('Expression')
75
75
  @Node
76
76
  *Tuple() {
77
- yield i`eat(<~*Punctuator '(' balanced=')' /> 'openToken')`;
77
+ yield i`eat(<*Punctuator '(' balanced=')' /> 'openToken')`;
78
78
  let sp = yield* eatMatchTrivia();
79
79
  let first = true;
80
80
  while ((first || sp) && (yield i`match(/./y)`)) {
81
- yield i`eat(<Expression /> 'values[]')`;
81
+ yield i`eat(<Expression /> 'values[]$')`;
82
82
  sp = yield* eatMatchTrivia();
83
83
  first = false;
84
84
  }
85
- yield i`eat(<~*Punctuator ')' balancer /> 'closeToken')`;
85
+ yield i`eat(<*Punctuator ')' balancer /> 'closeToken')`;
86
86
  }
87
87
 
88
88
  @CoveredBy('Expression')
89
89
  @Node
90
90
  *Boolean() {
91
- yield i`eat(<~*Keyword /true|false/ /> 'sigilToken')`;
91
+ yield i`eat(<*Keyword /true|false/ /> 'sigilToken')`;
92
92
  }
93
93
 
94
94
  @CoveredBy('Expression')
95
95
  @Node
96
96
  *Null() {
97
- yield i`eat(<~*Keyword 'null' /> 'sigilToken')`;
97
+ yield i`eat(<*Keyword 'null' /> 'sigilToken')`;
98
98
  }
99
99
 
100
100
  @CoveredBy('Expression')
@@ -118,8 +118,8 @@ export const grammar = class BABLRVMInstructionGrammar {
118
118
  @CoveredBy('Number')
119
119
  @Node
120
120
  *Integer() {
121
- yield i`eatMatch(<~*Punctuator '-' /> 'negativeToken')`;
122
- yield i`eat(<Digits /> 'digits[]')`;
121
+ yield i`eatMatch(<*Punctuator '-' /> 'negativeToken')`;
122
+ yield i`eat(<Digits /> 'digits[]$')`;
123
123
  }
124
124
 
125
125
  *Digits() {
@@ -134,8 +134,8 @@ export const grammar = class BABLRVMInstructionGrammar {
134
134
  @CoveredBy('Number')
135
135
  @Node
136
136
  *Infinity() {
137
- yield i`eatMatch(<~*Punctuator /[+-]/ /> 'signToken')`;
138
- yield i`eat(<~*Keyword 'Infinity' /> 'sigilToken')`;
137
+ yield i`eatMatch(<*Punctuator /[+-]/ /> 'signToken')`;
138
+ yield i`eat(<*Keyword 'Infinity' /> 'sigilToken')`;
139
139
  }
140
140
 
141
141
  @Node
package/lib/spamex.grammar.js CHANGED
@@ -4,7 +4,7 @@
4
4
  * This file is autogenerated. Please do not edit it directly.
5
5
  * When editing run `npx macrome watch` then change the file this is generated from.
6
6
  */
7
- import { interpolateArray as _interpolateArray, interpolateArrayChildren as _interpolateArrayChildren, interpolateString as _interpolateString } from "@bablr/agast-helpers/template";
7
+ import { interpolateArray as _interpolateArray, interpolateFragmentChildren as _interpolateFragmentChildren, interpolateString as _interpolateString } from "@bablr/agast-helpers/template";
8
8
  import * as _l from "@bablr/agast-vm-helpers/languages";
9
9
  import * as _t from "@bablr/agast-helpers/shorthand";
10
10
  import * as Spamex from '@bablr/language-en-spamex';
@@ -19,32 +19,34 @@ export const grammar = class BABLRVMSpamexInstructionGrammar extends Instruction
19
19
  if (yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
20
20
  verb: _t.s_node(_l.Instruction, "Identifier", "eatMatch"),
21
21
  arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), _t.ref`values[]`, _t.ref`closeToken`], {
22
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
22
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
23
23
  values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`open`], {
24
24
  open: _t.node(_l.Spamex, "OpenNodeMatcher", [10, [[_t.ref`openToken`, _t.ref`flags`, _t.ref`language`, _t.ref`namespaceSeparatorToken`], [_t.ref`type`, _t.embedded(_t.node(_l.Spamex, "Space", [_t.lit(" ")], {}, {})), _t.ref`intrinsicValue`, _t.embedded(_t.node(_l.Spamex, "Space", [_t.lit(" ")], {}, {})), _t.ref`selfClosingTagToken`, _t.ref`closeToken`]]], {
25
- openToken: _t.s_i_node(_l.Spamex, "Punctuator", "<"),
25
+ openToken: _t.s_node(_l.Spamex, "Punctuator", "<"),
26
26
  flags: _t.node(_l.CSTML, "Flags", [], {}, {}),
27
- language: _t.s_node(_l.Spamex, "Identifier", "Spamex"),
28
- namespaceSeparatorToken: _t.s_i_node(_l.Spamex, "Punctuator", ":"),
29
- type: _t.s_node(_l.Spamex, "Identifier", "Pattern"),
27
+ language: _t.node(_l.CSTML, "IdentifierPath", [_t.ref`segments[]`, _t.arr(), _t.ref`segments[]`], {
28
+ segments: [_t.s_node(_l.CSTML, "Identifier", "Spamex")]
29
+ }, {}),
30
+ namespaceSeparatorToken: _t.s_node(_l.CSTML, "Punctuator", ":"),
31
+ type: _t.s_node(_l.CSTML, "Identifier", "Pattern"),
30
32
  intrinsicValue: _t.node(_l.Regex, "Pattern", [_t.ref`openToken`, _t.ref`alternatives[]`, _t.arr(), _t.ref`alternatives[]`, _t.ref`closeToken`], {
31
- openToken: _t.s_i_node(_l.Regex, "Punctuator", "/"),
33
+ openToken: _t.s_node(_l.Regex, "Punctuator", "/"),
32
34
  alternatives: [_t.node(_l.Regex, "Alternative", [_t.ref`elements[]`, _t.arr(), _t.ref`elements[]`], {
33
35
  elements: [_t.node(_l.Regex, "CharacterClass", [_t.ref`openToken`, _t.ref`elements[]`, _t.arr(), _t.ref`elements[]`, _t.ref`elements[]`, _t.ref`elements[]`, _t.ref`elements[]`, _t.ref`closeToken`], {
34
- openToken: _t.s_i_node(_l.Regex, "Punctuator", "["),
36
+ openToken: _t.s_node(_l.Regex, "Punctuator", "["),
35
37
  elements: [_t.node(_l.Regex, "Character", [_t.lit("<")], {}, {}), _t.node(_l.Regex, "Character", [_t.lit("'")], {}, {}), _t.node(_l.Regex, "Character", [_t.lit("\"")], {}, {}), _t.node(_l.Regex, "Character", [_t.lit("/")], {}, {})],
36
- closeToken: _t.s_i_node(_l.Regex, "Punctuator", "]")
38
+ closeToken: _t.s_node(_l.Regex, "Punctuator", "]")
37
39
  }, {
38
40
  negate: false
39
41
  })]
40
42
  }, {})],
41
- closeToken: _t.s_i_node(_l.Regex, "Punctuator", "/")
43
+ closeToken: _t.s_node(_l.Regex, "Punctuator", "/")
42
44
  }, {}),
43
- selfClosingTagToken: _t.s_i_node(_l.Spamex, "Punctuator", "/"),
44
- closeToken: _t.s_i_node(_l.Spamex, "Punctuator", ">")
45
+ selfClosingTagToken: _t.s_node(_l.Spamex, "Punctuator", "/"),
46
+ closeToken: _t.s_node(_l.Spamex, "Punctuator", ">")
45
47
  }, {})
46
48
  }, {})],
47
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
49
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
48
50
  }, {})
49
51
  }, {})) {
50
52
  // done
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bablr/language-en-bablr-vm-instruction",
3
- "version": "0.5.0",
3
+ "version": "0.6.0",
4
4
  "description": "A BABLR language for BABLR VM instructions",
5
5
  "engines": {
6
6
  "node": ">=12.0.0"
@@ -23,18 +23,18 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@babel/runtime": "^7.23.2",
26
- "@bablr/agast-helpers": "0.4.0",
27
- "@bablr/agast-vm-helpers": "0.4.0",
28
- "@bablr/helpers": "0.19.0",
29
- "@bablr/language-en-blank-space": "0.4.0",
30
- "@bablr/language-en-cstml": "0.5.0",
31
- "@bablr/language-en-spamex": "0.5.0"
26
+ "@bablr/agast-helpers": "^0.5.0",
27
+ "@bablr/agast-vm-helpers": "^0.5.0",
28
+ "@bablr/helpers": "^0.20.0",
29
+ "@bablr/language-en-blank-space": "^0.5.0",
30
+ "@bablr/language-en-cstml": "^0.6.0",
31
+ "@bablr/language-en-spamex": "^0.6.0"
32
32
  },
33
33
  "devDependencies": {
34
- "@bablr/boot": "0.5.0",
34
+ "@bablr/boot": "^0.6.0",
35
35
  "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
36
- "@bablr/macrome": "0.1.3",
37
- "@bablr/macrome-generator-bablr": "0.3.2",
36
+ "@bablr/macrome": "^0.1.3",
37
+ "@bablr/macrome-generator-bablr": "^0.3.2",
38
38
  "enhanced-resolve": "^5.12.0",
39
39
  "eslint": "^8.47.0",
40
40
  "eslint-import-resolver-enhanced-resolve": "^1.0.5",