Group all the driver files together

Author: chenglou

syntax/.depend

@@ -3,13 +3,10 @@ src/napkin_ast_conversion.cmi :
 src/napkin_ast_debugger.cmx : src/napkin_driver.cmx src/napkin_doc.cmx \
     src/napkin_ast_debugger.cmi
 src/napkin_ast_debugger.cmi : src/napkin_driver.cmi
-src/napkin_binary_driver.cmx : src/napkin_driver.cmx \
-    src/napkin_binary_driver.cmi
-src/napkin_binary_driver.cmi : src/napkin_driver.cmi
 src/napkin_character_codes.cmx :
-src/napkin_cli.cmx : src/napkin_reason_binary_driver.cmx \
-    src/napkin_ml_parser_driver.cmx src/napkin_driver.cmx \
-    src/napkin_binary_driver.cmx src/napkin_ast_debugger.cmx
+src/napkin_cli.cmx : src/napkin_driver_reason_binary.cmx \
+    src/napkin_driver_ml_parser.cmx src/napkin_driver_binary.cmx \
+    src/napkin_driver.cmx src/napkin_ast_debugger.cmx
 src/napkin_comment.cmx : src/napkin_comment.cmi
 src/napkin_comment.cmi :
 src/napkin_comments_table.cmx : src/napkin_parsetree_viewer.cmx \
@@ -28,19 +25,27 @@ src/napkin_driver.cmx : src/napkin_printer.cmx src/napkin_parser.cmx \
     src/napkin_io.cmx src/napkin_diagnostics.cmx src/napkin_core.cmx \
     src/napkin_comment.cmx src/napkin_driver.cmi
 src/napkin_driver.cmi : src/napkin_diagnostics.cmi src/napkin_comment.cmi
+src/napkin_driver_binary.cmx : src/napkin_driver.cmx \
+    src/napkin_driver_binary.cmi
+src/napkin_driver_binary.cmi : src/napkin_driver.cmi
+src/napkin_driver_ml_parser.cmx : src/napkin_io.cmx src/napkin_driver.cmx \
+    src/napkin_comment.cmx src/napkin_ast_conversion.cmx \
+    src/napkin_driver_ml_parser.cmi
+src/napkin_driver_ml_parser.cmi : src/napkin_driver.cmi \
+    src/napkin_comment.cmi
+src/napkin_driver_reason_binary.cmx : src/napkin_scanner.cmx \
+    src/napkin_io.cmx src/napkin_driver.cmx src/napkin_comment.cmx \
+    src/napkin_ast_conversion.cmx src/napkin_driver_reason_binary.cmi
+src/napkin_driver_reason_binary.cmi : src/napkin_token.cmx \
+    src/napkin_driver.cmi
 src/napkin_grammar.cmx : src/napkin_token.cmx
 src/napkin_io.cmx : src/napkin_io.cmi
 src/napkin_io.cmi :
 src/napkin_js_ffi.cmx :
 src/napkin_minibuffer.cmx : src/napkin_minibuffer.cmi
 src/napkin_minibuffer.cmi :
-src/napkin_ml_parser_driver.cmx : src/napkin_io.cmx src/napkin_driver.cmx \
-    src/napkin_comment.cmx src/napkin_ast_conversion.cmx \
-    src/napkin_ml_parser_driver.cmi
-src/napkin_ml_parser_driver.cmi : src/napkin_driver.cmi \
-    src/napkin_comment.cmi
-src/napkin_multi_printer.cmx : src/napkin_reason_binary_driver.cmx \
-    src/napkin_printer.cmx src/napkin_ml_parser_driver.cmx src/napkin_io.cmx \
+src/napkin_multi_printer.cmx : src/napkin_printer.cmx src/napkin_io.cmx \
+    src/napkin_driver_reason_binary.cmx src/napkin_driver_ml_parser.cmx \
     src/napkin_driver.cmx src/napkin_diagnostics.cmx \
     src/napkin_ast_conversion.cmx src/napkin_multi_printer.cmi
 src/napkin_multi_printer.cmi :
@@ -64,11 +69,6 @@ src/napkin_printer.cmx : src/napkin_token.cmx \
     src/napkin_printer.cmi
 src/napkin_printer.cmi : src/napkin_doc.cmi src/napkin_comments_table.cmx \
     src/napkin_comment.cmi
-src/napkin_reason_binary_driver.cmx : src/napkin_scanner.cmx \
-    src/napkin_io.cmx src/napkin_driver.cmx src/napkin_comment.cmx \
-    src/napkin_ast_conversion.cmx src/napkin_reason_binary_driver.cmi
-src/napkin_reason_binary_driver.cmi : src/napkin_token.cmx \
-    src/napkin_driver.cmi
 src/napkin_reporting.cmx : src/napkin_token.cmx src/napkin_grammar.cmx
 src/napkin_scanner.cmx : src/napkin_token.cmx src/napkin_diagnostics.cmx \
     src/napkin_comment.cmx src/napkin_character_codes.cmx \

syntax/Makefile

@@ -30,9 +30,9 @@ FILES = \
 	src/napkin_core.cmx\
 	src/napkin_driver.cmx \
 	src/napkin_ast_conversion.cmx \
-	src/napkin_ml_parser_driver.cmx \
-	src/napkin_reason_binary_driver.cmx \
-	src/napkin_binary_driver.cmx \
+	src/napkin_driver_ml_parser.cmx \
+	src/napkin_driver_reason_binary.cmx \
+	src/napkin_driver_binary.cmx \
 	src/napkin_ast_debugger.cmx \
 	src/napkin_outcome_printer.cmx \
 	src/napkin_multi_printer.cmx

syntax/src/napkin_cli.ml

@@ -51,16 +51,16 @@ module CliArgProcessor = struct
       in
       let parsingEngine =
           match origin with
-          | "reasonBinary" -> Parser Napkin_reason_binary_driver.parsingEngine
-          | "ml" | "ocaml" -> Parser Napkin_ml_parser_driver.parsingEngine
+          | "reasonBinary" -> Parser Napkin_driver_reason_binary.parsingEngine
+          | "ml" | "ocaml" -> Parser Napkin_driver_ml_parser.parsingEngine
           | _ -> Parser Napkin_driver.parsingEngine
       in
       let printEngine =
         match target with
-        | "ml" | "ocaml" -> Napkin_ml_parser_driver.printEngine
+        | "ml" | "ocaml" -> Napkin_driver_ml_parser.printEngine
         | "ast" -> Napkin_ast_debugger.printEngine
         | "sexp" -> Napkin_ast_debugger.sexpPrintEngine
-        | "binary" -> Napkin_binary_driver.printEngine
+        | "binary" -> Napkin_driver_binary.printEngine
         | _  -> Napkin_driver.printEngine
       in
 

syntax/src/napkin_binary_driver.ml renamed to syntax/src/napkin_driver_binary.ml

@@ -42,14 +42,14 @@ let printRes ~isInterface ~filename =
 let printMl ~isInterface ~filename =
   if isInterface then
     let parseResult =
-      Napkin_ml_parser_driver.parsingEngine.parseInterface ~forPrinter:true ~filename in
+      Napkin_driver_ml_parser.parsingEngine.parseInterface ~forPrinter:true ~filename in
     Napkin_printer.printInterface
       ~width:defaultPrintWidth
       ~comments:parseResult.comments
       parseResult.parsetree
   else
     let parseResult =
-      Napkin_ml_parser_driver.parsingEngine.parseImplementation ~forPrinter:true ~filename in
+      Napkin_driver_ml_parser.parsingEngine.parseImplementation ~forPrinter:true ~filename in
     Napkin_printer.printImplementation
       ~width:defaultPrintWidth
       ~comments:parseResult.comments
@@ -82,9 +82,9 @@ let printReason ~refmtPath ~isInterface ~filename =
     if isInterface then
       let parseResult =
         (* read the marshalled ast (from the binary output in the tempfile) *)
-        Napkin_reason_binary_driver.parsingEngine.parseInterface ~forPrinter:true ~filename:tempFilename in
+        Napkin_driver_reason_binary.parsingEngine.parseInterface ~forPrinter:true ~filename:tempFilename in
       (* re-read the original "filename" and extract string + comment data *)
-      let (comments, stringData) = Napkin_reason_binary_driver.extractConcreteSyntax filename in
+      let (comments, stringData) = Napkin_driver_reason_binary.extractConcreteSyntax filename in
       (* put the comment- and string data back into the unmarshalled parsetree *)
       let parseResult = {
         parseResult with
@@ -100,8 +100,8 @@ let printReason ~refmtPath ~isInterface ~filename =
     else
       let parseResult =
         (* read the marshalled ast (from the binary output in the tempfile) *)
-        Napkin_reason_binary_driver.parsingEngine.parseImplementation ~forPrinter:true ~filename:tempFilename in
-      let (comments, stringData) = Napkin_reason_binary_driver.extractConcreteSyntax filename in
+        Napkin_driver_reason_binary.parsingEngine.parseImplementation ~forPrinter:true ~filename:tempFilename in
+      let (comments, stringData) = Napkin_driver_reason_binary.extractConcreteSyntax filename in
       (* put the comment- and string data back into the unmarshalled parsetree *)
       let parseResult = {
         parseResult with