X-Git-Url: https://git.xandkar.net/?p=tiger.ml.git;a=blobdiff_plain;f=tiger%2Fsrc%2Flib%2Ftiger%2Ftiger_parser.mly;h=625632f0df22ba3655a06b5a864fa322c9bade72;hp=35cae281f4aa6a6cd981bc9b4723e94829bff29d;hb=b0047ce7ac589181a63394b523fe6c054cb9c9ff;hpb=ef94563423aae9f1560d78a172770b3bf944a227

diff --git a/tiger/src/lib/tiger/tiger_parser.mly b/tiger/src/lib/tiger/tiger_parser.mly
index 35cae28..625632f 100644
--- a/tiger/src/lib/tiger/tiger_parser.mly
+++ b/tiger/src/lib/tiger/tiger_parser.mly
@@ -49,6 +49,9 @@
 %token WHILE
 
 /* from lowest precedence */
+%left ELSE
+%nonassoc ASSIGN
+%left OF DO
 %left OR
 %left AND
 %nonassoc EQ NEQ GT LT GE LE
@@ -68,6 +71,7 @@ program:
     {
       sprintf "program[%s]" $1
     }
+  ;
 
 exp:
   | NIL
@@ -85,9 +89,11 @@ exp:
   | ID LBRACK exp RBRACK OF exp
     {
       let type_id = $1 in
-      let exp_1 = $3 in
-      let exp_2 = $6 in
-      sprintf "array[type[%s], size[%s], val[%s]]" type_id exp_1 exp_2
+      let number_of_elements = $3 in
+      let initial_value = $6 in
+      sprintf
+        "array[type[%s], size[%s], val[%s]]"
+        type_id number_of_elements initial_value
     }
   | ID LBRACE rec_field_assignments RBRACE
     {
@@ -109,9 +115,16 @@ exp:
     {
       sprintf "string[%S]" $1
     }
-  | fun_call
+  | ID LPAREN RPAREN
     {
-      $1
+      let id = $1 in
+      sprintf "fun_call[%s, []]" id
+    }
+  | ID LPAREN fun_args RPAREN
+    {
+      let id = $1 in
+      let fun_args = $3 in
+      sprintf "fun_call[%s, %s]" id fun_args
     }
   | exp op exp
     {
@@ -132,7 +145,7 @@ exp:
     {
       sprintf "while[%s, do[%s]]" $2 $4
     }
-  | FOR id ASSIGN exp TO exp DO exp
+  | FOR ID ASSIGN exp TO exp DO exp
     {
       let id = $2 in
       let e1 = $4 in
@@ -144,30 +157,52 @@ exp:
     {
       "break[]"
     }
-  | LPAREN seq RPAREN
+  | LPAREN exps RPAREN
     {
-      sprintf "seq[%s]" $2
+      sprintf "exps[%s]" $2
     }
-  | LET decs IN seq END
+  | LET decs IN exps END
     {
       let decs = $2 in
-      let seq = $4 in
-      sprintf "let[decs[%s], in[seq[%s]]]" decs seq
+      let exps = $4 in
+      sprintf "let[decs[%s], in[exps[%s]]]" decs exps
     }
-  | unit
+  | LPAREN RPAREN
     {
-      $1
+      (* Perhaps "void"? *)
+      "unit[]"
+    }
+  ;
+
+rec_field_assignments:
+  | ID EQ exp
+    {
+      let id = $1 in
+      let exp = $3 in
+      sprintf "%S = %s" id exp
+    }
+  | ID EQ exp COMMA rec_field_assignments
+    {
+      let id = $1 in
+      let exp = $3 in
+      let rec_field_assignments = $5 in
+      sprintf "%S = %s, %s" id exp rec_field_assignments
     }
+  ;
 
-seq:
+exps:
   | exp
     {
-      sprintf "%s" $1
+      let exp = $1 in
+      sprintf "%s" exp
     }
-  | exp SEMICOLON seq
+  | exp SEMICOLON exps
     {
-      sprintf "%s; %s" $1 $3
+      let exp = $1 in
+      let exps = $3 in
+      sprintf "%s; %s" exp exps
     }
+  ;
 
 decs:
   | dec
@@ -178,45 +213,42 @@ decs:
     {
       sprintf "%s %s" $1 $2
     }
+  ;
 
 dec:
-  | tydec  {$1}
-  | vardec {$1}
-  | fundec {$1}
-
-fundec:
-  | FUNCTION id unit EQ exp
+  /* Tydec */
+  | TYPE ID EQ ID
     {
-      let id       = $2 in
-      let exp      = $5 in
-      sprintf "fundec[%s, exp[%s]]" id exp
+      let type_id_new = $2 in
+      let type_id_orig = $4 in
+      sprintf "tydec_alias[from[%s], to[%s]]" type_id_new type_id_orig
     }
-  | FUNCTION id LPAREN tyfields RPAREN EQ exp
+  | TYPE ID EQ LBRACE RBRACE
     {
-      let id       = $2 in
-      let tyfields = $4 in
-      let exp      = $7 in
-      sprintf "fundec[%s, tyfields[%s], exp[%s]]" id tyfields exp
+      let type_id = $2 in
+      sprintf "tydec_empty_record[%s]" type_id
     }
-  | FUNCTION id LPAREN tyfields RPAREN COLON ID EQ exp
+  | TYPE ID EQ LBRACE tyfields RBRACE
     {
-      let id       = $2 in
-      let tyfields = $4 in
-      let type_id  = $7 in
-      let exp      = $9 in
-      sprintf
-        "fundec[%s, tyfields[%s], type_id[%s], exp[%s]]"
-        id tyfields type_id exp
+      let type_id = $2 in
+      let tyfields = $5 in
+      sprintf "tydec_record[%s, fields[%s]]" type_id tyfields
+    }
+  | TYPE ID EQ ARRAY OF ID
+    {
+      let type_id = $2 in
+      let element_type_id = $6 in
+      sprintf "tydec_array[%s, elements_of_type[%s]]" type_id element_type_id
     }
 
-vardec:
-  | VAR id ASSIGN exp
+  /* Vardec */
+  | VAR ID ASSIGN exp
     {
       let id = $2 in
       let exp = $4 in
       sprintf "vardec[%s, exp[%s]]" id exp
     }
-  | VAR id COLON ID ASSIGN exp
+  | VAR ID COLON ID ASSIGN exp
     {
       let id = $2 in
       let type_id = $4 in
@@ -224,86 +256,48 @@ vardec:
       sprintf "vardec[%s, type_id[%s], exp[%s]]" id type_id exp
     }
 
-tydec:
-  | TYPE ID EQ ty
-    {
-      let type_id = $2 in
-      let ty = $4 in
-      sprintf "tydec[%s, %s]" type_id ty
-    }
-
-ty:
-  | ID
-    {
-      let type_id = $1 in
-      sprintf "type[type_id[%S]]" type_id
-    }
-  | LBRACE RBRACE
+  /* Fundec */
+  | FUNCTION ID LPAREN RPAREN EQ exp
     {
-      "record[]"
+      let id       = $2 in
+      let exp      = $6 in
+      sprintf "fundec[%s, arguments[], exp[%s]]" id exp
     }
-  | LBRACE tyfields RBRACE
+  | FUNCTION ID LPAREN tyfields RPAREN EQ exp
     {
-      let tyfields = $2 in
-      sprintf "record[%s]" tyfields
+      let id       = $2 in
+      let tyfields = $4 in
+      let exp      = $7 in
+      sprintf "fundec[%s, arguments[%s], exp[%s]]" id tyfields exp
     }
-  | ARRAY OF ID
+  | FUNCTION ID LPAREN tyfields RPAREN COLON ID EQ exp
     {
-      let type_id = $3 in
-      sprintf "array_of_type[%s]" type_id
+      let id       = $2 in
+      let tyfields = $4 in
+      let type_id  = $7 in
+      let exp      = $9 in
+      sprintf
+        "fundec[%s, tyfields[%s], type_id[%s], exp[%s]]"
+        id tyfields type_id exp
     }
+  ;
 
 tyfields:
-/*| epsilon */
-  | tyfield
-    {$1}
-  | tyfield COMMA tyfields
-    {
-      let tyfield = $1 in
-      let tyfields = $3 in
-      sprintf "%s, %s" tyfield tyfields
-    }
-
-tyfield:
-  | id COLON ID
-    {
-      let id = $1 in
-      let type_id = $3 in
-      sprintf "tyfield[%s, %s]" id type_id
-    }
-
-id:
-  | ID
-    {
-      sprintf "id[%S]" $1
-    }
-
-/* Perhaps "void"? */
-unit:
-  | LPAREN RPAREN
-    {
-      "unit[]"
-    }
-
-rec_field_assignments:
-  | id EQ exp
+  | ID COLON ID
     {
-      sprintf "%S = %s" $1 $3
+      let id_1 = $1 in
+      let id_2 = $3 in
+      sprintf "%s : %s" id_1 id_2
     }
-  | id EQ exp COMMA rec_field_assignments
+  | ID COLON ID COMMA tyfields
     {
-      sprintf "%S = %s, %s" $1 $3 $5
-    }
-
-fun_call:
-  | id unit
-    {
-      sprintf "fun_call[%s, %s]" $1 $2
-    }
-  | id LPAREN fun_args RPAREN
-    {
-      sprintf "fun_call[%s, %s]" $1 $3
+      let id_1 = $1 in
+      let id_2 = $3 in
+      let tyfield = sprintf "%s : %s" id_1 id_2 in
+      let tyfields = $5 in
+      sprintf "%s, %s" tyfield tyfields
     }
+  ;
 
 fun_args:
   | exp
@@ -314,6 +308,7 @@ fun_args:
     {
       sprintf "%s, %s" $1 $3
     }
+  ;
 
 op:
   | PLUS   {"+"}
@@ -328,19 +323,37 @@ op:
   | LE     {"<="}
   | AND    {"&"}
   | OR     {"|"}
+  ;
 
 lvalue:
-  | id
+  | ID lvalue_part
     {
-      sprintf "lvalue[%s]" $1
+      let id = $1 in
+      let part = $2 in
+      sprintf "lvalue[%s, part[%s]]" id part
     }
-  | lvalue DOT id
+  ;
+
+lvalue_part:
+  | {"epsilon[]"}
+  | lvalue_subscript {$1}
+  | lvalue_field_access {$1}
+  ;
+
+lvalue_subscript:
+  | LBRACK exp RBRACK
     {
-      sprintf "get_record_field[%s, %s]" $1 $3
+      let exp = $2 in
+      sprintf "subscript[%s]" exp
     }
-  | lvalue LBRACK exp RBRACK
+  ;
+
+lvalue_field_access:
+  | DOT ID
     {
-      sprintf "get_array_subscript[%s, %s]" $1 $3
+      let field = $2 in
+      sprintf "field_access[%s]" field
     }
+  ;
 
 %%