grammar-well 1.2.2 → 1.2.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.
- package/bootstrap.ts +6 -3
- package/build/compiler/compiler.js +2 -2
- package/build/compiler/compiler.js.map +1 -1
- package/build/typings.d.ts +2 -0
- package/build/utility/monarch.js +21 -14
- package/build/utility/monarch.js.map +1 -1
- package/package.json +1 -1
- package/src/compiler/compiler.ts +2 -2
- package/src/compiler/gwell.gwell +4 -0
- package/src/typings.ts +2 -0
- package/src/utility/monarch.ts +19 -10
- package/build/grammars/gwell.d.ts +0 -1039
- package/build/grammars/gwell.js +0 -553
- package/build/grammars/gwell.js.map +0 -1
- package/build/grammars/json.d.ts +0 -151
- package/build/grammars/json.js +0 -112
- package/build/grammars/json.js.map +0 -1
- package/build/grammars/number.d.ts +0 -239
- package/build/grammars/number.js +0 -115
- package/build/grammars/number.js.map +0 -1
- package/build/grammars/number.json +0 -1
- package/build/grammars/string.d.ts +0 -116
- package/build/grammars/string.js +0 -50
- package/build/grammars/string.js.map +0 -1
- package/build/grammars/string.json +0 -1
- package/build/grammars/whitespace.d.ts +0 -51
- package/build/grammars/whitespace.js +0 -30
- package/build/grammars/whitespace.js.map +0 -1
- package/build/grammars/whitespace.json +0 -1
- package/src/grammars/gwell.gwell +0 -281
- package/src/grammars/gwell.js +0 -555
- package/src/grammars/gwell.json +0 -1
- package/src/grammars/json.gwell +0 -75
- package/src/grammars/json.js +0 -121
- package/src/grammars/json.json +0 -1
- package/src/grammars/number.gwell +0 -20
- package/src/grammars/number.js +0 -117
- package/src/grammars/number.json +0 -1
- package/src/grammars/string.gwell +0 -15
- package/src/grammars/string.js +0 -52
- package/src/grammars/string.json +0 -1
- package/src/grammars/whitespace.gwell +0 -6
- package/src/grammars/whitespace.js +0 -32
- package/src/grammars/whitespace.json +0 -1
package/bootstrap.ts
CHANGED
|
@@ -23,11 +23,14 @@ const BaseDir = './src/compiler/builtin/';
|
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
write(`../builtin.json`, JSON.stringify(registry));
|
|
26
|
+
await Transpile('../gwell.gwell');
|
|
27
|
+
})();
|
|
26
28
|
|
|
27
|
-
|
|
29
|
+
async function Transpile(path) {
|
|
30
|
+
const content = read(path);
|
|
28
31
|
const js = await Compile(content, { exportName: 'grammar', template: 'esmodule', overrides: {} });
|
|
29
|
-
write('
|
|
30
|
-
}
|
|
32
|
+
write(path.replace(/\.gwell$/, '.js'), js);
|
|
33
|
+
}
|
|
31
34
|
|
|
32
35
|
function read(filename) {
|
|
33
36
|
return readFileSync(fullpath(filename), 'utf-8')
|
|
@@ -81,10 +81,10 @@ class GrammarBuilder {
|
|
|
81
81
|
}
|
|
82
82
|
async processImportDirective(directive) {
|
|
83
83
|
if (directive.path) {
|
|
84
|
-
await this.importGrammar(directive.import, directive.alias);
|
|
84
|
+
await this.importGrammar(directive.import, this.alias + (directive.alias || ''));
|
|
85
85
|
}
|
|
86
86
|
else {
|
|
87
|
-
this.importBuiltIn(directive.import);
|
|
87
|
+
await this.importBuiltIn(directive.import, this.alias + (directive.alias || ''));
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
processConfigDirective(directive) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compiler/compiler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/compiler/compiler.ts"],"names":[],"mappings":"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"}
|
package/build/typings.d.ts
CHANGED
package/build/utility/monarch.js
CHANGED
|
@@ -13,20 +13,27 @@ function CreateMonarchTokenizer(lexer) {
|
|
|
13
13
|
tokenizer[name].push({ include: i });
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
else
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
16
|
+
else {
|
|
17
|
+
const action = { token: rule.highlight || 'source' };
|
|
18
|
+
if ('pop' in rule) {
|
|
19
|
+
action.next = '@pop';
|
|
20
|
+
}
|
|
21
|
+
else if ('goto' in rule) {
|
|
22
|
+
action.next = '@' + rule.goto;
|
|
23
|
+
}
|
|
24
|
+
else if ('set' in rule) {
|
|
25
|
+
action.switchTo = '@' + rule.set;
|
|
26
|
+
}
|
|
27
|
+
else if ('inset' in rule) {
|
|
28
|
+
action.next = '@push';
|
|
29
|
+
}
|
|
30
|
+
if ('embed' in rule) {
|
|
31
|
+
action.nextEmbedded = rule.embed;
|
|
32
|
+
}
|
|
33
|
+
else if ('unembed' in rule) {
|
|
34
|
+
action.nextEmbedded = '@pop';
|
|
35
|
+
}
|
|
36
|
+
tokenizer[name].push([TransformWhen(rule.when), action]);
|
|
30
37
|
}
|
|
31
38
|
}
|
|
32
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monarch.js","sourceRoot":"","sources":["../../src/utility/monarch.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CAAC,KAAkB;IACrD,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,QAAQ,IAAI,IAAI,EAAE;gBAClB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;oBACzB,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;iBACvC;aACJ;iBAAM
|
|
1
|
+
{"version":3,"file":"monarch.js","sourceRoot":"","sources":["../../src/utility/monarch.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CAAC,KAAkB;IACrD,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,QAAQ,IAAI,IAAI,EAAE;gBAClB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;oBACzB,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;iBACvC;aACJ;iBAAM;gBACH,MAAM,MAAM,GAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC;gBAC1D,IAAI,KAAK,IAAI,IAAI,EAAE;oBACf,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;iBACxB;qBAAM,IAAI,MAAM,IAAI,IAAI,EAAE;oBACvB,MAAM,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;iBACjC;qBAAM,IAAI,KAAK,IAAI,IAAI,EAAE;oBACtB,MAAM,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;iBACpC;qBAAM,IAAI,OAAO,IAAI,IAAI,EAAE;oBACxB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;iBACzB;gBAED,IAAI,OAAO,IAAI,IAAI,EAAE;oBACjB,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;iBACpC;qBAAM,IAAI,SAAS,IAAI,IAAI,EAAE;oBAC1B,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC;iBAChC;gBAED,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;aAC3D;SACJ;KACJ;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAlCD,wDAkCC;AAED,SAAS,aAAa,CAAC,GAAG;IACtB,OAAO,OAAO,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,WAAW,CAAC,MAAM;IACvB,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAA;AAC1D,CAAC"}
|
package/package.json
CHANGED
package/src/compiler/compiler.ts
CHANGED
|
@@ -83,9 +83,9 @@ export class GrammarBuilder {
|
|
|
83
83
|
|
|
84
84
|
private async processImportDirective(directive: ImportDirective) {
|
|
85
85
|
if (directive.path) {
|
|
86
|
-
await this.importGrammar(directive.import, directive.alias);
|
|
86
|
+
await this.importGrammar(directive.import, this.alias + (directive.alias || ''));
|
|
87
87
|
} else {
|
|
88
|
-
this.importBuiltIn(directive.import);
|
|
88
|
+
await this.importBuiltIn(directive.import, this.alias + (directive.alias || ''));
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
|
package/src/compiler/gwell.gwell
CHANGED
|
@@ -165,6 +165,8 @@ grammar: {{
|
|
|
165
165
|
| K_POP _ L_COLON _ T_INTEGER : {{ { pop: parseInt($4) } }}
|
|
166
166
|
| K_POP _ L_COLON _ K_ALL : {{ { pop: "all" } }}
|
|
167
167
|
| K_HIGHLIGHT _ L_COLON _ T_STRING : {{ { highlight: $4 } }}
|
|
168
|
+
| K_EMBED _ L_COLON _ T_STRING : {{ { embed: $4 } }}
|
|
169
|
+
| K_UNEMBED : {{ { unembed: true } }}
|
|
168
170
|
| K_INSET : {{ { inset: 1 } }}
|
|
169
171
|
| K_INSET _ L_COLON _ T_INTEGER : {{ { inset: parseInt($4) } }}
|
|
170
172
|
| K_SET _ L_COLON _ T_WORD : {{ { set: $4 } }}
|
|
@@ -262,6 +264,8 @@ grammar: {{
|
|
|
262
264
|
K_WHEN -> "when"
|
|
263
265
|
K_POP -> "pop"
|
|
264
266
|
K_HIGHLIGHT -> "highlight"
|
|
267
|
+
K_EMBED -> "embed"
|
|
268
|
+
K_UNEMBED -> "unembed"
|
|
265
269
|
K_INSET -> "inset"
|
|
266
270
|
K_SET -> "set"
|
|
267
271
|
K_GOTO -> "goto"
|
package/src/typings.ts
CHANGED
package/src/utility/monarch.ts
CHANGED
|
@@ -11,16 +11,25 @@ export function CreateMonarchTokenizer(lexer: LexerConfig) {
|
|
|
11
11
|
for (const i of rule.import) {
|
|
12
12
|
tokenizer[name].push({ include: i })
|
|
13
13
|
}
|
|
14
|
-
} else
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
14
|
+
} else {
|
|
15
|
+
const action: any = { token: rule.highlight || 'source' };
|
|
16
|
+
if ('pop' in rule) {
|
|
17
|
+
action.next = '@pop';
|
|
18
|
+
} else if ('goto' in rule) {
|
|
19
|
+
action.next = '@' + rule.goto;
|
|
20
|
+
} else if ('set' in rule) {
|
|
21
|
+
action.switchTo = '@' + rule.set;
|
|
22
|
+
} else if ('inset' in rule) {
|
|
23
|
+
action.next = '@push';
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
if ('embed' in rule) {
|
|
27
|
+
action.nextEmbedded = rule.embed;
|
|
28
|
+
} else if ('unembed' in rule) {
|
|
29
|
+
action.nextEmbedded = '@pop';
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
tokenizer[name].push([TransformWhen(rule.when), action])
|
|
24
33
|
}
|
|
25
34
|
}
|
|
26
35
|
}
|