improve parser grammar

Signed-off-by: Adityo Pratomo <pratomo.adityo@gmail.com>
lunchboxav · Feb 27, 2022 · d2dffb0 · d2dffb0
1 parent 66c4ad1
commit d2dffb0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 6 deletions.
diff --git a/result/scene 1.html b/result/scene 1.html
@@ -15,8 +15,8 @@
     </div>
     <div class="choice">
       <div class="choiceContent">
-        <a href="scene 2.html">Go to left.</a>
-        <a href="scene 3.html">Go to right.</a>
+        <a href="scene 2.html">Go to left. </a>
+        <a href="scene 3.html">Go to right. </a>
       </div>
     </div>
   </body>

diff --git a/result/scene 2.html b/result/scene 2.html
@@ -15,8 +15,8 @@
     </div>
     <div class="choice">
       <div class="choiceContent">
-        <a href="scene 2.html">Go to left.</a>
-        <a href="scene 3.html">Go to right.</a>
+        <a href="scene 2.html">Go to left. </a>
+        <a href="scene 3.html">Go to right. </a>
       </div>
     </div>
   </body>

diff --git a/result/scene contribute.html b/result/scene contribute.html
@@ -0,0 +1,24 @@
+<html>
+  <head>
+    <title>scene contribute</title>
+  </head>
+  <body>
+    <div class="scene">
+      <div class="sceneContent">
+        You forked this project. You check the available issues to see what you can do to help. There are engine related issues, default presentation issues, and documentation issues.
+      </div>
+    </div>
+    <div class="event">
+      <div class="eventContent">
+        You opened your text editor.
+      </div>
+    </div>
+    <div class="choice">
+      <div class="choiceContent">
+        <a href="scene engine.html">Hone your Rust programming skill. </a>
+        <a href="scene presentation.html">Hone your HTML and CSS skill. </a>
+        <a href="scene documentation.html">Hone your technical writing skill. </a>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/src/wyg.pest b/src/wyg.pest
@@ -9,8 +9,10 @@ char = {
 }
 
 word = _{(LETTER | NUMBER)+}
-sentence = _{word ~ ","? ~ (SPACE_SEPARATOR ~ word)* ~ ("." | "?" | "!")}
-paragraph = _{sentence ~ (" " ~ sentence)* }
+sentence = _{(word ~ (",")* ~ SPACE_SEPARATOR)+ ~ word ~ ("." | "?" | "!") ~ SPACE_SEPARATOR?}
+paragraph = _{(sentence)+ }
+// sentence = _{word ~ (SPACE_SEPARATOR ~ word)* ~ "," ? ~ (SPACE_SEPARATOR ~ word)* ~ ("." | "?" | "!")}
+// paragraph = _{sentence ~ (" " ~ sentence)* }
 
 title = { word }
 item = @{ paragraph }

diff --git a/story/test_3.wyg b/story/test_3.wyg
@@ -0,0 +1,12 @@
+[scene contribute]
+
+Scene:
+You forked this project. You check the available issues to see what you can do to help. There are engine related issues, default presentation issues, and documentation issues.
+
+Event:
+You opened your text editor.
+
+Choice:
+- Hone your Rust programming skill. -> [scene engine]
+- Hone your HTML and CSS skill. -> [scene presentation]
+- Hone your technical writing skill. -> [scene documentation]