Phase filenames now match identifiers in phases list

Makefile

@@ -1,7 +1,6 @@
 RESULT := civicc
-PHASES := load parse print desug context_analysis typecheck dim_reduce \
-	bool_op extern_vars constant_propagation index_analysis assemble peephole \
-	output
+PHASES := load parse print desug context typecheck dimreduce boolop extern \
+	constprop index assemble peephole output
 SOURCES := types.ml stringify.mli stringify.ml util.mli util.ml lexer.mll \
 	parser.mly $(patsubst %,phases/%.ml,$(PHASES)) main.ml
 PRE_TARGETS := types.cmi types.o stringify.cmi stringify.o util.cmi util.o

main.ml

@@ -13,19 +13,19 @@ let phases = [
      "Parse input");
     ("desug", Desug.phase, always,
      "Desugaring");
-    ("context", Context_analysis.phase, always,
+    ("context", Context.phase, always,
      "Context analysis");
     ("typecheck", Typecheck.phase, always,
      "Type checking");
-    ("dimreduce", Dim_reduce.phase, always,
+    ("dimreduce", Dimreduce.phase, always,
      "Array dimension reduction");
-    ("boolop", Bool_op.phase, always,
+    ("boolop", Boolop.phase, always,
      "Convert bool operations");
-    ("extern", Extern_vars.phase, always,
+    ("extern", Extern.phase, always,
      "Create getters and setters for extern variables");
-    ("constprop", Constant_propagation.phase, when_optimize,
+    ("constprop", Constprop.phase, when_optimize,
      "Constant propagation");
-    ("index", Index_analysis.phase, always,
+    ("index", Index.phase, always,
      "Index analysis");
     ("assemble", Assemble.phase, always,
      "Assembly");

phases/index_analysis.ml → phases/index.ml

@@ -75,5 +75,5 @@ let rec strip_context = function
 let phase = function
     | Ast node ->
         let tagged = tag_index (strip_context node) in
-        Ast (Context_analysis.analyse_context tagged)
+        Ast (Context.analyse_context tagged)
     | _ -> raise (InvalidInput "index analysis")