# HG changeset patch
# User Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
# Date 1454937134 -32400
# Node ID 1d79e61a9365cd8cb2520c33f003bfd368072757
# Parent  df27e6cab8466cab6594c7c325b12486374e5b10
CbC state generator is not work on -O2 but -O1

diff -r df27e6cab846 -r 1d79e61a9365 regexParser/Makefile
--- a/regexParser/Makefile	Mon Feb 08 19:23:37 2016 +0900
+++ b/regexParser/Makefile	Mon Feb 08 22:12:14 2016 +0900
@@ -1,19 +1,19 @@
 TARGET= regexParser test/ccMerge 
-CFLAGS= -Wall -O0 -g -I$(CERIUM)/include/TaskManager -I.
+CFLAGS= -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
 SEQCFLAGS=  -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
 CC= clang++
-CbC= clang++
+CbC= /usr/local/Cellar/cbc/llvm3.8/bin/clang
 CERIUM= ../../Cerium
 AR= libCeriumGrep.a
 
 SRCS_TMP = $(wildcard *.cc)
-SRCS_EXCLUDE = sequentialSearch.cc state.cc parallelSearch.cc taskInit.cc searchTask.cc main.cc stateCbC.cc sequentialSearchCbC.cc generateSequentialSearchCbC.cc sequentialSearch.cc generateSequentialSearch.cc sequentialSearchCbC.cc
+SRCS_EXCLUDE = sequentialSearch.cc state.cc parallelSearch.cc taskInit.cc searchTask.cc main.cc stateCbC.cc sequentialSearchCbC.cc generateSequentialSearchCbC.cc sequentialSearch.cc generateSequentialSearch.cc 
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
 # REGEX = '[A-Z][A-Za-z0-9_]*'
-REGEX = '(a|b)*a(a|b)(a|b)'
-# REGEX = '(mil|hav)[A-Za-z]'
+# REGEX = '(a|b)*a(a|b)(a|b)'
+REGEX = '(mil|hav)[A-Za-z]'
 
 SUBST = -subset
 
@@ -29,7 +29,7 @@
 regexParser: $(OBJS) main.o sequentialSearch.o generateSequentialSearch.o
 	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearch.o
 
-regexParserCbC: $(OBJS) main.o sequentialSearchCbC.o generateSequentialSearchCbC.o
+regexParserCbC: $(OBJS) main.o generateSequentialSearchCbC.o
 	$(CbC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearchCbC.o
 
 test/searchBit: test/searchBit.cc
@@ -83,9 +83,9 @@
 	$(CC) $(SEQDFLAGS)  sequentialSearch.o  generateSequentialSearch.o $(OBJS) -o $@
 	- ./$@ -file $(TESTFILE)
 
-sequentialSearchCbC: sequentialSearchCbC.cc regexParserCbC fileread.o
+sequentialSearchCbC: sequentialSearchCbC.cc regexParserCbC fileread.o $(TESTFILE)
 	./regexParserCbC -seq -subset -regex $(REGEX)
-	$(CbC) $(CFLAGS)  -c sequentialSearchCbC.cc 
+	$(CbC) $(SEQCFLAGS)  -O1 -c sequentialSearchCbC.cc 
 	$(CbC) $(SEQDFLAGS)  sequentialSearchCbC.o generateSequentialSearchCbC.o $(OBJS) -o $@
 	- ./$@ -file $(TESTFILE)
 
diff -r df27e6cab846 -r 1d79e61a9365 regexParser/generateSequentialSearchCbC.cc
--- a/regexParser/generateSequentialSearchCbC.cc	Mon Feb 08 19:23:37 2016 +0900
+++ b/regexParser/generateSequentialSearchCbC.cc	Mon Feb 08 22:12:14 2016 +0900
@@ -3,6 +3,7 @@
 
 #include "generateSequentialSearch.h"
 #include "subsetConstruction.h"
+#include "CharClass.h"
 
 void
 generateState1(StatePtr state,long stateNum, bool accept, FILE *fp, TransitionGeneratorPtr tg) {