# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1342294391 25200
# Node ID be6d1cf7b7d796dc431f8ba80072813b6a58f881
# Parent  50a456168c25a7ab77ecb1bfe2de5a3c00800040# Parent  883ae0c1b7f63b34f07529459c84f7ab9c875fc2
merge

diff -r 883ae0c1b7f6 -r be6d1cf7b7d7 Makefile
--- a/Makefile	Sat Jul 14 11:09:36 2012 -0700
+++ b/Makefile	Sat Jul 14 12:33:11 2012 -0700
@@ -12,8 +12,13 @@
 	gcc -ggdb -I$(TPDIR) -o $@ $< $(TPDIR)/runtime/object.c 
 
 $(OBJDIR)/%.tp.c : $(SRCDIR)/%.tp
-	d8 $(TPC) -- -basedir $(TPDIR)/ $< > $@
+	d8 $(TPC) -- -basedir $(TPDIR)/ -i src $< > $@
 
 clean :
-	rm -f $(OBJS)
-	rm -f $(BINS)
+	rm -f $(OBJS) $(BINS)
+	
+cleansim :
+	rm -f bin/sim build/sim.tp.c
+	
+cleanlift :
+	rm -f bin/lifter build/lifter.tp.c
diff -r 883ae0c1b7f6 -r be6d1cf7b7d7 maps/trampoline4.map
--- a/maps/trampoline4.map	Sat Jul 14 11:09:36 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-     ######
-     #....#
-     #.**.#
-     #.**.#
-     #.**.#
-######.\\.######
-#**....*.......#
-#\\....L\\\....#
-#A......*****..#
-######R.....###########
-     ###.....*.....\\\#
-       #\\\\#..1...\\\#
-       #\\\\#......\\\#
-       ################
-
-Trampoline A targets 1
diff -r 883ae0c1b7f6 -r be6d1cf7b7d7 src/lifter.tp
--- a/src/lifter.tp	Sat Jul 14 11:09:36 2012 -0700
+++ b/src/lifter.tp	Sat Jul 14 12:33:11 2012 -0700
@@ -1,5 +1,21 @@
 #{
+	true <- #{
+	  if:else <- :self trueblock :elseblock {
+		trueblock:
+	  }
+	}
+
+	false <- #{
+	  if:else <- :self trueblock :elseblock {
+		elseblock:
+	  }
+	}
+	
 	main <- {
-		0
+		text <- sim readFd: 0
+		playfield <- (sim state) fromStr: text
+		os write: 2 text
+		os write: 2 "width: " . (string: (playfield width)) . "\n"
+		os write: 2 "height: " . (string: (playfield height)) . "\n"
 	}
 }
diff -r 883ae0c1b7f6 -r be6d1cf7b7d7 src/sim.tp
--- a/src/sim.tp	Sat Jul 14 11:09:36 2012 -0700
+++ b/src/sim.tp	Sat Jul 14 12:33:11 2012 -0700
@@ -170,8 +170,7 @@
 		}
 	}
 	
-	readFile <- :path {
-		fd <- os open: path (os O_RDONLY)
+	readFd <- :fd {
 		if: fd < 0 { "" } else: {
 			cur <- ""
 			part <- ""
@@ -181,11 +180,17 @@
 			} do: {
 				cur <- cur . part
 			}
-			os close: fd
 			cur
 		}
 	}
 	
+	readFile <- :path {
+		fd <- os open: path (os O_RDONLY)
+		out <- readFd: fd
+		os close: fd
+		out
+	}
+	
 	getMove <- {
 		os read: 0 1
 	}