Merge branch 'master' of github.com:greati/gryph

Author: carlosemv

examples/access.gph

@@ -1,25 +1,3 @@
-l : [[int]] = [[1,2],[3],[4]];
+l : [int] = [];
 
-l1 : [int] = l[1];
-print l1;
-l2 : int = l[0][1];
-print l2;
-
-
-#dl : [|int,([string], <int>)|] = [|1?(["2","2"],<[]>),2?(["3"],<[]>)|,|5?(["oi","oioi"],<[]>)|];
-#print dl;
-
-#print dl[1]|5|[1];
-
-i : int = 4;
-
-print i + l[0][1];
-
-l[0][1] = 10;
 print l;
-
-d1 : |string, [int]| = |"oi"?[1,2,3]|;
-d1|"oie"| = [5,6];
-d1|"oie"|[1] = 1000;
-d1 = ||;
-print d1;

interpreter/src/Syntactic/Parser.hs

@@ -12,23 +12,29 @@ import Syntactic.Types
 
 gryphParser :: GenParser GphTokenPos st [ProgramUnit]
 gryphParser = 
-    do result <- many (programUnit)
-       return result
+        do
+            do
+                u <- programUnit
+                remain <- gryphParser
+                return (u:remain)
+            <|>
+            do  
+                eof
+                return []
 
 programUnit :: GenParser GphTokenPos st ProgramUnit
 programUnit = do 
                     do
                         s <- structDecl
                         return (StructDecl s)
                     <|>
-                    do 
-                        s <- stmt
-                        return (Stmt s)
-                    <|>
                     do
                         s <- subprogDecl
                         return (SubprogramDecl s)
-
+                    <|>
+                    do 
+                        s <- stmt
+                        return (Stmt s)
 {- Structs.
  -
  --}