Merge pull request #15 from hildjj/semi

Capture semicolons and top-level brackets.

Author: hildjj

.mocharc.js

@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = {
+  diff: true,
+  "full-trace": true,
+  recursive: true,
+  reporter: "progress",
+  require: "source-map-support/register",
+};

.npmignore

@@ -14,3 +14,5 @@ src/
 test
 tsconfig.json
 .peggy.js
+.mocharc.js
+tools/

lib/ast.d.ts

@@ -48,6 +48,9 @@ interface Bracketed {
     open: Punctuation;
     close: Punctuation;
 }
+interface Terminated {
+    semi?: Punctuation;
+}
 interface Op {
     operator: Punctuation;
 }
@@ -65,9 +68,9 @@ export interface Grammar extends BaseNode<"grammar"> {
     initializer?: Initializer;
     rules: Rule[];
 }
-export declare type TopLevelInitializer = BaseNode<"top_level_initializer"> & Coded;
-export declare type Initializer = BaseNode<"initializer"> & Coded;
-export interface Rule extends BaseNode<"rule"> {
+export declare type TopLevelInitializer = BaseNode<"top_level_initializer"> & Bracketed & Coded & Terminated;
+export declare type Initializer = BaseNode<"initializer"> & Coded & Terminated;
+export interface Rule extends BaseNode<"rule">, Terminated {
     name: Name;
     equals: Punctuation;
     expression: Expression;

lib/ast.js

@@ -7,9 +7,9 @@ exports.visitorKeys = void 0;
 exports.visitorKeys = {
     Program: ["body", "comments"],
     grammar: ["topLevelInitializer", "initializer", "rules"],
-    top_level_initializer: ["code"],
-    initializer: ["code"],
-    rule: ["name", "equals", "expression"],
+    top_level_initializer: ["open", "code", "close", "semi"],
+    initializer: ["code", "semi"],
+    rule: ["name", "equals", "expression", "semi"],
     named: ["name", "expression"],
     choice: ["alternatives", "slashes"],
     action: ["expression", "code"],