Parsing complete mostly, ordering, resolving, C++ tests

main.c

@@ -8,16 +8,22 @@
 
 #include "common.c"
 #include "memory.c"
-#include "scratch.c"
 #include "os_win32.c"
 
-#include "new_lex.c"
-#include "new_ast.c"
-#include "new_print.c"
-#include "new_parse.c"
+#include "lex.c"
+#include "ast.c"
+#include "print.c"
+#include "parse.c"
+#include "type.c"
+#include "resolve.c"
 
 int main(){
   lex_test();
   parse_test();
   ast_test();
+  intern_test();
+  map_test();
+  array_test();
+  test_types();
+  resolve_test();
 }