From a87678f05df6d8d1dfd1c5ab38666c6f1fe31322 Mon Sep 17 00:00:00 2001
From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Mon, 28 May 2018 14:32:01 -0400
Subject: [PATCH] Remove stand-alone tyfield grammar rule

---
 tiger/src/lib/tiger/tiger_parser.mly | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tiger/src/lib/tiger/tiger_parser.mly b/tiger/src/lib/tiger/tiger_parser.mly
index a415ae7..43ec10f 100644
--- a/tiger/src/lib/tiger/tiger_parser.mly
+++ b/tiger/src/lib/tiger/tiger_parser.mly
@@ -254,22 +254,19 @@ dec:
     }
 
 tyfields:
-/*| epsilon */
-  | tyfield
-    {$1}
-  | tyfield COMMA tyfields
+  | ID COLON ID
     {
-      let tyfield = $1 in
-      let tyfields = $3 in
-      sprintf "%s, %s" tyfield tyfields
+      let id_1 = $1 in
+      let id_2 = $3 in
+      sprintf "%s : %s" id_1 id_2
     }
-
-tyfield:
-  | ID COLON ID
+  | ID COLON ID COMMA tyfields
     {
-      let id = $1 in
-      let type_id = $3 in
-      sprintf "tyfield[%s, %s]" id type_id
+      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
     }
 
 rec_field_assignments:
-- 
2.20.1