Move vim-nfa-dump to test and add convenience fn

guns · guns · commit 74c76825cc6f · 2013-08-01T20:54:12.000-05:00
diff --git a/clj/src/vim_clojure_static/generate.clj b/clj/src/vim_clojure_static/generate.clj
@@ -2,8 +2,7 @@
 ;;          Joel Holdbrooks <cjholdbrooks@gmail.com>
 
 (ns vim-clojure-static.generate
-  (:require [clojure.java.shell :as shell]
-            [clojure.set :as set]
+  (:require [clojure.set :as set]
             [clojure.string :as string]))
 
 ;;
@@ -222,16 +221,6 @@
                            (fmt "script=" :script)
                            (fmt "block=" :block)])))
 
-(defn vim-nfa-dump
-  "Run a patched version of Vim compiled with -DDEBUG on a new file containing
-   buffer, then move the NFA log to log-path. The patch is located at
-   vim/custom-nfa-log.patch"
-  [vim-path buffer log-path]
-  (let [file "tmp/nfa-test-file.clj"]
-    (spit file buffer)
-    (shell/sh vim-path "-u" "NONE" "-N" "-S" "vim/test-runtime.vim" file)
-    (shell/sh "mv" "nfa_regexp.log" log-path)))
-
 (comment
   ;; Generate the vim literal definitions for pasting into the runtime files.
   (spit "tmp/clojure-defs.vim"
@@ -251,23 +240,7 @@
              vim-unicode-category-char-classes
              vim-unicode-script-char-classes
              vim-unicode-block-char-classes))
-  (spit "tmp/nfa-test-file.clj"
+  ;; Generate an example file with all possible character property literals.
+  (spit "tmp/all-char-props.clj"
         comprehensive-clojure-character-property-regexps)
-  ;; Create regexp engine dump files and compare number of operations.
-  (let [syn-path "../syntax/clojure.vim"
-        orig-syn-buf (slurp syn-path)
-        vim-path (or (System/getenv "VIMDEBUG") "vim")
-        buf (format "#\"\\p{%s}\"\n" "Ll")
-        buf-hash (hash buf)]
-    (try
-      (mapv (fn [path]
-              (let [syn-buf (slurp path)
-                    syn-hash (hash syn-buf)
-                    log-path (format "tmp/debug:%d:%d.log" buf-hash syn-hash)]
-                (spit syn-path syn-buf)
-                (vim-nfa-dump vim-path buf log-path)
-                (count (re-seq #"\n" (slurp log-path)))))
-            ["../syntax/clojure.vim" "tmp/altsyntax.vim"])
-      (finally
-        (spit syn-path orig-syn-buf))))
   )
diff --git a/clj/src/vim_clojure_static/test.clj b/clj/src/vim_clojure_static/test.clj
@@ -69,6 +69,42 @@
                             ss λs)))
                 contexts)))))
 
+(defn vim-nfa-dump
+  "Run a patched version of Vim compiled with -DDEBUG on a new file containing
+   buffer, then move the NFA log to log-path. The patch is located at
+   vim/custom-nfa-log.patch"
+  [vim-path buffer log-path]
+  (let [file "tmp/nfa-test-file.clj"]
+    (spit file buffer)
+    (time (shell/sh vim-path "-u" "NONE" "-N" "-S" "vim/test-runtime.vim" file))
+    (shell/sh "mv" "nfa_regexp.log" log-path)))
+
+(defn compare-nfa-dumps
+  "Dump NFA logs with given buffer and syntax-files; log-files are written to
+   tmp/ and are distinguished by the hash of the buffer and syntax script.
+
+   The vim-path passed to vim-nfa-dump should either be in the VIMDEBUG
+   environment variable, or be the top vim in your PATH.
+
+   Returns the line count of each corresponding log file."
+  [buf [& syntax-files] & opts]
+  (let [{:keys [vim-path]
+         :or {vim-path (or (System/getenv "VIMDEBUG") "vim")}} opts
+        syn-path "../syntax/clojure.vim"
+        orig-syn (slurp syn-path)
+        buf-hash (hash buf)]
+    (try
+      (mapv (fn [path]
+              (let [syn-buf (slurp path)
+                    syn-hash (hash syn-buf)
+                    log-path (format "tmp/debug:%d:%d.log" buf-hash syn-hash)]
+                (spit syn-path syn-buf)
+                (vim-nfa-dump vim-path buf log-path)
+                (count (re-seq #"\n" (slurp log-path)))))
+            syntax-files)
+      (finally
+        (spit syn-path orig-syn)))))
+
 (comment
 
   (macroexpand-1
@@ -80,4 +116,12 @@
         ["^" #(= % [:clojureRegexpBoundary])]]))
   (test #'number-literals-test)
 
+  (defn dump! [buf]
+    (compare-nfa-dumps (format "#\"\\p{%s}\"\n" buf)
+                       ["../syntax/clojure.vim" "tmp/altsyntax.vim"]))
+
+  (dump! "Ll")
+  (dump! "javaLowercase")
+  (dump! "block=UNIFIED CANADIAN ABORIGINAL SYLLABICS")
+
   )
