refined regexp match

vzaliva · Sep 25, 2016 · 813aa21 · 813aa21
1 parent aa497f7
commit 813aa21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Test.v b/Test.v
@@ -1,7 +1,8 @@
 Require Import Bool.DecBool.
  Require Import Arith.Min.
 Require Import   Omega. (* comment *)
-Require Import BinNums  List Setoid.
+Require Import BinNums  Coq.List Setoid.
+Require Import Setoid. (* Presently for testing only. Consider moving it elsewhere *)
 
 (* requires Arith.Min *)
 Definition bar1 := min_0_l.

diff --git a/coq_min_imports.ml b/coq_min_imports.ml
@@ -7,7 +7,7 @@ open BatIO
 open Dirtools
 
 (* TODO: match mutliline import statements *)
-let import_regexp = Str.regexp "^[ \t]*Require[ \t]+Import[ \t]+\\(.+\\)\\.[\t ]*"
+let import_regexp = Str.regexp "^[ \t]*Require[ \t]+Import[ \t]+\\(\\([A-Za-z_\\.]+\\)\\([ \t]+[A-Za-z_\\.]+\\)*\\)\\."
 
 let verbose = ref false
 let replace = ref false