ohm-js 17.1.0-pre → 17.1.0

package/dist/ohm-extras.cjs

@@ -5845,13 +5845,7 @@ const grammarsSource = String.raw`
   // Example:
   //+ "//+ \"x\"\nG {\n//- \"\"\nstart = \"x\"}"
   OhmWithExamples <: Ohm {
-    // The default start rule for Ohm is 'Grammars', which is syntactic rule.
-    // When the start rule is a syntactic rule, there's no way to get access to
-    // leading space (including comments). So, for this grammar to be useful,
-    // you have to explicit use this rule as the start rule.
-    grammarsWithExamples = (exampleComments applySyntactic<Grammar>)*
-
-    Grammar := ident SuperGrammar? "{" (#exampleComments Rule)* "}"
+    Grammar := ident SuperGrammar? "{" (#exampleComments Rule)* #exampleComments "}"
 
     exampleComments = (spacesNoExampleComment exampleComment)*
 
@@ -5915,19 +5909,10 @@ const semantics = grammars.OhmWithExamples.createSemantics().addOperation('hasEx
 });
 
 semantics.addOperation('examples', {
-  grammarsWithExamples(exampleCommentsIter, grammarIter) {
-    const result = [];
-    for (const [i, child] of Object.entries(grammarIter.children)) {
-      if (exampleCommentsIter.hasExamples()) {
-        const defaultExamples = exampleCommentsIter.child(i).examples();
-        const grammar = child.grammarName();
-        result.push(...defaultExamples.map(ex => ({...ex, grammar, rule: ''})));
-      }
-      result.push(...child.examples());
-    }
-    return result;
+  Grammars(grammarIter) {
+    return grammarIter.children.flatMap(c => c.examples());
   },
-  Grammar(name, _, _open, exampleCommentsIter, ruleIter, _close) {
+  Grammar(name, _, _open, exampleCommentsIter, ruleIter, trailingCommentsIter, _close) {
     const result = [];
     const grammar = this.grammarName();
     for (let i = 0; i < ruleIter.numChildren; i++) {
@@ -5939,6 +5924,10 @@ semantics.addOperation('examples', {
 
       result.push(...augmentedExamples);
     }
+    if (trailingCommentsIter.hasExamples()) {
+      const defaultExamples = trailingCommentsIter.examples();
+      result.push(...defaultExamples.map(ex => ({...ex, grammar, rule: ''})));
+    }
     return result;
   },
   exampleComments(_, commentIter) {
@@ -5964,7 +5953,7 @@ semantics.addOperation('examples', {
 });
 
 semantics.addOperation('grammarName', {
-  Grammar(name, _, _open, exampleCommentsIter, ruleIter, _close) {
+  Grammar(name, _, _open, exampleCommentsIter, ruleIter, trailingCommentsIter, _close) {
     return name.sourceString;
   },
 });
@@ -5988,7 +5977,7 @@ semantics.addOperation('ruleName', {
  * @return {[Example]}
  */
 function extractExamples(grammarsDef) {
-  const matchResult = grammars.OhmWithExamples.match(grammarsDef, 'grammarsWithExamples');
+  const matchResult = grammars.OhmWithExamples.match(grammarsDef);
   if (matchResult.failed()) {
     throw new Error(matchResult.message);
   }

package/dist/ohm-extras.js

@@ -5847,13 +5847,7 @@
   // Example:
   //+ "//+ \"x\"\nG {\n//- \"\"\nstart = \"x\"}"
   OhmWithExamples <: Ohm {
-    // The default start rule for Ohm is 'Grammars', which is syntactic rule.
-    // When the start rule is a syntactic rule, there's no way to get access to
-    // leading space (including comments). So, for this grammar to be useful,
-    // you have to explicit use this rule as the start rule.
-    grammarsWithExamples = (exampleComments applySyntactic<Grammar>)*
-
-    Grammar := ident SuperGrammar? "{" (#exampleComments Rule)* "}"
+    Grammar := ident SuperGrammar? "{" (#exampleComments Rule)* #exampleComments "}"
 
     exampleComments = (spacesNoExampleComment exampleComment)*
 
@@ -5917,19 +5911,10 @@
   });
 
   semantics.addOperation('examples', {
-    grammarsWithExamples(exampleCommentsIter, grammarIter) {
-      const result = [];
-      for (const [i, child] of Object.entries(grammarIter.children)) {
-        if (exampleCommentsIter.hasExamples()) {
-          const defaultExamples = exampleCommentsIter.child(i).examples();
-          const grammar = child.grammarName();
-          result.push(...defaultExamples.map(ex => ({...ex, grammar, rule: ''})));
-        }
-        result.push(...child.examples());
-      }
-      return result;
+    Grammars(grammarIter) {
+      return grammarIter.children.flatMap(c => c.examples());
     },
-    Grammar(name, _, _open, exampleCommentsIter, ruleIter, _close) {
+    Grammar(name, _, _open, exampleCommentsIter, ruleIter, trailingCommentsIter, _close) {
       const result = [];
       const grammar = this.grammarName();
       for (let i = 0; i < ruleIter.numChildren; i++) {
@@ -5941,6 +5926,10 @@
 
         result.push(...augmentedExamples);
       }
+      if (trailingCommentsIter.hasExamples()) {
+        const defaultExamples = trailingCommentsIter.examples();
+        result.push(...defaultExamples.map(ex => ({...ex, grammar, rule: ''})));
+      }
       return result;
     },
     exampleComments(_, commentIter) {
@@ -5966,7 +5955,7 @@
   });
 
   semantics.addOperation('grammarName', {
-    Grammar(name, _, _open, exampleCommentsIter, ruleIter, _close) {
+    Grammar(name, _, _open, exampleCommentsIter, ruleIter, trailingCommentsIter, _close) {
       return name.sourceString;
     },
   });
@@ -5990,7 +5979,7 @@
    * @return {[Example]}
    */
   function extractExamples(grammarsDef) {
-    const matchResult = grammars.OhmWithExamples.match(grammarsDef, 'grammarsWithExamples');
+    const matchResult = grammars.OhmWithExamples.match(grammarsDef);
     if (matchResult.failed()) {
       throw new Error(matchResult.message);
     }

package/dist/ohm.cjs

@@ -5541,7 +5541,7 @@ Object.assign(IndentationSensitive, {
 });
 
 // Generated by scripts/prebuild.js
-const version = '17.1.0-pre';
+const version = '17.1.0';
 
 Grammar.initApplicationParser(ohmGrammar, buildGrammar);