get rid of the antiast nonsense

JakeWheat · Oct 29, 2011 · 280adb1 · 280adb1
1 parent a46ab28
commit 280adb1
Show file tree

Hide file tree

Showing 23 changed files with 255 additions and 1,721 deletions.
diff --git a/.depend b/.depend
@@ -6,9 +6,6 @@ src-extra/util/Database/HsSqlPpp/Utils/PgUtils.o : src-extra/util/Database/HsSql
 src/Database/HsSqlPpp/Internals/TypeChecking/IDEnv.o : src/Database/HsSqlPpp/Internals/TypeChecking/IDEnv.lhs
 src/Database/HsSqlPpp/Parsing/ParseErrors.o : src/Database/HsSqlPpp/Parsing/ParseErrors.lhs
 src-extra/util/Database/HsSqlPpp/Utils/Here.o : src-extra/util/Database/HsSqlPpp/Utils/Here.lhs
-src-extra/devel-util/MakeAntiNodes.o : src-extra/devel-util/MakeAntiNodes.lhs
-src-extra/devel-util/MakeAntiNodesRunner.o : src-extra/devel-util/MakeAntiNodesRunner.lhs
-src-extra/devel-util/MakeAntiNodesRunner.o : src-extra/devel-util/MakeAntiNodes.hi
 src/Database/HsSqlPpp/Internals/TypeType.o : src/Database/HsSqlPpp/Internals/TypeType.lhs
 src/Database/HsSqlPpp/Internals/TypeChecking/ErrorUtils.o : src/Database/HsSqlPpp/Internals/TypeChecking/ErrorUtils.lhs
 src/Database/HsSqlPpp/Internals/TypeChecking/ErrorUtils.o : src/Database/HsSqlPpp/Internals/TypeType.hi
@@ -77,17 +74,13 @@ src/Database/HsSqlPpp/Annotation.o : src/Database/HsSqlPpp/Internals/AnnotationU
 src/Database/HsSqlPpp/Annotation.o : src/Database/HsSqlPpp/Internals/AstAnnotation.hi
 src-extra/tests/Database/HsSqlPpp/Tests/TestUtils.o : src-extra/tests/Database/HsSqlPpp/Tests/TestUtils.lhs
 src-extra/tests/Database/HsSqlPpp/Tests/TestUtils.o : src/Database/HsSqlPpp/Annotation.hi
-src/Database/HsSqlPpp/Internals/AstAnti.o : src/Database/HsSqlPpp/Internals/AstAnti.hs
-src/Database/HsSqlPpp/Internals/AstAnti.o : src/Database/HsSqlPpp/Internals/AstInternal.hi
-src/Database/HsSqlPpp/Internals/AstAnti.o : src/Database/HsSqlPpp/Internals/AstAnnotation.hi
 src/Database/HsSqlPpp/Ast.o : src/Database/HsSqlPpp/Ast.lhs
 src/Database/HsSqlPpp/Ast.o : src/Database/HsSqlPpp/Internals/AstInternal.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Parsing/ParserInternal.lhs
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Catalog.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Utils/Utils.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Annotation.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Ast.hi
-src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Internals/AstAnti.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Parsing/ParseErrors.hi
 src/Database/HsSqlPpp/Parsing/ParserInternal.o : src/Database/HsSqlPpp/Parsing/Lexer.hi
 src/Database/HsSqlPpp/Parser.o : src/Database/HsSqlPpp/Parser.lhs
@@ -106,10 +99,6 @@ src-extra/tests/Database/HsSqlPpp/Tests/ParameterizedStatementTests.o : src/Data
 src-extra/tests/Database/HsSqlPpp/Tests/ParameterizedStatementTests.o : src/Database/HsSqlPpp/Parser.hi
 src-extra/tests/Database/HsSqlPpp/Tests/ParameterizedStatementTests.o : src/Database/HsSqlPpp/Annotation.hi
 src-extra/tests/Database/HsSqlPpp/Tests/ParameterizedStatementTests.o : src/Database/HsSqlPpp/Types.hi
-src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Quote.lhs
-src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Internals/AstAnti.hi
-src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Annotation.hi
-src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Parsing/ParserInternal.hi
 src/Database/HsSqlPpp/Pretty.o : src/Database/HsSqlPpp/Pretty.lhs
 src/Database/HsSqlPpp/Pretty.o : src/Database/HsSqlPpp/Utils/Utils.hi
 src/Database/HsSqlPpp/Pretty.o : src/Database/HsSqlPpp/Catalog.hi
@@ -214,6 +203,10 @@ src-extra/tests/Database/HsSqlPpp/Tests/TypeChecking/TpchTests.o : src/Database/
 src-extra/tests/Database/HsSqlPpp/Tests/TypeChecking/TpchTests.o : src/Database/HsSqlPpp/Annotation.hi
 src-extra/tests/Database/HsSqlPpp/Tests/TypeChecking/TpchTests.o : src/Database/HsSqlPpp/TypeChecker.hi
 src-extra/tests/Database/HsSqlPpp/Tests/TypeChecking/TpchTests.o : src/Database/HsSqlPpp/Parser.hi
+src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Quote.lhs
+src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Ast.hi
+src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Annotation.hi
+src/Database/HsSqlPpp/Quote.o : src/Database/HsSqlPpp/Parsing/ParserInternal.hi
 src-extra/examples/FixSqlServerTpchSyntax.o : src-extra/examples/FixSqlServerTpchSyntax.lhs
 src-extra/examples/FixSqlServerTpchSyntax.o : src/Database/HsSqlPpp/Annotation.hi
 src-extra/examples/FixSqlServerTpchSyntax.o : src/Database/HsSqlPpp/Quote.hi
@@ -408,7 +401,6 @@ src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src/Database/
 src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src-extra/util/Database/HsSqlPpp/Utils/Here.hi
 src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src/Database/HsSqlPpp/Parsing/Lexer.hi
 src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src/Database/HsSqlPpp/Parsing/ParserInternal.hi
-src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src/Database/HsSqlPpp/Internals/AstAnti.hi
 src-extra/extensions/Database/HsSqlPpp/Extensions/DenormSyntax.o : src/Database/HsSqlPpp/Ast.hi
 src-extra/extensions/Database/HsSqlPpp/Extensions/Denormalized6nf.o : src-extra/extensions/Database/HsSqlPpp/Extensions/Denormalized6nf.lhs
 src-extra/extensions/Database/HsSqlPpp/Extensions/Denormalized6nf.o : src-extra/extensions/Database/HsSqlPpp/Extensions/AstUtils.hi

diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@
 #   test modules?
 
 # todo: don't write the .o, .hi and exes in the source tree
-# todo: transition to not storing astanti and astinternal.hs in repo?
+# todo: transition to not storing astinternal.hs in repo?
 
 # todo: find something better than make
 
@@ -58,7 +58,6 @@ HC_OPTS = $(HC_BASIC_OPTS) $(HC_INCLUDE_DIRS) $(HC_PACKAGES)
 # the list of .o files which an .lhs for an exe needs to build
 # (ghc -M is used for all the dependencies other than the exes)
 EXE_FILES = src-extra/tests/Tests \
-	src-extra/devel-util/MakeAntiNodesRunner \
 	src-extra/devel-util/MakeDefaultTemplate1Catalog \
 	src-extra/examples/FixSqlServerTpchSyntax \
 	src-extra/examples/MakeSelect \
@@ -103,6 +102,7 @@ website : src-extra/tosort/util/DevelTool
 website_haddock :
 	cabal configure
 	cabal haddock
+	-mkdir hssqlppp
 	mv dist/doc/html/hssqlppp hssqlppp/haddock
 
 # task to build the chaos sql, which takes the source sql
@@ -138,15 +138,10 @@ exe_depend : src-extra/devel-util/GenerateExeRules.lhs Makefile
 depend :
 	ghc -M $(HC_OPTS) $(SRCS_ROOTS) -dep-makefile .depend
 
-#specific rules for generated files: astanti.hs and astinternal.hs
-
-src/Database/HsSqlPpp/Internals/AstAnti.hs : \
-		src/Database/HsSqlPpp/Internals/AstInternal.hs \
-		src-extra/devel-util/MakeAntiNodesRunner
-	src-extra/devel-util/MakeAntiNodesRunner
+#specific rules for generated file astinternal.hs
 
 src/Database/HsSqlPpp/Internals/AstInternal.hs : $(AG_FILES)
-	uuagc  -dcfwsp -P src/Database/HsSqlPpp/Internals/ \
+	uuagc -dcfwsp -P src/Database/HsSqlPpp/Internals/ \
 		src/Database/HsSqlPpp/Internals/AstInternal.ag
 
 # rule for the generated file
@@ -173,7 +168,6 @@ clean :
 	-rm -Rf hssqlppp
 
 maintainer-clean : clean
-	-rm src/Database/HsSqlPpp/Internals/AstAnti.hs
 	-rm src/Database/HsSqlPpp/Internals/AstInternal.hs
 
 

diff --git a/bigplan b/bigplan
@@ -25,15 +25,10 @@ other possible ideas for next release:
 
 typesafe wrapper, use for chaos tests, get chaos actually running also
 
-fix the quasiquote syntax approach - no separate antinoded ast types,
-anti nodes are manually added and explicit in the ast.
-
 type checking flow, inferred type ish
 
 
 concrete steps:
-1) antictor change -> add the ctors in manually, remove the generated
-   astanti completely
 2) rewrite the parse tests to be readable
 3) kill the typechecking, and start again with better annotation
 4) work through the typechecking tests getting the new system working