@bablr/helpers 0.19.0 → 0.20.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 (4) hide show
  1. package/lib/decorators.js +7 -0
  2. package/lib/productions.js +27 -27
  3. package/lib/trivia.js +1 -5
  4. package/package.json +6 -6
package/lib/decorators.js CHANGED
@@ -49,3 +49,10 @@ export const Attributes = (attributes) => (desc, context) => {
49
49
  this.attributes.set(context.name, attributes);
50
50
  });
51
51
  };
52
+
53
+ export const UnboundAttributes = (attributes) => (desc, context) => {
54
+ context.addInitializer(function () {
55
+ this.unboundAttributes = this.unboundAttributes || new Map();
56
+ this.unboundAttributes.set(context.name, attributes);
57
+ });
58
+ };
package/lib/productions.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
  export function* List({
@@ -20,16 +20,16 @@ export function* List({
20
20
  yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
21
21
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
22
22
  arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), _t.ref`values[]`, _t.embedded(_t.node(_l.Instruction, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
23
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
23
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
24
24
  values: [_t.node(_l.Instruction, "Array", [_t.ref`openToken`, _t.ref`closeToken`], {
25
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "["),
26
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", "]")
25
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "["),
26
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", "]")
27
27
  }, {}), _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
28
- openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
28
+ openToken: _t.s_node(_l.CSTML, "Punctuator", "'"),
29
29
  content: _t.node(_l.CSTML, "Content", [_t.lit("separators[]")], {}, {}),
30
- closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
30
+ closeToken: _t.s_node(_l.CSTML, "Punctuator", "'")
31
31
  }, {})],
32
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
32
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
33
33
  }, {})
34
34
  }, {});
35
35
  let sep,
@@ -38,23 +38,23 @@ export function* List({
38
38
  for (;;) {
39
39
  it = yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
40
40
  verb: _t.s_node(_l.Instruction, "Identifier", "eatMatch"),
41
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(element, _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.ref`closeToken`], {
42
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
41
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(element, _t.ref`values[]`), _t.ref`closeToken`], {
42
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
43
43
  values: [..._interpolateArray(element)],
44
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
44
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
45
45
  }, {})
46
46
  }, {});
47
47
  if (it || allowTrailingSeparator) {
48
48
  sep = yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
49
49
  verb: _t.s_node(_l.Instruction, "Identifier", "eatMatch"),
50
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(separator, _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.embedded(_t.node(_l.Instruction, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
51
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
50
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(separator, _t.ref`values[]`), _t.embedded(_t.node(_l.Instruction, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
51
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
52
52
  values: [..._interpolateArray(separator), _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
53
- openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
53
+ openToken: _t.s_node(_l.CSTML, "Punctuator", "'"),
54
54
  content: _t.node(_l.CSTML, "Content", [_t.lit("separators[]")], {}, {}),
55
- closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
55
+ closeToken: _t.s_node(_l.CSTML, "Punctuator", "'")
56
56
  }, {})],
57
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
57
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
58
58
  }, {})
59
59
  }, {});
60
60
  anySep ||= sep;
@@ -69,10 +69,10 @@ export function* Any({
69
69
  for (const matcher of ctx.unbox(matchers)) {
70
70
  if (yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
71
71
  verb: _t.s_node(_l.Instruction, "Identifier", "eatMatch"),
72
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(matcher, _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.ref`closeToken`], {
73
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
72
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(matcher, _t.ref`values[]`), _t.ref`closeToken`], {
73
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
74
74
  values: [..._interpolateArray(matcher)],
75
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
75
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
76
76
  }, {})
77
77
  }, {})) break;
78
78
  }
@@ -84,10 +84,10 @@ export function* All({
84
84
  for (const matcher of ctx.unbox(matchers)) {
85
85
  yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
86
86
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
87
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(matcher, _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.ref`closeToken`], {
88
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
87
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(matcher, _t.ref`values[]`), _t.ref`closeToken`], {
88
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
89
89
  values: [..._interpolateArray(matcher)],
90
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
90
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
91
91
  }, {})
92
92
  }, {});
93
93
  }
@@ -98,10 +98,10 @@ export function* Punctuator({
98
98
  if (!intrinsicValue) throw new Error('Intrinsic productions must have value');
99
99
  yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
100
100
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
101
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(intrinsicValue, _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.ref`closeToken`], {
102
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
101
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(intrinsicValue, _t.ref`values[]`), _t.ref`closeToken`], {
102
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
103
103
  values: [..._interpolateArray(intrinsicValue)],
104
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
104
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
105
105
  }, {})
106
106
  }, {});
107
107
  }
@@ -116,10 +116,10 @@ export function* Optional({
116
116
  }
117
117
  yield _t.node(_l.Instruction, "Call", [_t.ref`verb`, _t.ref`arguments`], {
118
118
  verb: _t.s_node(_l.Instruction, "Identifier", "eatMatch"),
119
- arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateArrayChildren(matchers_[0], _t.ref`values[]`, _t.embedded(_t.t_node(_l.Comment, null, [_t.embedded(_t.t_node('Space', 'Space', [_t.lit(' ')]))]))), _t.ref`closeToken`], {
120
- openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
119
+ arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.arr(), ..._interpolateFragmentChildren(matchers_[0], _t.ref`values[]`), _t.ref`closeToken`], {
120
+ openToken: _t.s_node(_l.Instruction, "Punctuator", "("),
121
121
  values: [..._interpolateArray(matchers_[0])],
122
- closeToken: _t.s_i_node(_l.Instruction, "Punctuator", ")")
122
+ closeToken: _t.s_node(_l.Instruction, "Punctuator", ")")
123
123
  }, {})
124
124
  }, {});
125
125
  }
package/lib/trivia.js CHANGED
@@ -5,11 +5,7 @@ import { OpenNodeTag, CloseNodeTag, ReferenceTag } from './symbols.js';
5
5
 
6
6
  const lookbehind = (context, s) => {
7
7
  let token = s.result;
8
- while (
9
- token &&
10
- [OpenNodeTag, CloseNodeTag, ReferenceTag].includes(token.type) &&
11
- (token.type !== OpenNodeTag || !(token.value.flags.intrinsic && token.value.flags.token))
12
- ) {
8
+ while (token && [OpenNodeTag, CloseNodeTag, ReferenceTag].includes(token.type)) {
13
9
  const prevToken = context.getPreviousTag(token);
14
10
  if (!prevToken) break;
15
11
  token = prevToken;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@bablr/helpers",
3
3
  "description": "Command helpers for use in writing BABLR grammars",
4
- "version": "0.19.0",
4
+ "version": "0.20.0",
5
5
  "author": "Conrad Buck<conartist6@gmail.com>",
6
6
  "type": "module",
7
7
  "files": [
@@ -28,16 +28,16 @@
28
28
  "clean": "macrome clean"
29
29
  },
30
30
  "dependencies": {
31
- "@bablr/language_enhancer-debug-log": "0.6.0",
32
- "@bablr/strategy_enhancer-debug-log": "0.5.0",
33
- "@bablr/agast-helpers": "0.4.0",
34
- "@bablr/agast-vm-helpers": "0.4.0",
31
+ "@bablr/language_enhancer-debug-log": "^0.7.0",
32
+ "@bablr/strategy_enhancer-debug-log": "^0.6.0",
33
+ "@bablr/agast-helpers": "^0.5.0",
34
+ "@bablr/agast-vm-helpers": "^0.5.0",
35
35
  "@bablr/coroutine": "0.1.0",
36
36
  "@iter-tools/imm-stack": "1.1.0",
37
37
  "iter-tools-es": "^7.5.3"
38
38
  },
39
39
  "devDependencies": {
40
- "@bablr/boot": "0.5.0",
40
+ "@bablr/boot": "^0.6.0",
41
41
  "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#d834ccc52795d6c3b96ecc6c419960fceed221a6",
42
42
  "@bablr/macrome": "0.1.3",
43
43
  "@bablr/macrome-generator-bablr": "0.3.2",