X-Git-Url: https://ruin.nu/git/?p=proglang.git;a=blobdiff_plain;f=Parsyntax.y;h=d7b5f7deeee2f694a080b55ae195af1ff5c40e40;hp=6613fa351325648a0f3cd8bff19ae301e6fbc25b;hb=HEAD;hpb=99548e772decde168669179c0da03109a9df5356

diff --git a/Parsyntax.y b/Parsyntax.y
index 6613fa3..d7b5f7d 100644
--- a/Parsyntax.y
+++ b/Parsyntax.y
@@ -6,8 +6,7 @@ import Lexsyntax
 import ErrM
 }
 
-%name pStms Stms
-%name pExp Exp
+%name pProgram Program
 
 -- no lexer declaration
 %monad { Err } { thenM } { returnM }
@@ -24,6 +23,7 @@ import ErrM
  '--' { PT _ (TS "--") }
  '-' { PT _ (TS "-") }
  '!' { PT _ (TS "!") }
+ ',' { PT _ (TS ",") }
  '<' { PT _ (TS "<") }
  '<=' { PT _ (TS "<=") }
  '>' { PT _ (TS ">") }
@@ -41,6 +41,7 @@ import ErrM
  'print' { PT _ (TS "print") }
  'readBool' { PT _ (TS "readBool") }
  'readInt' { PT _ (TS "readInt") }
+ 'return' { PT _ (TS "return") }
  'true' { PT _ (TS "true") }
  'while' { PT _ (TS "while") }
 
@@ -64,8 +65,8 @@ Type : 'int' { TInt }
   | 'bool' { TBool }
 
 
-Stms :: { Stms }
-Stms : ListStm { Program (reverse $1) } 
+Program :: { Program }
+Program : ListFuncStm { Program (reverse $1) } 
 
 
 Stm :: { Stm }
@@ -77,6 +78,7 @@ Stm : Exp ';' { SExp $1 }
   | 'if' '(' Exp ')' Stm 'else' Stm { SIf $3 $5 $7 }
   | 'if' '(' Exp ')' Stm { if_ $3 $5 }
   | 'print' Exp ';' { SPrint $2 }
+  | 'return' Exp ';' { SReturn $2 }
 
 
 Exp :: { Exp }
@@ -105,6 +107,7 @@ Exp3 : Ident '++' { postIncr_ $1 }
   | '!' Exp3 { ENot $2 }
   | 'readInt' { EReadI }
   | 'readBool' { EReadB }
+  | Ident '(' ListExp ')' { EFunc $1 $3 }
   | '(' Exp ')' { $2 }
 
 
@@ -113,6 +116,41 @@ ListStm : {- empty -} { [] }
   | ListStm Stm { flip (:) $1 $2 }
 
 
+ListExp :: { [Exp] }
+ListExp : {- empty -} { [] } 
+  | Exp { (:[]) $1 }
+  | Exp ',' ListExp { (:) $1 $3 }
+
+
+Decl :: { Decl }
+Decl : Type Ident { Decl $1 $2 } 
+
+
+ListDecl :: { [Decl] }
+ListDecl : {- empty -} { [] } 
+  | Decl { (:[]) $1 }
+  | Decl ',' ListDecl { (:) $1 $3 }
+
+
+Func :: { Func }
+Func : Type Ident '(' ListDecl ')' '{' ListStm '}' { Func $1 $2 $4 (reverse $7) } 
+
+
+ListFunc :: { [Func] }
+ListFunc : {- empty -} { [] } 
+  | ListFunc Func { flip (:) $1 $2 }
+
+
+FuncStm :: { FuncStm }
+FuncStm : Stm { S $1 } 
+  | Func { F $1 }
+
+
+ListFuncStm :: { [FuncStm] }
+ListFuncStm : {- empty -} { [] } 
+  | ListFuncStm FuncStm { flip (:) $1 $2 }
+
+
 Op0 :: { Op }
 Op0 : '<' { Lt } 
   | '<=' { ELt }