# HG changeset patch
# User Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
# Date 1451210225 -32400
# Node ID 959f8c00da174e1a18b55814a10e0c6fbff3f851
# Parent  2ec95755238ed1e16da309e433ccc3cb072551eb
fix charClassStackPop()

diff -r 2ec95755238e -r 959f8c00da17 regexParser/Makefile
--- a/regexParser/Makefile	Sun Dec 27 18:46:08 2015 +0900
+++ b/regexParser/Makefile	Sun Dec 27 18:57:05 2015 +0900
@@ -33,7 +33,7 @@
 
 .SUFFIXES: .cc .o
 
-test1:
+test1: regexParser
 	./regexParser -regex 'a'
 	./regexParser -regex 'ab'
 	./regexParser -regex 'a*b'
@@ -76,7 +76,7 @@
 	./regexParser -regex '[d-ga-db-e]'
 	./regexParser -regex '[d-gh-ja-e]'
 
-merge_test:
+merge_test: test/ccMerge
 	./test/ccMerge -regex '[f-i]' -regex 'e'
 	./test/ccMerge -regex '[f-i]' -regex 'f'
 	./test/ccMerge -regex '[f-i]' -regex 'g'
diff -r 2ec95755238e -r 959f8c00da17 regexParser/subsetConstraction.cc
--- a/regexParser/subsetConstraction.cc	Sun Dec 27 18:46:08 2015 +0900
+++ b/regexParser/subsetConstraction.cc	Sun Dec 27 18:57:05 2015 +0900
@@ -142,9 +142,9 @@
 
 CharClassStackPtr charClassStackPop(CharClassWalkerPtr walk) {
     CharClassStackPtr prev = walk->stack->next;
+    walk->turn = walk->stack->turn;
     free(walk->stack);
     walk->stack = prev;
-    walk->turn = prev->turn;
     return prev;
 }