camlspotter avatar camlspotter committed 643267d

command line option simplification

Comments (0)

Files changed (3)

   let file = Spot.File.dump
   let unit = Spot.Unit.dump
 
-  let rannots_full unit = 
-    eprintf "@[<2>rannots =@ [ @[<v>%a@]@] ]@."
-      (Format.list ";@ " (Regioned.format (Format.list ";@ " Annot.format)))
-      !!(unit.Unit.rannots)
-  ;;
-  
-  let rannots_summary unit = 
+  let rannots unit = 
     eprintf "@[<2>rannots =@ [ @[<v>%a@]@] ]@."
       (Format.list ";@ " (Regioned.format (Format.list ";@ " Annot.summary)))
       !!(unit.Unit.rannots)
 
     let file = File.load ~load_paths: ["."] path in
     
-    if C.dump_file then Dump.unit file; (* CR jfuruse: to be fixed *)
-    if C.dump_tree then Dump.tree file;
-    if C.dump_top  then Dump.top  file;
-    if C.dump_flat then Dump.flat file;
-    if C.dump_rannots = `Full    then Dump.rannots_full    file;
-    if C.dump_rannots = `Summary then Dump.rannots_summary file;
+    if C.dump_file    then Dump.unit    file; (* CR jfuruse: to be fixed *)
+    if C.dump_tree    then Dump.tree    file;
+    if C.dump_top     then Dump.top     file;
+    if C.dump_flat    then Dump.flat    file;
+    if C.dump_rannots then Dump.rannots file;
 
     file
   ;;
     
 let rev_anonargs           = ref []
 let dump_file              = ref false
-let dump_rannots           = ref `None
+let dump_rannots           = ref false
 let dump_tree              = ref false
 let dump_top               = ref false
 let dump_flat              = ref false
       Arg.Set dump_file, " : dump spot file"; 
 
       "--dump-rannots", 
-      Arg.Unit (fun () -> dump_rannots    := `Full), " : dump loc-annots";
-
-      "--dump-rannots-summary", 
-      Arg.Unit (fun () -> dump_rannots    := `Summary), " : dump loc-annots";
+      Arg.Set dump_rannots, " : dump loc-annots";
 
       "--dump-tree", 
       Arg.Set dump_tree, " : dump annot tree";
 let use_spot               = !use_spot
 
 let dump_any = 
-  dump_file || dump_rannots <> `None || dump_tree || dump_top || dump_flat
+  dump_file || dump_rannots || dump_tree || dump_top || dump_flat
 
 module SearchSpec = struct
   type t = 

spotconfig_intf.ml

   val print_version          : unit -> unit
   
   val dump_file              : bool
-  val dump_rannots           : [ `None | `Full | `Summary ]
+  val dump_rannots           : bool
   val dump_tree              : bool
   val dump_top               : bool
   val dump_flat              : bool
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.