annotate regexParser/subsetConstraction.cc @ 167:3bf2c6d6d53e pairPro

move regexparser dir
author masa
date Sat, 19 Dec 2015 15:38:45 +0900
parents c/regexParser/subsetConstraction.cc@96854eba17e5
children 6b31d6ef9ba4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96
b807383bcc43 add createBitVectorList.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
1 #include <stdio.h>
b807383bcc43 add createBitVectorList.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
2 #include <stdlib.h>
101
2cc097419169 fix print
masasann
parents: 100
diff changeset
3 #include <ctype.h>
117
166136236891 add header files
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
4 #include "subsetConstraction.h"
96
b807383bcc43 add createBitVectorList.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
5
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
6 CharClassPtr createCharClassWord(unsigned char *w, CharClassPtr cc1, CharClassPtr cc2) {
146
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 144
diff changeset
7 CharClassPtr cc = NEW(CharClass);
154
1fad21fd6028 remove errors and warnings
masa
parents: 153
diff changeset
8 return cc;
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
9 }
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
10
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
11 CharClassPtr mergeCCTree(CharClassPtr cc,unsigned char mBegin,unsigned char mEnd,BitVector nextState) {
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
12 CharClassPtr cc1;
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
13 if (cc) {
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
14 cc1 = charClassMerge(cc,mBegin,mEnd,nextState);
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
15 } else {
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
16 cc1 = createCharClassRange(mBegin,mEnd,NULL,NULL);
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
17 cc1->nextState = nextState;
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
18 }
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
19 return cc1;
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
20 }
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
21
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
22 CharClassPtr charClassMerge(CharClassPtr cc,unsigned long begin, unsigned long end, BitVector nextState) {
143
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
23 // 重なっているccの領域を分割する
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
24 // 必要ならばnextStateを重ねあわせる
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
25 // 変更があった場合は新しくリストを作って返す
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
26 if (end < cc->cond.range.begin ) { // 1
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
27 if (cc->left) {
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
28 return createCharClassRange(cc->cond.range.begin,cc->cond.range.end,charClassMerge(cc->left,begin,end,nextState),cc->right);
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
29 } else {
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
30 CharClassPtr cc1 = createCharClassRange(begin,end,NULL,cc);
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
31 cc1->nextState = nextState;
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
32 return cc1;
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
33 }
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
34 } else if (end == cc->cond.range.begin && begin != end ) { // 2
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
35 CharClassPtr cc1 = mergeCCTree(cc->left,begin,end-1,nextState);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
36 if (cc->cond.range.begin == cc->cond.range.end) {
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
37 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,cc->cond.range.end,cc1,cc->right);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
38 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
39 return cc2;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
40 }
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
41 CharClassPtr cc3 = createCharClassRange(cc->cond.range.begin+1,cc->cond.range.end,cc->left,cc->right);
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
42 cc3->nextState = cc->nextState;
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
43 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,cc->cond.range.begin,cc1,cc3);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
44 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
45 return cc2;
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
46 } else if (end < cc->cond.range.end) { // range.begin < end
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
47 if (begin < cc->cond.range.begin) { // 3
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
48 CharClassPtr cc1 = mergeCCTree(cc->left,begin,cc->cond.range.begin-1,nextState);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
49 CharClassPtr cc3 = createCharClassRange(end+1,cc->cond.range.end,cc->left,cc->right);
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
50 cc3->nextState = cc->nextState;
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
51 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,end,cc1,cc3);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
52 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
53 return cc2;
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
54 }
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
55 if (begin == cc->cond.range.begin) { // 6
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
56 CharClassPtr cc2 = createCharClassRange(end+1,cc->cond.range.end,NULL,cc->right);
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
57 cc2->nextState = cc->nextState;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
58 CharClassPtr cc1 = createCharClassRange(begin,end,cc->left,cc2);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
59 cc1->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
60 return cc1;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
61 }
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
62 // 9
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
63 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,begin-1,cc->left,NULL);
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
64 cc2->nextState = cc->nextState;
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
65 CharClassPtr cc3 = createCharClassRange(end+1,cc->cond.range.end,NULL,cc->right);
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
66 cc3->nextState = cc->nextState;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
67 CharClassPtr cc1 = createCharClassRange(begin,end,cc2,cc3);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
68 cc1->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
69 return cc1;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
70 } else if (end == cc->cond.range.end) {
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
71 if (begin == cc->cond.range.begin) { // 7
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
72 CharClassPtr cc1 = createCharClassRange(begin,end,cc->left,cc->right);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
73 cc1->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
74 return cc1;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
75 } else if (begin < cc->cond.range.begin) { // 4
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
76 CharClassPtr cc1 = mergeCCTree(cc->left,begin,cc->cond.range.begin-1,nextState);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
77 CharClassPtr cc3 = createCharClassRange(cc->cond.range.begin,end,cc1,cc->right);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
78 cc3->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
79 return cc3;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
80 }
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
81 // 10 cond.range.begin < begin
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
82 CharClassPtr cc2 = createCharClassRange(begin,cc->cond.range.end,NULL,cc->right);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
83 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
84 CharClassPtr cc1 = createCharClassRange(cc->cond.range.begin,begin-1,cc->left,cc2);
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
85 cc1->nextState = cc->nextState;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
86 return cc1;
143
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
87 }
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
88 if (begin > cc->cond.range.end ) { // 13
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
89 if (cc->right) {
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
90 return createCharClassRange(cc->cond.range.begin,cc->cond.range.end,cc->left,charClassMerge(cc->right,begin,end,nextState));
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
91 } else {
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
92 CharClassPtr cc1 = createCharClassRange(begin,end,cc,NULL);
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
93 cc1->nextState = nextState;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
94 return cc1;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
95 }
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
96 }
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
97 if (begin >= cc->cond.range.begin && begin <= cc->cond.range.end) {
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
98 if (end > cc->cond.range.end) { // cond.range.end < end
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
99 if (begin == cc->cond.range.begin) { // 8
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
100 CharClassPtr cc1 = mergeCCTree(cc->right,cc->cond.range.end+1,end,nextState);
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
101 CharClassPtr cc3 = createCharClassRange(cc->cond.range.begin,cc->cond.range.end,cc->left,cc1);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
102 cc3->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
103 return cc3;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
104 }
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
105 if (begin > cc->cond.range.begin) { // 11
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
106 CharClassPtr cc1 = mergeCCTree(cc->right,cc->cond.range.end+1,end,nextState);
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
107 CharClassPtr cc3 = createCharClassRange(cc->cond.range.begin,begin-1,cc->left,NULL);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
108 cc3->nextState = cc->nextState;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
109 CharClassPtr cc2 = createCharClassRange(begin,cc->cond.range.end,cc3,cc1);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
110 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
111 return cc2;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
112 }
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
113 }
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
114 // begin != end && end != cc->cond.range.end
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
115 if (begin == cc->cond.range.end) { // 12
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
116 CharClassPtr cc1 = mergeCCTree(cc->right,begin+1,end,nextState);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
117 if (cc->cond.range.begin == cc->cond.range.end) {
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
118 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,cc->cond.range.end,cc1,cc->right);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
119 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
120 return cc2;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
121 }
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
122 CharClassPtr cc3 = createCharClassRange(cc->cond.range.begin,cc->cond.range.end-1,cc->left,NULL);
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
123 cc3->nextState = cc->nextState;
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
124 CharClassPtr cc2 = createCharClassRange(cc->cond.range.end,cc->cond.range.end,cc1,cc3);
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
125 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
155
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
126 return cc2;
6cd0141bed6c impl charClassMerge
masa
parents: 154
diff changeset
127 }
156
b5ecfc008bcf impl charClassMerge(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 155
diff changeset
128 } else if (begin < cc->cond.range.begin) { // 5
166
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
129 CharClassPtr cc1 = mergeCCTree(cc->left,begin,cc->cond.range.begin-1,nextState);
96854eba17e5 implement mergeCCTree()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 163
diff changeset
130 CharClassPtr cc3 = mergeCCTree(cc->right,cc->cond.range.end+1,end,nextState);
163
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
131 CharClassPtr cc2 = createCharClassRange(cc->cond.range.begin,cc->cond.range.end,cc1,cc3);
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
132 cc2->nextState.bitContainer = cc->nextState.bitContainer | nextState.bitContainer;
f0a347cd9c6a fix subsetconstraction.cc
masa
parents: 157
diff changeset
133 return cc2;
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
134 } else {
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
135 printf("charClassMerge Error : begin %lu end %lu cc->begin %lu cc->end %lu\n", begin,end,cc->cond.range.begin,cc->cond.range.end);
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
136 }
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 148
diff changeset
137 return cc;
143
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
138 }
32977f5a2ed0 add charClassMerge
masa
parents: 142
diff changeset
139
142
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
140 TGValue generateTransition(NodePtr n,TransitionGenerator tg) {
154
1fad21fd6028 remove errors and warnings
masa
parents: 153
diff changeset
141 TGValue tgv2;
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
142 if (n->tokenType == '+') {
142
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
143 TGValue tgv = generateTransition(n->left,tg);
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
144 if (tgv.asterisk) {
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
145 TGValue tgv1 = generateTransition(n->right,tg);
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
146 tgv.ts->nextState->bitContainer |= tgv1.ts->nextState->bitContainer;
142
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
147 return tgv;
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
148 }
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
149 TGValue tgv1 = generateTransition(n->right,tg);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
150 tgv.ts->nextState = tgv1.ts->nextState;
142
de0f332d560c insert charClassMerge function
masa
parents: 141
diff changeset
151 return tgv;
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
152 } else if (n->tokenType == '|') {
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
153 TGValue tgv = generateTransition(n->left,tg);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
154 TGValue tgv1 = generateTransition(n->right,tg);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
155 tgv.ts = appendTransition(tgv.ts,tgv1.ts);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
156 return tgv;
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
157 } else if (n->tokenType == '*') {
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
158 TGValue tgv = generateTransition(n->left,tg);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
159 tgv.asterisk = true;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
160 return tgv;
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
161 } else if (n->tokenType == 'c'){
154
1fad21fd6028 remove errors and warnings
masa
parents: 153
diff changeset
162 return tgv2;
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
163 } else if (n->tokenType == 'a'){
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
164 TGValue tgv;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
165 tgv.ts = (TransitionPtr)malloc(sizeof(Transition));
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
166 tgv.ts->condition = n->cc;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
167 tgv.ts->nextState = (BitVectorPtr)malloc(sizeof(BitVector));
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
168 bitSet(tgv.ts->nextState,n->nodeNumber);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
169 tg.ts = appendTransition(tg.ts,tgv.ts);
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
170 return tgv;
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
171 } else {
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
172 // error
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
173 }
154
1fad21fd6028 remove errors and warnings
masa
parents: 153
diff changeset
174 return tgv2;
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
175 }
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
176
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
177 void printTransitionList(TransitionPtr ts) {
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
178 for (;ts;ts = ts->next) {
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
179 printf("\n");
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
180 }
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
181 }
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
182
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
183 TransitionGenerator generateTransitionList(NodePtr n) {
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
184 TransitionGenerator tg;
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
185 tg.ts = (TransitionPtr)malloc(sizeof(Transition));
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
186 generateTransition(n,tg);
153
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 152
diff changeset
187 printTransitionList(tg.ts);
141
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
188 return tg;
71f36a59cf6a add appendState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
189 }