Mercurial > repos > icfp2014

changeset 8:494ef2e3a756

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly pass initial arguments to main
author Michael Pavone <pavone@retrodev.com>
date Fri, 25 Jul 2014 13:59:43 -0700
parents afd55b32549b
children 526bec3b2090
files code/lmc.tp code/test.lm
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/code/lmc.tp	Fri Jul 25 13:47:21 2014 -0700
+++ b/code/lmc.tp	Fri Jul 25 13:59:43 2014 -0700
@@ -241,8 +241,12 @@
 						error: "Only assignments are allowed at the top level"
 					}
 				}
+				after_env <- prog makeLabel: "after_env"
+				prog add: (inst: "LDF" #[after_env])
+				prog add: (inst: "TRAP" #[num])
+				prog setLabel: after_env
 				prog add: (inst: "LDF" #["main"])
-				prog add: (inst: "TRAP" #[num])
+				prog add: (inst: "TAP" #[2])
 				
 				foreach: functions :fname fun {
 					prog setLabel: fname
--- a/code/test.lm	Fri Jul 25 13:47:21 2014 -0700
+++ b/code/test.lm	Fri Jul 25 13:59:43 2014 -0700
@@ -9,7 +9,7 @@
 		#[myState 1]
 	}
 	
-	main <- {
+	main <- :initWorld mystery{
 		#[0 step]
 	}
 }