Mercurial > hg > Applications > Grep

changeset 249:9493800265a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove SCValue(not all remove)
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Sat, 23 Jan 2016 12:34:50 +0900
parents 2b1fbfb92d54
children e60dd2fa3409
files regexParser/main.cc regexParser/regexParser.h regexParser/subsetConstruction.h
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/regexParser/main.cc	Fri Jan 22 20:09:42 2016 +0900
+++ b/regexParser/main.cc	Sat Jan 23 12:34:50 2016 +0900
@@ -46,8 +46,7 @@
         }
     } else if (subset)  {
         tgv = generateTransitionList(n);
-        SCValue scv = createSCValue(tgv);
-        subsetConstruction(scv);   // Determinization
+        subsetConstruction(tgv.tg);   // Determinization
         printState(tgv.tg);
         if (generateSequentialSearch) {
             exportState(tgv.tg);
--- a/regexParser/regexParser.h	Fri Jan 22 20:09:42 2016 +0900
+++ b/regexParser/regexParser.h	Sat Jan 23 12:34:50 2016 +0900
@@ -96,6 +96,13 @@
     StatePtr stateList;
 } TransitionGenerator, *TransitionGeneratorPtr;
 
+typedef struct buffer {
+    unsigned char *buff;
+    unsigned char *buffptr;
+    unsigned char *buffend;
+    unsigned char *matchBegin;
+} Buffer, *BufferPtr;
+
 typedef struct tsValue {
     Buffer buff;
     ResultPtr result;
@@ -138,13 +145,6 @@
     int stateNumber;
 } RegexInfo, *RegexInfoPtr;
 
-typedef struct buffer {
-    unsigned char *buff;
-    unsigned char *buffptr;
-    unsigned char *buffend;
-    unsigned char *matchBegin;
-} Buffer, *BufferPtr;
-
 typedef struct {
     unsigned char* file_mmap;
     off_t size;
--- a/regexParser/subsetConstruction.h	Fri Jan 22 20:09:42 2016 +0900
+++ b/regexParser/subsetConstruction.h	Sat Jan 23 12:34:50 2016 +0900
@@ -9,6 +9,5 @@
 extern bool hasNext(CharClassWalkerPtr walk);
 extern CharClassWalkerPtr createCharClassWalker (CharClassPtr next);
 extern void printState(TransitionGeneratorPtr tg);
-extern SCValue createSCValue(TGValue tgv) ;
-extern SCValue determinize(StatePtr state, SCValue scv);
-extern SCValue subsetConstruction(SCValue scv) ;
+extern void determinize(StatePtr s, TransitionGeneratorPtr tg);
+extern void subsetConstruction(TransitionGeneratorPtr tg);