Mercurial > hg > Members > shinya > pyrect

changeset 23:3ac5cabb2d76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add convert-option --grep to converter.py.
author Ryoma SHINYA <shinya@firefly.cr.ie.u-ryukyu.ac.jp>
date Tue, 06 Jul 2010 05:37:03 +0900
parents 5149b48b22a9
children ceb0b8a73d68
files src/converter.py src/grep_bench.sh
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/converter.py	Mon Jul 05 20:30:14 2010 +0900
+++ b/src/converter.py	Tue Jul 06 05:37:03 2010 +0900
@@ -6,12 +6,14 @@
 from cbc_translator import CbCTranslator
 from dot_translator import DotTranslator
 from llvm_translator import LLVMTranslator
+from grep_translator import GREPTranslator
 from optparse import OptionParser
 
 def main(argv):
     myusage = "%prog [-C] regexp"
     psr = OptionParser(usage=myusage)
     psr.add_option("--CbC", action="store_true", dest="emit_cbc", default=False, help="emit CbC-source")
+    psr.add_option("--grep", action="store_true", dest="emit_grep", default=False, help="emit grep-source")
     psr.add_option("--LLVM", action="store_true", dest="emit_llvm", default=False, help="emit LLVM-source")
     psr.add_option("--Dot", action="store_true", dest="emit_dot", default=False, help="emit Dot-source")
     psr.add_option("--from-dfa", action="store_true", dest="dfa", default=True, help="translate from DFA")
@@ -44,6 +46,8 @@
         translator.debug = opts.debug
         translator.optimize = opts.optimize
         translator.impl_label = opts.label
+    elif opts.emit_grep:
+        translator = GREPTranslator(reg.regexp, CallGraph(fa))
     elif opts.emit_cbc:
         translator = CbCTranslator(reg.regexp, CallGraph(fa))
         translator.debug = opts.debug
--- a/src/grep_bench.sh	Mon Jul 05 20:30:14 2010 +0900
+++ b/src/grep_bench.sh	Tue Jul 06 05:37:03 2010 +0900
@@ -3,9 +3,14 @@
 egrepout="/tmp/egrep.out"
 jitgrepout="/tmp/jitgrep.out"
 agrepout="/tmp/agrep.out"
+cgrepout="/tmp/cgrep.out"
 
 echo "[jitgrep]"
-time ./jitgrep.py $@ > $jitgrepout
+time ./jitgrep.py -O0 $@ > $jitgrepout
+#time /tmp/jitgrep $@ > $jitgrepout
+
+echo "\n[cgrep]"
+time cgrep -E $@ > $cgrepout
 
 echo "\n[agrep]"
 time agrep $@ > $agrepout
@@ -19,4 +24,7 @@
 echo "[diff agrep jitgrep]"
 diff $agrepout $jitgrepout
 
-#rm -f $egrepout $jitgrepout
+echo "[diff cgrep jitgrep]"
+diff $cgrepout $jitgrepout
+
+#rm -f $egrepout $jitgrepout $agrepout $cgrepout