@knowvah/dot-engine 2.6.5 → 2.6.7

package/src/parser/dot.pegjs

@@ -10,19 +10,29 @@
 
 // ── Top-level rule ───────────────────────────────────────────────────────────
 // grammar.y: graph : hdr body | error | /* empty */
+// `end` is the offset just past the graph's closing brace: the last input the
+// C scanner lexes (see GraphEof). The empty graph lexes everything.
 
 Graph
-  = _ s:OptStrict _ t:GraphType _ id:OptGraphName _ "{" _ stmts:StmtList _ "}" _
+  = _ s:OptStrict _ t:GraphType _ id:OptGraphName _ "{" _ stmts:StmtList _ "}" end:GraphEof
     {
       return {
         type: "graph",
         strict: s,
         directed: t,
         id: id,
-        stmts: stmts
+        stmts: stmts,
+        end: end
       };
     }
-  / _ "" { return { type: "graph", strict: false, directed: false, id: null, stmts: [] }; }
+  / _ "" { return { type: "graph", strict: false, directed: false, id: null, stmts: [], end: text().length }; }
+
+// grammar.y: graph : hdr body {freestack(); endgraph();} — endgraph calls
+// scan.l:aglexeof, which unputs GRAPH_EOF_TOKEN ('@'), so the next token is
+// EOF and nothing after the closing brace is ever lexed: agmemread reads one
+// graph and ignores the rest, junk or a second graph alike.
+GraphEof
+  = .* { return offset(); }
 
 // grammar.y: hdr : optstrict graphtype optgraphname
 // grammar.y: optstrict : T_strict | /* empty */

package/src/parser/index.ts

@@ -272,8 +272,11 @@ export function parse(src: string): Graph {
     }
     throw err;
   }
+  // Only the graph's own text was lexed; what follows its closing brace is
+  // never read (grammar.y:endgraph -> scan.l:aglexeof).
+  const lexed = src.slice(0, ast.end);
   try {
-    validateEdgeOperators(src, ast.directed);
+    validateEdgeOperators(lexed, ast.directed);
   } catch (err: unknown) {
     // C's lexer hands the wrong operator to bison as '-': a syntax error there.
     const offset = err instanceof ParseError ? err.location.offset : undefined;
@@ -283,7 +286,7 @@ export function parse(src: string): Graph {
     }
     throw err;
   }
-  warnNumberAmbiguities(src, src.length);
+  warnNumberAmbiguities(lexed, lexed.length);
   return buildFromAst(ast);
 }