fix: locations

Author: verytactical

packages/pgen/compile.ts

@@ -24,39 +24,13 @@ export const compile = (node: g.Grammar): t.File => {
         definedRules.add(rule.name);
     }
 
-    // const exports = t.returnStatement(t.objectExpression(
-    //     names.map(name => t.objectProperty(
-    //         t.identifier(name),
-    //         emitCall('compile', [
-    //             t.identifier(name),
-    //             t.arrowFunctionExpression([], t.identifier('space')),
-    //         ]),
-    //         false,
-    //         true,
-    //     ))
-    // ));
-
     return t.file(t.program([
         ...imports,
         t.exportNamedDeclaration(t.tsModuleDeclaration(
             t.identifier(astGlobal),
             t.tsModuleBlock(ast),
         )),
         ...stmts,
-        // t.exportNamedDeclaration(t.variableDeclaration("const", [
-        //     t.variableDeclarator(t.identifier("getParser"), t.arrowFunctionExpression(
-        //         [withType(
-        //             t.identifier(primGlobal),
-        //             t.tsTypeReference(
-        //                 t.tsQualifiedName(t.identifier(libGlobal), t.identifier('Algebra')),
-        //             )
-        //         )],
-        //         t.blockStatement([
-        //             ...stmts,
-        //             exports,
-        //         ]),
-        //     ))
-        // ])),
     ]));
 };
 

packages/pgen/transform.ts

@@ -325,7 +325,3 @@ const transformSeq = ({ exprs }: g.Seq): Transform<Expr> => (ctx) => {
     e.push(Eps);
     return e.reduceRight((prev, expr) => Ap(expr, prev, 'r'));
 };
-
-// const spaced = (node: Expr): Transform<Expr> => (ctx) => {
-//     return Ap(node, Star(Call("space$noSkip", [])), 'l');
-// };

packages/runtime/index.ts

@@ -1,7 +1,7 @@
 import { Context, createContext, getSuccess, isFailure, Parser } from "./runtime";
 
 export { Parser, Located, alt, any, ap, app, compile, debug, eof, eps, field, left, lex, loc, lookNeg, lookPos, opt, plus, pure, ref, regex, right, rule, sat, seq, star, str, stry, terminal, where, withLoc } from './spaced';
-export { Loc, LocEmpty, LocRange } from './located';
+export * from './loc';
 
 export type ParseResult<T> = ParseResultSuccess<T> | ParseResultError
 export type ParseResultError = {

packages/runtime/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { Parser } from "./runtime";
 export { Parser, Located, alt, any, ap, app, compile, debug, eof, eps, field, left, lex, loc, lookNeg, lookPos, opt, plus, pure, ref, regex, right, rule, sat, seq, star, str, stry, terminal, where, withLoc } from './spaced';
-export { Loc, LocEmpty, LocRange } from './located';
+export * from './loc';
 export type ParseResult<T> = ParseResultSuccess<T> | ParseResultError;
 export type ParseResultError = {
     readonly $: "error";

packages/runtime/lib/index.d.ts.map

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = exports.withLoc = exports.where = exports.terminal = exports.stry = exports.str = exports.star = exports.seq = exports.sat = exports.rule = exports.right = exports.regex = exports.ref = exports.pure = exports.plus = exports.opt = exports.lookPos = exports.lookNeg = exports.loc = exports.lex = exports.left = exports.field = exports.eps = exports.eof = exports.debug = exports.compile = exports.app = exports.ap = exports.any = exports.alt = void 0;
 const runtime_1 = require("./runtime");
@@ -32,6 +46,7 @@ Object.defineProperty(exports, "stry", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "terminal", { enumerable: true, get: function () { return spaced_1.terminal; } });
 Object.defineProperty(exports, "where", { enumerable: true, get: function () { return spaced_1.where; } });
 Object.defineProperty(exports, "withLoc", { enumerable: true, get: function () { return spaced_1.withLoc; } });
+__exportStar(require("./loc"), exports);
 const parse = (grammar) => (text) => {
     const ctx = (0, runtime_1.createContext)(text);
     const result = grammar(ctx);

packages/runtime/lib/index.js

@@ -0,0 +1,15 @@
+export type Loc = LocRange | LocEmpty;
+export type LocRange = {
+    readonly $: 'range';
+    readonly start: number;
+    readonly end: number;
+};
+export declare const rangeLoc: (start: number, end: number) => LocRange;
+export type LocEmpty = {
+    readonly $: 'empty';
+    readonly at: number;
+};
+export declare const emptyLoc: (at: number) => LocEmpty;
+export declare const isEmptyLoc: (loc: Loc) => loc is LocEmpty;
+export declare const mergeLoc: (left: Loc, right: Loc) => Loc;
+//# sourceMappingURL=loc.d.ts.map

packages/runtime/lib/loc.d.ts

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeLoc = exports.isEmptyLoc = exports.emptyLoc = exports.rangeLoc = void 0;
+const rangeLoc = (start, end) => {
+    if (start === 32 && end === 32)
+        debugger;
+    return { $: 'range', start, end };
+};
+exports.rangeLoc = rangeLoc;
+const emptyLoc = (at) => ({ $: 'empty', at });
+exports.emptyLoc = emptyLoc;
+const isEmptyLoc = (loc) => loc.$ === 'empty';
+exports.isEmptyLoc = isEmptyLoc;
+const mergeLoc = (left, right) => {
+    return (0, exports.isEmptyLoc)(left) ? right : (0, exports.isEmptyLoc)(right) ? left : (0, exports.rangeLoc)(left.start, right.end);
+};
+exports.mergeLoc = mergeLoc;

packages/runtime/lib/loc.d.ts.map

@@ -1,15 +1,6 @@
 import * as P from './runtime';
-export type Parser<T> = P.Parser<[T, Loc]>;
-export type Loc = LocRange | LocEmpty;
-export type LocRange = {
-    readonly $: 'range';
-    readonly start: number;
-    readonly end: number;
-};
-export type LocEmpty = {
-    readonly $: 'empty';
-    readonly at: number;
-};
+import * as L from './loc';
+export type Parser<T> = P.Parser<readonly [T, L.Loc]>;
 export declare const rule: <T>(child: Parser<T>) => Parser<T>;
 export declare const pure: <const T>(t: T) => Parser<T>;
 export declare const ap: <T, U>(left: Parser<(t: T) => U>, right: Parser<T>) => Parser<U>;
@@ -35,5 +26,5 @@ export declare const lookNeg: <T>(child: Parser<T>) => Parser<undefined>;
 export declare const eof: Parser<undefined>;
 export declare const debug: <T>(child: Parser<T>) => Parser<T>;
 export declare const where: Parser<number>;
-export declare const withLoc: <T>(child: Parser<T>) => Parser<[T, Loc]>;
+export declare const withLoc: <T>(child: Parser<T>) => Parser<[T, L.Loc]>;
 //# sourceMappingURL=located.d.ts.map

packages/runtime/lib/loc.js

@@ -35,40 +35,37 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withLoc = exports.where = exports.debug = exports.eof = exports.lookNeg = exports.lookPos = exports.opt = exports.plus = exports.fail = exports.eps = exports.any = exports.star = exports.ref = exports.app = exports.stry = exports.regex = exports.sat = exports.str = exports.alt = exports.field = exports.seq = exports.right = exports.left = exports.ap = exports.pure = exports.rule = void 0;
 const P = __importStar(require("./runtime"));
-const range = (start, end) => ({ $: 'range', start, end });
-const empty = (at) => ({ $: 'empty', at });
-const isEmpty = (loc) => loc.$ === 'empty';
-const span = (left, right) => {
-    return isEmpty(left) ? right : isEmpty(right) ? left : range(left.start, right.end);
-};
+const L = __importStar(require("./loc"));
 const terminal = (p) => c => {
     const start = c.p;
     const r = p(c);
     if (P.isFailure(r))
         return P.failure;
-    return P.success([P.getSuccess(r), range(start, c.p)]);
+    return P.success([P.getSuccess(r), L.rangeLoc(start, c.p)]);
 };
 const rule = (child) => (ctx) => {
     const result = child(ctx);
     return result;
 };
 exports.rule = rule;
-const pure = (t) => terminal(P.pure(t));
+const pure = (t) => ctx => {
+    return P.app(P.pure(t), t => [t, L.emptyLoc(ctx.p)])(ctx);
+};
 exports.pure = pure;
 const ap = (left, right) => {
-    return P.app(P.seq(left, right), ([[f, l], [x, r]]) => [f(x), span(l, r)]);
+    return P.app(P.seq(left, right), ([[f, l], [x, r]]) => [f(x), L.mergeLoc(l, r)]);
 };
 exports.ap = ap;
 const left = (left, right) => {
-    return P.app(P.seq(left, right), ([[t, l], [, r]]) => [t, span(l, r)]);
+    return P.app(P.seq(left, right), ([[t, l], [, r]]) => [t, L.mergeLoc(l, r)]);
 };
 exports.left = left;
 const right = (left, right) => {
-    return P.app(P.seq(left, right), ([[, l], [u, r]]) => [u, span(l, r)]);
+    return P.app(P.seq(left, right), ([[, l], [u, r]]) => [u, L.mergeLoc(l, r)]);
 };
 exports.right = right;
 const seq = (left, right) => {
-    return P.app(P.seq(left, right), ([[t, l], [u, r]]) => [[t, u], span(l, r)]);
+    return P.app(P.seq(left, right), ([[t, l], [u, r]]) => [[t, u], L.mergeLoc(l, r)]);
 };
 exports.seq = seq;
 const field = (left, key, right) => {
@@ -106,12 +103,13 @@ exports.ref = ref;
 const star = (child) => {
     return P.app(P.seq(exports.where, P.star(child)), ([[at], ls]) => [
         ls.map(([t]) => t),
-        ls.map(([, l]) => l).reduce(span, empty(at))
+        ls.map(([, l]) => l).reduce(L.mergeLoc, L.emptyLoc(at))
     ]);
 };
 exports.star = star;
 exports.any = terminal(P.any);
-exports.eps = terminal(P.eps);
+const eps = (ctx) => P.success([P.EPS, L.emptyLoc(ctx.p)]);
+exports.eps = eps;
 exports.fail = P.fail;
 const plus = (child) => {
     return (0, exports.app)((0, exports.seq)(child, (0, exports.star)(child)), ([a, as]) => (as.unshift(a), as));
@@ -121,18 +119,24 @@ const opt = (child) => {
     return (0, exports.alt)(child, (0, exports.app)(exports.eps, () => undefined));
 };
 exports.opt = opt;
-exports.lookPos = P.lookPos;
+const lookPos = (child) => {
+    const p = P.lookPos(child);
+    return ctx => {
+        return P.app(p, ([t]) => [t, L.emptyLoc(ctx.p)])(ctx);
+    };
+};
+exports.lookPos = lookPos;
 const lookNeg = (child) => {
     const p = (0, exports.lookPos)(child);
     return ctx => {
         const r = p(ctx);
-        return P.isSuccess(r) ? P.failure : P.success([undefined, empty(ctx.p)]);
+        return P.isSuccess(r) ? P.failure : P.success([undefined, L.emptyLoc(ctx.p)]);
     };
 };
 exports.lookNeg = lookNeg;
 exports.eof = (0, exports.lookNeg)(exports.any);
 exports.debug = P.debug;
-const where = ctx => P.success([ctx.p, empty(ctx.p)]);
+const where = ctx => P.success([ctx.p, L.emptyLoc(ctx.p)]);
 exports.where = where;
 const withLoc = (child) => {
     return P.app(child, ([t, loc]) => [[t, loc], loc]);