@bablr/language-en-json 0.5.2 → 0.5.4

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 (3) hide show
  1. package/lib/grammar.js +31 -4
  2. package/lib/grammar.macro.js +3 -3
  3. package/package.json +2 -2
package/lib/grammar.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /* @macrome
2
2
  * @generatedby @bablr/macrome-generator-bablr
3
- * @generatedfrom ./grammar.macro.js#1bde898253c86ebc7bd3a504fbc17998de126dc7
3
+ * @generatedfrom ./grammar.macro.js#8f930824203352715e055eeca56bd245a90bc60e
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
  */
@@ -680,7 +680,7 @@ export const grammar = triviaEnhancer({
680
680
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
681
681
  arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
682
682
  openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
683
- values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`intrinsicValue`, _t.ref`closeToken`], {
683
+ values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`intrinsicValue`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`attributes[]`, _t.ref`closeToken`], {
684
684
  openToken: _t.s_i_node(_l.Spamex, "Punctuator", "<"),
685
685
  flags: _t.node(_l.CSTML, "Flags", [_t.ref`intrinsicToken`, _t.ref`tokenToken`], {
686
686
  intrinsicToken: _t.s_i_node(_l.CSTML, "Punctuator", "~"),
@@ -694,6 +694,15 @@ export const grammar = triviaEnhancer({
694
694
  }))], {}, {}),
695
695
  closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
696
696
  }, {}),
697
+ attributes: [_t.node(_l.Spamex, "MappingAttribute", [_t.ref`key`, _t.ref`mapToken`, _t.ref`value`], {
698
+ key: _t.node(_l.Spamex, "Literal", [_t.lit("openSpan")], {}, {}),
699
+ mapToken: _t.s_i_node(_l.Spamex, "Punctuator", "="),
700
+ value: _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
701
+ openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
702
+ content: _t.node(_l.CSTML, "Content", [_t.lit("Escape")], {}, {}),
703
+ closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
704
+ }, {})
705
+ }, {})],
697
706
  closeToken: _t.s_i_node(_l.Spamex, "Punctuator", ">")
698
707
  }, {}), _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
699
708
  openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
@@ -731,7 +740,7 @@ export const grammar = triviaEnhancer({
731
740
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
732
741
  arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
733
742
  openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
734
- values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`intrinsicValue`, _t.ref`closeToken`], {
743
+ values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`intrinsicValue`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`attributes[]`, _t.ref`closeToken`], {
735
744
  openToken: _t.s_i_node(_l.Spamex, "Punctuator", "<"),
736
745
  flags: _t.node(_l.CSTML, "Flags", [_t.ref`intrinsicToken`, _t.ref`tokenToken`], {
737
746
  intrinsicToken: _t.s_i_node(_l.CSTML, "Punctuator", "~"),
@@ -739,6 +748,15 @@ export const grammar = triviaEnhancer({
739
748
  }, {}),
740
749
  type: _t.s_node(_l.Spamex, "Identifier", "Keyword"),
741
750
  intrinsicValue: buildString(match_),
751
+ attributes: [_t.node(_l.Spamex, "MappingAttribute", [_t.ref`key`, _t.ref`mapToken`, _t.ref`value`], {
752
+ key: _t.node(_l.Spamex, "Literal", [_t.lit("closeSpan")], {}, {}),
753
+ mapToken: _t.s_i_node(_l.Spamex, "Punctuator", "="),
754
+ value: _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
755
+ openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
756
+ content: _t.node(_l.CSTML, "Content", [_t.lit("Escape")], {}, {}),
757
+ closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
758
+ }, {})
759
+ }, {})],
742
760
  closeToken: _t.s_i_node(_l.Spamex, "Punctuator", ">")
743
761
  }, {}), _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
744
762
  openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
@@ -765,10 +783,19 @@ export const grammar = triviaEnhancer({
765
783
  verb: _t.s_node(_l.Instruction, "Identifier", "eat"),
766
784
  arguments: _t.node(_l.Instruction, "Tuple", [_t.ref`openToken`, _t.ref`values[]`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`values[]`, _t.ref`closeToken`], {
767
785
  openToken: _t.s_i_node(_l.Instruction, "Punctuator", "("),
768
- values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.ref`closeToken`], {
786
+ values: [_t.node(_l.Spamex, "NodeMatcher", [_t.ref`openToken`, _t.ref`flags`, _t.ref`type`, _t.embedded(_t.s_t_node(_l.Space, "Space", [_t.lit(" ")], {}, {})), _t.ref`attributes[]`, _t.ref`closeToken`], {
769
787
  openToken: _t.s_i_node(_l.Spamex, "Punctuator", "<"),
770
788
  flags: _t.node(_l.CSTML, "Flags", [], {}, {}),
771
789
  type: _t.s_node(_l.Spamex, "Identifier", "EscapeCode"),
790
+ attributes: [_t.node(_l.Spamex, "MappingAttribute", [_t.ref`key`, _t.ref`mapToken`, _t.ref`value`], {
791
+ key: _t.node(_l.Spamex, "Literal", [_t.lit("closeSpan")], {}, {}),
792
+ mapToken: _t.s_i_node(_l.Spamex, "Punctuator", "="),
793
+ value: _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
794
+ openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
795
+ content: _t.node(_l.CSTML, "Content", [_t.lit("Escape")], {}, {}),
796
+ closeToken: _t.s_i_node(_l.CSTML, "Punctuator", "'")
797
+ }, {})
798
+ }, {})],
772
799
  closeToken: _t.s_i_node(_l.Spamex, "Punctuator", ">")
773
800
  }, {}), _t.node(_l.CSTML, "String", [_t.ref`openToken`, _t.ref`content`, _t.ref`closeToken`], {
774
801
  openToken: _t.s_i_node(_l.CSTML, "Punctuator", "'"),
package/lib/grammar.macro.js CHANGED
@@ -103,16 +103,16 @@ export const grammar = triviaEnhancer(
103
103
  yield i`fail()`;
104
104
  }
105
105
 
106
- yield i`eat(<~*Punctuator '\\'> 'sigilToken')`;
106
+ yield i`eat(<~*Punctuator '\\' openSpan='Escape'> 'sigilToken')`;
107
107
 
108
108
  let match, cooked;
109
109
 
110
110
  if ((match = yield i`match(/[\\/bfnrt"]/)`)) {
111
111
  const match_ = ctx.sourceTextFor(match);
112
- yield i`eat(<~*Keyword ${buildString(match_)}> 'value')`;
112
+ yield i`eat(<~*Keyword ${buildString(match_)} closeSpan='Escape'> 'value')`;
113
113
  cooked = escapables.get(match_) || match_;
114
114
  } else if (yield i`match('u')`) {
115
- const codeNode = yield i`eat(<EscapeCode> 'value')`;
115
+ const codeNode = yield i`eat(<EscapeCode closeSpan='Escape'> 'value')`;
116
116
  cooked = parseInt(
117
117
  codeNode.properties.digits.map((digit) => ctx.sourceTextFor(digit)).join(''),
118
118
  16,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bablr/language-en-json",
3
- "version": "0.5.2",
3
+ "version": "0.5.4",
4
4
  "description": "A BABLR language for JSON",
5
5
  "engines": {
6
6
  "node": ">=12.0.0"
@@ -25,7 +25,7 @@
25
25
  "@bablr/agast-vm-helpers": "0.3.2",
26
26
  "@bablr/boot": "0.4.0",
27
27
  "@bablr/helpers": "0.18.2",
28
- "@bablr/language-en-blank-space": "0.3.2",
28
+ "@bablr/language-en-blank-space": "0.3.1",
29
29
  "@babel/runtime": "^7.22.15"
30
30
  },
31
31
  "devDependencies": {