allow comment inside base structure

hetalang · May 20, 2024 · f6ab7cc · f6ab7cc
1 parent 29c24a7
commit f6ab7cc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
diff --git a/src/pegjs/heta.pegjs b/src/pegjs/heta.pegjs
@@ -29,7 +29,7 @@ MultylineComment
       return null;
     }
 
-BaseStruct = fullLine: (Space/Break/Note/Id/Index/Action/Type/Title/Dict/Assignment)* EndSign
+BaseStruct = fullLine: (Space/Break/Note/Id/Index/Action/Type/Title/Dict/Assignment/MultylineComment/LineComment)* EndSign
   {
     let res = Object.assign({}, ...fullLine);
     return res;

diff --git a/test/parse/input/notes.heta b/test/parse/input/notes.heta
@@ -11,3 +11,11 @@ This is very long text. This is very long text. This is very long text. This is
 This is very long text.
 '''
 S4 @species {compartment: comp1};
+
+'''Notes with trailing comment'''
+/* This is comment */
+k1 @Const = 1.1;
+
+'''Notes with trailing comment'''
+// This is comment
+k1 @Const = 1.1;
diff --git a/test/parse/output/notes.json b/test/parse/output/notes.json
@@ -18,5 +18,19 @@
     "class": "Species",
     "compartment": "comp1",
     "notes": "\nThis is very long text. This is very long text's.\nThis is very long text. This is very long text.\nThis is very long text. This is very long text. This is very long text. This is very long text.\nThis is very long text.\n"
+  },
+  {
+    "id": "k1",
+    "action": "upsert",
+    "class": "Const",
+    "notes": "Notes with trailing comment",
+    "num": 1.1
+  },
+  {
+    "id": "k1",
+    "action": "upsert",
+    "class": "Const",
+    "notes": "Notes with trailing comment",
+    "num": 1.1
   }
 ]