grammar-well 1.1.10 → 1.2.0

package/src/parser/algorithms/lr.ts

@@ -1,24 +1,21 @@
-import { TokenBuffer } from "../../lexers/token-buffer";
-import { LanguageDefinition } from "../../typings";
-import { CanonicalCollection, LRStack } from "../../utility/lr";
+import type { TokenBuffer } from "../../lexers/token-buffer";
+import type { LanguageDefinition } from "../../typings";
+import type { GrammarRule, GrammarRuleSymbol, LRState } from "../../typings";
 import { ParserUtility } from "../parser";
 
-export function LR(language: LanguageDefinition & { tokens: TokenBuffer, canonical?: CanonicalCollection }, _options = {}) {
-    const { grammar, tokens, canonical } = language;
-    const collection = canonical || new CanonicalCollection(grammar);
+export function LR(language: LanguageDefinition & { tokens: TokenBuffer }, _options = {}) {
+    const { lr, tokens } = language;
+    const { table } = lr;
     const stack = new LRStack();
-    const s = collection.states['0.0'];
-    stack.add(null);
-    stack.shift(s);
+    stack.push({ state: table['0.0'] });
+
     let token;
 
     // eslint-disable-next-line no-cond-assign
     while (token = tokens.next()) {
-        for (const [symbol, state] of stack.current.state.actions) {
+        for (const { symbol, next } of stack.current.state.actions) {
             if (ParserUtility.TokenMatchesSymbol(token, symbol)) {
-                stack.add(symbol);
-                stack.shift(collection.states[state]);
-                stack.current.value = token;
+                stack.push({ symbol, state: table[next], value: token });
                 break;
             }
         }
@@ -27,11 +24,51 @@ export function LR(language: LanguageDefinition & { tokens: TokenBuffer, canonic
             const rule = stack.current.state.reduce;
             stack.reduce(rule);
             stack.current.value = ParserUtility.PostProcess(rule, stack.current.children.map(v => v.value));
-            const s = stack.previous.state.goto.get(rule.name);
-            stack.shift(collection.states[s]);
-
+            const s = stack.previous?.state.goto[rule.name];
+            stack.shift(table[s]);
         }
     }
 
-    return { results: [stack.current.value], canonical: collection }
-}
+    return { results: [stack.current.value] }
+}
+
+
+class LRStack {
+
+    stack: LRStackItem[] = [];
+
+    get current() {
+        return this.stack[this.stack.length - 1];
+    }
+
+    get previous() {
+        return this.stack[this.stack.length - 2];
+    }
+
+    shift(state: LRState) {
+        this.current.state = state;
+    }
+
+    reduce(rule: GrammarRule) {
+        const n = new LRStackItem();
+        const l = rule.symbols.length;
+        n.children = this.stack.splice(l * -1, l);
+        n.children.forEach(v => delete v.state);
+        n.rule = rule;
+        n.symbol = rule.name;
+        this.stack.push(n);
+    }
+
+    push(item: Partial<LRStackItem>) {
+        this.stack.push(new LRStackItem());
+        Object.assign(this.current, item);
+    }
+}
+
+class LRStackItem {
+    children: LRStackItem[] = [];
+    state: LRState;
+    symbol: GrammarRuleSymbol;
+    rule: GrammarRule;
+    value: any;
+} 

package/src/typings.ts

@@ -13,6 +13,7 @@ export interface CompileOptions {
     resolverInstance?: ImportResolver;
     exportName?: string;
     template?: TemplateFormat;
+    overrides?: Dictionary<string>;
 }
 
 export type TemplateFormat = '_default' | 'object' | 'json' | 'js' | 'javascript' | 'module' | 'esmodule' | 'esm' | 'ts' | 'typescript'
@@ -131,7 +132,7 @@ export interface GeneratorGrammarRule {
     postprocess?: GrammarTypeTemplate | GrammarTypeBuiltIn | GrammarTypeJS;
 }
 
-export type GeneratorGrammarSymbol = { alias?: string } & (GrammarTypeRule | GrammarTypeRegex | GrammarTypeLiteral | GrammarTypeToken | GrammarTypeJS);
+export type GeneratorGrammarSymbol = { alias?: string } & (GrammarTypeRule | GrammarTypeRegex | GrammarTypeLiteral | GrammarTypeToken);
 
 export interface LanguageDefinition {
     lexer?: Lexer | LexerConfig;
@@ -139,8 +140,23 @@ export interface LanguageDefinition {
         start: string;
         rules: Dictionary<GrammarRule[]>;
     }
+    lr?: {
+        k: number;
+        table: Dictionary<LRState>;
+    }
+
+}
+
+export interface LRState {
+    actions: Next[];
+    goto: { [key: string]: string };
+    reduce?: GrammarRule;
+    isFinal: boolean;
 }
 
+type Next = { symbol: GrammarRuleSymbol, next: string };
+
+
 export interface TQRestorePoint {
     historyIndex: number;
     offset: number;

package/src/utility/general.ts

@@ -1,4 +1,4 @@
-import { Dictionary, GrammarRuleSymbol } from "../typings";
+import { Dictionary, GeneratorGrammarSymbol, GrammarRuleSymbol } from "../typings";
 
 
 export class Collection<T> {
@@ -55,17 +55,16 @@ export class Collection<T> {
 
 }
 
-export class SymbolCollection extends Collection<GrammarRuleSymbol>{
+export class GeneratorSymbolCollection extends Collection<GeneratorGrammarSymbol>{
     categorized = {
         nonTerminal: {},
         literalI: {},
         literalS: {},
         token: {},
-        regex: {},
-        function: {},
+        regex: {}
     }
 
-    resolve(symbol: GrammarRuleSymbol) {
+    resolve(symbol: GeneratorGrammarSymbol) {
         if (typeof symbol == 'string') {
             return { category: 'nonTerminal', key: symbol };
         } else if ('literal' in symbol) {
@@ -74,10 +73,8 @@ export class SymbolCollection extends Collection<GrammarRuleSymbol>{
             return { category: 'literalS', key: symbol.literal }
         } else if ('token' in symbol) {
             return { category: 'token', key: symbol.token }
-        } else if (symbol instanceof RegExp) {
-            return { category: 'regex', key: symbol.toString() }
-        } else if (typeof symbol == 'function') {
-            return { category: 'function', key: symbol.toString() }
+        } else if ('regex' in symbol) {
+            return { category: 'regex', key: symbol.flags + ':' + symbol.regex }
         }
     }
 }

package/build/compiler/generator.d.ts

@@ -1,23 +0,0 @@
-import { GeneratorState, GeneratorGrammarRule, LexerStateDefinition } from "../typings";
-export declare class Generator {
-    state: GeneratorState;
-    serializeHead(): string;
-    serializeBody(): string;
-    serializeLanguage(depth?: number): string;
-    merge(state: GeneratorState): void;
-    grammarUUID(name: string): string;
-    addGrammarRule(rule: GeneratorGrammarRule): void;
-    addLexerState(state: LexerStateDefinition): void;
-    private serializeGrammar;
-    private serializeGrammarRules;
-    private serializeSymbol;
-    private serializeGrammarRule;
-    private serializePostProcess;
-    private templatePostProcess;
-    private serializeLexerConfig;
-    private serializeLexerConfigStates;
-    private serializeLexerConfigStateRules;
-    private newLine;
-    private pretty;
-    private isVal;
-}

package/build/compiler/generator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../src/compiler/generator.ts"],"names":[],"mappings":"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"}

package/build/utility/lr.d.ts

@@ -1,52 +0,0 @@
-import { Dictionary, GrammarRule, GrammarRuleSymbol, LanguageDefinition } from "../typings";
-import { Collection, SymbolCollection } from "./general";
-export declare class CanonicalCollection {
-    grammar: LanguageGrammar;
-    rules: Collection<GrammarRule>;
-    states: {
-        [key: string]: State;
-    };
-    symbols: SymbolCollection;
-    constructor(grammar: LanguageGrammar);
-    addState(seed: StateItem[]): State;
-    encodeRule(rule: GrammarRule, dot: number): string;
-    encodeStateItems(seed: StateItem[]): string;
-}
-declare class State {
-    private collection;
-    isFinal: boolean;
-    outputs: StateOut;
-    queue: {
-        [key: string]: StateItem[];
-    };
-    actions: Map<GrammarRuleSymbol, string>;
-    goto: Map<GrammarRuleSymbol, string>;
-    reduce?: GrammarRule;
-    constructor(collection: CanonicalCollection, items: StateItem[]);
-    private closure;
-}
-export declare class LRStack {
-    stack: LRStackItem[];
-    get current(): LRStackItem;
-    get previous(): LRStackItem;
-    shift(state: State): void;
-    reduce(rule: GrammarRule): void;
-    add(symbol: GrammarRuleSymbol): void;
-}
-declare class LRStackItem {
-    children: LRStackItem[];
-    state: State;
-    symbol: GrammarRuleSymbol;
-    rule: GrammarRule;
-    value: any;
-}
-type LanguageGrammar = LanguageDefinition['grammar'];
-type StateItem = {
-    rule: GrammarRule;
-    dot: number;
-};
-interface StateOut {
-    action: Dictionary<StateItem[]>;
-    goto: Dictionary<StateItem[]>;
-}
-export {};

package/build/utility/lr.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lr.js","sourceRoot":"","sources":["../../src/utility/lr.ts"],"names":[],"mappings":"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"}

package/src/utility/lr.ts

@@ -1,152 +0,0 @@
-import { ParserUtility } from "../parser/parser";
-import { Dictionary, GrammarRule, GrammarRuleSymbol, LanguageDefinition } from "../typings";
-import { Collection, SymbolCollection } from "./general";
-
-export class CanonicalCollection {
-    rules: Collection<GrammarRule> = new Collection();
-    states: { [key: string]: State } = Object.create(null)
-    symbols: SymbolCollection = new SymbolCollection();
-
-    constructor(public grammar: LanguageGrammar) {
-        const augmented = { name: Symbol() as unknown as string, symbols: [grammar.start] }
-        grammar.rules[augmented.name] = [augmented];
-        this.addState([{ rule: augmented, dot: 0 }]);
-    }
-
-    addState(seed: StateItem[]) {
-        const id = this.encodeStateItems(seed);
-        if (id in this.states)
-            return this.states[id];
-
-        const state = new State(this, seed);
-        this.states[id] = state;
-        for (const q in state.queue) {
-            this.addState(state.queue[q])
-        }
-        state.queue = {};
-    }
-
-    encodeRule(rule: GrammarRule, dot: number) {
-        return this.rules.encode(rule) + '.' + dot;
-    }
-
-    encodeStateItems(seed: StateItem[]) {
-        return Array.from(new Set(seed)).map(v => this.encodeRule(v.rule, v.dot)).sort().join()
-    }
-}
-
-class State {
-    isFinal = false;
-
-    outputs: StateOut = {
-        goto: {},
-        action: {}
-    };
-
-    queue: { [key: string]: StateItem[] } = {};
-    actions: Map<GrammarRuleSymbol, string> = new Map();
-    goto: Map<GrammarRuleSymbol, string> = new Map();
-    reduce?: GrammarRule;
-
-    constructor(private collection: CanonicalCollection, items: StateItem[]) {
-        const visited = new Set<GrammarRuleSymbol>();
-        for (const item of items) {
-            this.closure(item.rule, item.dot, visited);
-        }
-        if (this.isFinal) {
-            if (items.length == 1 && visited.size < 1) {
-                this.reduce = items[0].rule;
-            } else {
-                throw 'Conflict Detected';
-            }
-        }
-
-        for (const k in this.outputs.goto) {
-            const seed = this.outputs.goto[k];
-            const stateId = this.collection.encodeStateItems(seed);
-            this.queue[stateId] = seed;
-            this.goto.set(this.collection.symbols.decode(k), stateId);
-        }
-
-        for (const k in this.outputs.action) {
-            const seed = this.outputs.action[k];
-            const stateId = this.collection.encodeStateItems(seed);
-            this.queue[stateId] = seed;
-            this.actions.set(this.collection.symbols.decode(k), stateId);
-        }
-    }
-
-    private closure(rule: GrammarRule, dot: number, visited: Set<GrammarRuleSymbol>) {
-        const isFinal = rule.symbols.length == dot;
-        this.isFinal = isFinal || this.isFinal;
-        const { [dot]: symbol } = rule.symbols;
-
-        if (isFinal || visited.has(symbol))
-            return;
-
-        visited.add(symbol);
-        const stateItem = { rule, dot: dot + 1 };
-
-        if (ParserUtility.SymbolIsTerminal(symbol)) {
-            const id = this.collection.symbols.encode(symbol);
-            this.outputs.action[id] = this.outputs.action[id] || [];
-            this.outputs.action[id].push(stateItem);
-        } else {
-            const id = this.collection.symbols.encode(symbol);
-            this.outputs.goto[id] = this.outputs.goto[id] || [];
-            this.outputs.goto[id].push(stateItem);
-            for (const rule of this.collection.grammar.rules[symbol as string]) {
-                this.closure(rule, 0, visited)
-            }
-        }
-    }
-}
-
-export class LRStack {
-
-    stack: LRStackItem[] = [];
-
-    get current() {
-        return this.stack[this.stack.length - 1];
-    }
-
-    get previous() {
-        return this.stack[this.stack.length - 2];
-    }
-
-    shift(state: State) {
-        this.current.state = state;
-    }
-
-    reduce(rule: GrammarRule) {
-        const n = new LRStackItem();
-        const l = rule.symbols.length;
-        n.children = this.stack.splice(l * -1, l);
-        n.children.forEach(v => delete v.state);
-        n.rule = rule;
-        n.symbol = rule.name;
-        this.stack.push(n);
-    }
-
-    add(symbol: GrammarRuleSymbol) {
-        this.stack.push(new LRStackItem())
-        this.current.symbol = symbol;
-    }
-}
-
-
-class LRStackItem {
-    children: LRStackItem[] = [];
-    state: State;
-    symbol: GrammarRuleSymbol;
-    rule: GrammarRule;
-    value: any;
-}
-
-type LanguageGrammar = LanguageDefinition['grammar'];
-type StateItem = { rule: GrammarRule, dot: number };
-
-interface StateOut {
-    action: Dictionary<StateItem[]>;
-    goto: Dictionary<StateItem[]>;
-}