Merge branch 'master' of https://dev.danilafe.com/CS-381/MiniLogo

index.html

@@ -9,18 +9,17 @@
         <div id="elm-container">
         </div>
         <script>
-            var program = `
+            var program = `move(0, 0);
-move(0, 0);
 define line(x1, y1, x2, y2) {
     pen up;
     move(x1, y1);
     pen down;
     move(x2, y2);
-};
+}
 define nix(x, y, width, height) {
     call line (x, y, x + width, y + height);
     call line (x + width, y, x, y + height);
-};
+}
 call nix(0, 0, 20, 20);
 `
             var container = document.getElementById("elm-container");

src/Main.elm

@@ -90,7 +90,7 @@ parseExpr = oneOf [ lazy (\_ -> backtrackable parseSum), parseTerm ]
 parseProg : Parser LogoProg
 parseProg = sequence
     { start = ""
-    , separator = ";"
+    , separator = ""
     , end = ""
     , spaces = spaces
     , item = lazy (\_ -> parseCmd)
@@ -135,6 +135,8 @@ parseCall = succeed Call
         , item = parseExpr
         , trailing = Forbidden
         }
+    |. spaces
+    |. symbol ";"
 
 parsePenMode : Parser LogoPenMode
 parsePenMode = oneOf
@@ -147,6 +149,8 @@ parsePen = succeed Pen
     |. keyword "pen"
     |. spaces
     |= parsePenMode
+    |. spaces
+    |. symbol ";"
 
 parseMove : Parser LogoCmd
 parseMove = succeed Move
@@ -158,7 +162,10 @@ parseMove = succeed Move
     |. symbol ","
     |. spaces
     |= parseExpr
+    |. spaces
     |. symbol ")"
+    |. spaces
+    |. symbol ";"
 
 {-
 ======= Semantics Code =======