From: Adam Megacz <adam@megacz.com>
Date: Tue, 31 May 2011 00:41:07 +0000 (-0700)
Subject: use -fsimpleopt-before-flatten in sanity checks
X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=commitdiff_plain;h=d9117c50c1e7d287651720b5cda988c8821b8d62

use -fsimpleopt-before-flatten in sanity checks
---

diff --git a/examples/Makefile b/examples/Makefile
index 1ee6f7f..c4fafba 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,11 +1,11 @@
-ghc_opt := -fwarn-incomplete-patterns -Werror
+ghc_opt := -fwarn-incomplete-patterns -Werror -odir .build -hidir .build 
 
 open:
 	make demo
 	open .build/test.pdf
 
 #sanity += BiGArrow.hs
-#sanity += CircuitExample.hs
+sanity += CircuitExample.hs
 sanity += CommandSyntaxExample.hs
 sanity += DotProduct.hs
 sanity += GArrowTutorial.hs
@@ -16,16 +16,18 @@ sanity += LambdaCalculusInterpreter.hs
 sanity += TypeSafeRun.hs
 sanity += Unflattening.hs
 
-sanity_opts = -dcore-lint -fforce-recomp -fcoqpass -ddump-coqpass -ddump-to-file
+sanity_opts  = -dcore-lint -fforce-recomp -fcoqpass -ddump-coqpass -ddump-to-file
+sanity_opts += -fsimpleopt-before-flatten
+sanity_opts += -odir .build -hidir .build 
 
 sanity:
-	for A in $(sanity); do ../../../inplace/bin/ghc-stage2 $(sanity_opts) $$A +RTS -K500M || exit -1; done
+	for A in $(sanity); do echo; echo; ../../../inplace/bin/ghc-stage2 $(sanity_opts) $$A +RTS -K500M || exit -1; done
 
 
 demo:
 	mkdir -p .build
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build -c Demo.hs -fforce-recomp
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build --show-iface .build/Demo.hi
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build GArrowTikZ.hs Demo.hs DemoMain.hs Unify.hs -o .build/demo
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) -c Demo.hs -fforce-recomp
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) --show-iface .build/Demo.hi
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) GArrowTikZ.hs Demo.hs DemoMain.hs Unify.hs -o .build/demo
 	./.build/demo > .build/test.tex
 	cd .build; pdflatex test.tex
diff --git a/examples/Unify.dump-coqpass b/examples/Unify.dump-coqpass
deleted file mode 100644
index e69de29..0000000