diff regexParser/Makefile @ 208:2ec95755238e

fix mergetest
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Sun, 27 Dec 2015 18:46:08 +0900
parents 58d3c01bf421
children 959f8c00da17
line wrap: on
line diff
--- a/regexParser/Makefile	Sun Dec 27 16:51:14 2015 +0900
+++ b/regexParser/Makefile	Sun Dec 27 18:46:08 2015 +0900
@@ -1,5 +1,4 @@
-TARGET= regexParser
-MERGE = ccMerge
+TARGET= regexParser test/ccMerge
 CFLAGS= -Wall -O0 -g
 CC= clang++
 
@@ -13,7 +12,7 @@
 
 all: $(TARGET)
 
-$(TARGET):$(OBJS)
+regexParser: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS)
 
 test/searchBit: test/searchBit.cc
@@ -35,68 +34,78 @@
 .SUFFIXES: .cc .o
 
 test1:
-	./$(TARGET) -regex 'a'
-	./$(TARGET) -regex 'ab'
-	./$(TARGET) -regex 'a*b'
-	./$(TARGET) -regex 'ab*'
-	./$(TARGET) -regex '(ab)*'
-	./$(TARGET) -regex '(ab)*c'
-	./$(TARGET) -regex '(ab)c'
-	./$(TARGET) -regex '(a|b)c'
-	./$(TARGET) -regex 'a(bc)*d'
-	./$(TARGET) -regex 'abc*d'
-	./$(TARGET) -regex '(ab)c*d'
-	./$(TARGET) -regex 'a(b)c'
-	./$(TARGET) -regex '(a|b|c)d'
-	./$(TARGET) -regex '(a|b|c)*d'
-	./$(TARGET) -regex '[a]'
-	./$(TARGET) -regex '[ab]'
-	./$(TARGET) -regex '[a-z]'
-	./$(TARGET) -regex '[a-zA-Z]'
-	./$(TARGET) -regex '[a-zA-Z]*'
-	./$(TARGET) -regex 'a[a-zA-Z]*'
-	./$(TARGET) -regex 'a([a-z])'
-	./$(TARGET) -regex 'a|[a-z]'
-	./$(TARGET) -regex 'a|[a-z]*'
-	./$(TARGET) -regex 'a*|[a-z]'
-	./$(TARGET) -regex '[d-ga-c]'
-	./$(TARGET) -regex '[d-ga-d]'
-	./$(TARGET) -regex '[d-ga-e]'
-	./$(TARGET) -regex '[d-ga-f]'
-	./$(TARGET) -regex '[d-ga-h]'
-	./$(TARGET) -regex '[d-gd-e]'
-	./$(TARGET) -regex '[d-gd-f]'
-	./$(TARGET) -regex '[d-gd-h]'
-	./$(TARGET) -regex '[d-ge-f]'
-	./$(TARGET) -regex '[d-ge-g]'
-	./$(TARGET) -regex '[d-ge-i]'
-	./$(TARGET) -regex '[d-gg-i]'
-	./$(TARGET) -regex '[d-gh-i]'
-	./$(TARGET) -regex '[d-ga-cx-z]'
-	./$(TARGET) -regex '[d-ga-de-d]'
-	./$(TARGET) -regex '[d-ga-db-e]'
-	./$(TARGET) -regex '[d-gh-ja-e]'
+	./regexParser -regex 'a'
+	./regexParser -regex 'ab'
+	./regexParser -regex 'a*b'
+	./regexParser -regex 'ab*'
+	./regexParser -regex '(ab)*'
+	./regexParser -regex '(ab)*c'
+	./regexParser -regex '(ab)c'
+	./regexParser -regex '(a|b)c'
+	./regexParser -regex 'a(bc)*d'
+	./regexParser -regex 'abc*d'
+	./regexParser -regex '(ab)c*d'
+	./regexParser -regex 'a(b)c'
+	./regexParser -regex '(a|b|c)d'
+	./regexParser -regex '(a|b|c)*d'
+	./regexParser -regex '[a]'
+	./regexParser -regex '[ab]'
+	./regexParser -regex '[a-z]'
+	./regexParser -regex '[a-zA-Z]'
+	./regexParser -regex '[a-zA-Z]*'
+	./regexParser -regex 'a[a-zA-Z]*'
+	./regexParser -regex 'a([a-z])'
+	./regexParser -regex 'a|[a-z]'
+	./regexParser -regex 'a|[a-z]*'
+	./regexParser -regex 'a*|[a-z]'
+	./regexParser -regex '[d-ga-c]'
+	./regexParser -regex '[d-ga-d]'
+	./regexParser -regex '[d-ga-e]'
+	./regexParser -regex '[d-ga-f]'
+	./regexParser -regex '[d-ga-h]'
+	./regexParser -regex '[d-gd-e]'
+	./regexParser -regex '[d-gd-f]'
+	./regexParser -regex '[d-gd-h]'
+	./regexParser -regex '[d-ge-f]'
+	./regexParser -regex '[d-ge-g]'
+	./regexParser -regex '[d-ge-i]'
+	./regexParser -regex '[d-gg-i]'
+	./regexParser -regex '[d-gh-i]'
+	./regexParser -regex '[d-ga-cx-z]'
+	./regexParser -regex '[d-ga-de-d]'
+	./regexParser -regex '[d-ga-db-e]'
+	./regexParser -regex '[d-gh-ja-e]'
 
 merge_test:
-	./test/$(MERGE) -regex '[f-i]' -merge '[d-e]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[d-f]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[d-g]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[d-i]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[d-k]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[f-g]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[f-i]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[f-k]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[g-h]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[g-i]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[g-k]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[i-k]'
-	./test/$(MERGE) -regex '[f-i]' -merge '[j-k]'
-	./test/$(MERGE) -regex '[c-ef-i]' -merge '[d-e]'
-	./test/$(MERGE) -regex '[c-ef-i]' -merge '[d-f]'
-	./test/$(MERGE) -regex '[c-ef-i]' -merge '[d-g]'
-	./test/$(MERGE) -regex '[c-ef-i]' -merge '[d-i]'
-	./test/$(MERGE) -regex '[c-ef-ij-m]' -merge '[d-k]'
-	./test/$(MERGE) -regex '[f-ij-m]' -merge '[f-k]'
-	./test/$(MERGE) -regex '[f-ij-m]' -merge '[g-k]'
-	./test/$(MERGE) -regex '[f-ij-m]' -merge '[i-k]'
-	./test/$(MERGE) -regex '[f-ij-m]' -merge '[j-k]'
+	./test/ccMerge -regex '[f-i]' -regex 'e'
+	./test/ccMerge -regex '[f-i]' -regex 'f'
+	./test/ccMerge -regex '[f-i]' -regex 'g'
+	./test/ccMerge -regex '[f-i]' -regex 'i'
+	./test/ccMerge -regex '[f-i]' -regex 'j'
+	./test/ccMerge -regex 'e' -regex '[f-i]'
+	./test/ccMerge -regex 'f' -regex '[f-i]'
+	./test/ccMerge -regex 'g' -regex '[f-i]'
+	./test/ccMerge -regex 'i' -regex '[f-i]'
+	./test/ccMerge -regex 'j' -regex '[f-i]'
+	./test/ccMerge -regex '[f-i]' -regex '[d-e]'
+	./test/ccMerge -regex '[f-i]' -regex '[d-f]'
+	./test/ccMerge -regex '[f-i]' -regex '[d-g]'
+	./test/ccMerge -regex '[f-i]' -regex '[d-i]'
+	./test/ccMerge -regex '[f-i]' -regex '[d-k]'
+	./test/ccMerge -regex '[f-i]' -regex '[f-g]'
+	./test/ccMerge -regex '[f-i]' -regex '[f-i]'
+	./test/ccMerge -regex '[f-i]' -regex '[f-k]'
+	./test/ccMerge -regex '[f-i]' -regex '[g-h]'
+	./test/ccMerge -regex '[f-i]' -regex '[g-i]'
+	./test/ccMerge -regex '[f-i]' -regex '[g-k]'
+	./test/ccMerge -regex '[f-i]' -regex '[i-k]'
+	./test/ccMerge -regex '[f-i]' -regex '[j-k]'
+	./test/ccMerge -regex '[c-ef-i]' -regex '[d-e]'
+	./test/ccMerge -regex '[c-ef-i]' -regex '[d-f]'
+	./test/ccMerge -regex '[c-ef-i]' -regex '[d-g]'
+	./test/ccMerge -regex '[c-ef-i]' -regex '[d-i]'
+	./test/ccMerge -regex '[c-ef-ij-m]' -regex '[d-k]'
+	./test/ccMerge -regex '[f-ij-m]' -regex '[f-k]'
+	./test/ccMerge -regex '[f-ij-m]' -regex '[g-k]'
+	./test/ccMerge -regex '[f-ij-m]' -regex '[i-k]'
+	./test/ccMerge -regex '[f-ij-m]' -regex '[j-k]'