Removed Type from nonassoc in tiger.grm so that consecutive tydecs would group together

Author: paulcruz74

chp4/parsetest.sml

@@ -0,0 +1,57 @@
+structure Parse : 
+	  sig
+	      val parse : string -> Absyn.exp
+	      val parseTestcase : string -> Absyn.exp
+	      val parseAllTests : unit -> Absyn.exp list
+        val test : string -> unit
+        val testLocal : string -> unit
+        val testAll : unit -> unit
+	  end =
+struct 
+structure TigerLrVals = TigerLrValsFun(structure Token = LrParser.Token)
+structure Lex = TigerLexFun(structure Tokens = TigerLrVals.Tokens)
+structure TigerP = Join(structure ParserData = TigerLrVals.ParserData
+			structure Lex=Lex
+			structure LrParser = LrParser)
+fun parse filename =
+  let val _ = (ErrorMsg.reset(); ErrorMsg.fileName := filename)
+      val file = TextIO.openIn filename
+      fun get _ = TextIO.input file
+      fun parseerror(s,p1,p2) = ErrorMsg.error p1 s
+      val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
+      val (absyn, _) = TigerP.parse(30,lexer,parseerror,())
+  in TextIO.closeIn file;
+     absyn
+  end handle LrParser.ParseError => raise ErrorMsg.Error
+					  
+fun parseTestcase name =
+  parse ("../tests/" ^ name ^ ".tig")
+
+fun test file =
+  let val exp = parseTestcase file
+      val ostream = TextIO.openOut ("./out/" ^ file ^ ".out")
+  in
+      PrintAbsyn.print (ostream, exp)
+  end
+
+fun testLocal file =
+  let val exp = parse file
+      val ostream = TextIO.openOut("./out/" ^ file ^ "_local.out")
+  in
+      PrintAbsyn.print (ostream, exp)
+  end
+
+fun getAllTestCases () =
+  let val tests = ["merge", "queens"];
+      fun addTests (0, tests) = tests
+        | addTests (n, tests) = addTests (n - 1, ("test" ^ Int.toString n)::tests)
+  in
+      addTests (49, tests)
+  end
+
+fun parseAllTests () =
+  map parseTestcase (getAllTestCases ())
+
+fun testAll () =
+  app test (getAllTestCases ())
+end

chp4/prabsyn.sml

@@ -53,7 +53,7 @@ fun print (outstream, e0) =
 			 sayln ","; exp(e,d+1);
 			 say ")")
 	     in indent d; say "RecordExp("; say(Symbol.name typ); 
-	        sayln ",["; dolist d f fields; say "])" 
+	        say ",["; dolist d f fields; say "])"
 	    end
     | exp(A.SeqExp l, d) = (indent d; say "SeqExp["; dolist d exp (map #1 l); 
 			    say "]")

chp4/readme.txt

@@ -32,7 +32,7 @@ Explanation For Precedence Directives:
 
 This was inserted because Tiger can have expressions for things like 3D arrays. For example, in the case of "array of array of array", this should refer to the type array of (array of array). If %left was issued, it would reduce first, and instead be recognized as (array of array) of array, which doesn't make sense.
 
-%nonassoc VAR TYPE IF THEN DO FUNCTION TO LET IN ASSIGN WHILE FOR
+%nonassoc VAR IF THEN DO FUNCTION TO LET IN ASSIGN WHILE FOR
 
 The parser should never have to determine associativity for these expressions because they should not be able to appear consecutively.
 

chp4/sources.cm

@@ -5,7 +5,8 @@ errormsg.sml
 table.sig
 table.sml
 symbol.sml
-parse.sml
+prabsyn.sml
+parsetest.sml
 tiger.lex
 tiger.grm
 $/smlnj-lib.cm

chp4/tiger.grm

@@ -60,7 +60,7 @@ OF NIL
 %value STRING ("")
 
 %right    OF
-%nonassoc VAR TYPE IF THEN DO FUNCTION TO LET IN ASSIGN WHILE FOR
+%nonassoc VAR IF THEN DO FUNCTION TO LET IN ASSIGN WHILE FOR
 %right    ELSE
 %left     OR
 %left     AND