Mercurial > hg > Applications > Grep

annotate regexParser/regexParser.cc @ 178:5e8c6857934c pairPro

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement charClassMerge
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Wed, 23 Dec 2015 19:17:36 +0900
parents 3be0fbcd4b52
children 6cf8252f3912
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
1 #include <stdlib.h>
89
50a146c05192 add NodeNumber in Regex Parser tree
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 87
diff changeset
2 #include <stdio.h>
122
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
3 #include <string.h>
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
4 #include <ctype.h>
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
5 #include "regexParser.h"
115
ca30f8334741 rename createRegexParser.cc to regexParser.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 112
diff changeset
6
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
7 static NodePtr charClass(RegexInfoPtr);
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
8 static void token(RegexInfoPtr);
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
9 static NodePtr regexAtom(RegexInfoPtr);
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
10 NodePtr regex(RegexInfoPtr);
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
11
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
12 /**
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
13 * Create a node of regex parse tree.
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
14 * tokenType
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
15 * regexPosition(state)
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
16 * stateTransitionTable
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
17 */
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
18
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
19 static
116
66c633575b53 remove error and warning
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 115
diff changeset
20 NodePtr allocateNode() {
129
b930be74a16e remove word.h
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 128
diff changeset
21 NodePtr n = NEW(Node);
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
22 n->cc = NULL;
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
23 n->left = NULL;
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
24 n->right = NULL;
116
66c633575b53 remove error and warning
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 115
diff changeset
25 return n;
66c633575b53 remove error and warning
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 115
diff changeset
26 }
66c633575b53 remove error and warning
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 115
diff changeset
27
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
28 static
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
29 NodePtr createNode(RegexInfoPtr ri,unsigned char type,CharClassPtr cc, NodePtr left, NodePtr right) {
116
66c633575b53 remove error and warning
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 115
diff changeset
30 NodePtr n = allocateNode();
108
70069d4647a0 implement malloc error checking
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 104
diff changeset
31
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
32 n->tokenType = type;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
33 n->cc = cc;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
34 n->left = left;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
35 n->right = right;
174
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
36 if (n->tokenType == 'a' || n->tokenType == 'c') {
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
37 n->nodeNumber = ri->nodeNumber;
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
38 ri->nodeNumber++;
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
39 } else {
175
3be0fbcd4b52 implement createTransitionGenerator
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 174
diff changeset
40 n->nodeNumber = SYNTAX_NODENUMBER;
174
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
41 }
89
50a146c05192 add NodeNumber in Regex Parser tree
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 87
diff changeset
42
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
43 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
44 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
45
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
46 CharClassPtr createCharClassWord(RegexInfoPtr ri) {
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
47 CharClassPtr cc = NEW(CharClass);
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
48 cc->type = 'a';
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
49 cc->cond.w.word = ri->tokenValue;
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
50 cc->cond.w.length = ri->ptr - ri->tokenValue;
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
51 cc->cond.range.begin = cc->cond.range.end = *ri->tokenValue;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
52 cc->nextState = ri->current->bitSet;
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
53 return cc;
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
54 }
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
55
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
56 /*
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
57 cond.range.begin cond.range.end
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
58 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
59 1.b---e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
60 2.b------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
61 3.b------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
62 4.b-----------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
63 5.b----------------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
64
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
65 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
66 6. b---------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
67 7. b----------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
68 8. b---------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
69
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
70 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
71 9. b-----e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
72 10. b--------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
73 11. b-------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
74
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
75 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
76 12. b-----e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
77
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
78 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
79 13. b--e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
80
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
81 */
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
82 CharClassPtr insertCharClass(CharClassPtr cc, unsigned long begin, unsigned long end,BitVector nextState) {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
83 if (cc == NULL) {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
84 createCharClassRange(begin,end,nextState.bitContainer,0,0);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
85 }
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
86 if (end < cc->cond.range.begin ) { // 1
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
87 if (cc->left) {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
88 cc->left = insertCharClass(cc->left,begin,end,nextState);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
89 } else {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
90 cc->left = createCharClassRange(begin,end,nextState.bitContainer,0,0);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
91 }
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 151
diff changeset
92 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
93 } else if (end == cc->cond.range.begin ) { // 2
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
94 cc->cond.range.begin = begin;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
95 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
96 } else if (end <= cc->cond.range.end) { // 3,4,6,7,9,10
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
97 if (begin < cc->cond.range.begin) { // 3,4
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
98 cc->cond.range.begin = begin;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
99 }
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
100 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
101 } else if (begin > cc->cond.range.end ) { // 13
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
102 if (cc->right) {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
103 cc->right = insertCharClass(cc->right,begin,end,nextState);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
104 } else {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
105 cc->right = createCharClassRange(begin,end,nextState.bitContainer,0,0);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
106 }
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
107 return cc;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
108 }
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
109 if (cc->right) {
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
110 CharClassPtr right = cc->right;
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
111 begin = cc->cond.range.begin;
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
112 free(cc);
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
113 return insertCharClass(right,begin,end,nextState);
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
114 }
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
115 if (begin >= cc->cond.range.begin && begin <= cc->cond.range.end) { // 12
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
116 if (end > cc->cond.range.end) cc->cond.range.end = end; // 11,8
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
117 } else if (begin < cc->cond.range.begin) { // 5
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
118 cc->cond.range.begin = begin;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
119 cc->cond.range.end = end;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
120 } else {
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
121 printf("insertCharClass Error : begin %lu end %lu cc->begin %lu cc->end %lu\n", begin,end,cc->cond.range.begin,cc->cond.range.end);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
122 }
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
123 return cc;
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
124 }
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
125
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
126 // <charClass> ::= '['<literal>'-'<literal>']'
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
127 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
128 NodePtr charClass(RegexInfoPtr ri) {
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
129 CharClassPtr cc = NEW(CharClass);
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
130 NodePtr n = createNode(ri,'c',cc,0,0);
126
639b0b437ebf remove error (do not work)
masa
parents: 125
diff changeset
131 cc->type = 'r';
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
132 cc->nextState.bitContainer = 0;
148
d1ebba6e117a add test routing
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 147
diff changeset
133 cc->left = NULL;
d1ebba6e117a add test routing
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 147
diff changeset
134 cc->right = NULL;
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
135 RangeListPtr rangeList = &cc->cond.range;
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
136 rangeList->begin = *ri->ptr;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
137 rangeList->end = *ri->ptr;
145
50217a0545e8 fix charClass()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 144
diff changeset
138 rangeList->next = NULL;
130
7925e9abb078 add or flag
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 129
diff changeset
139
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
140 for (ri->ptr++; *ri->ptr && *ri->ptr != ']'; ri->ptr++) {
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
141 if (*ri->ptr == '-') {
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
142 rangeList->end = *(ri->ptr + 1);
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
143 ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
144 continue;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
145 }
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
146 if (ri->ptr[0] == 0 || ri->ptr[0] == ']') break;
126
639b0b437ebf remove error (do not work)
masa
parents: 125
diff changeset
147 rangeList->next = NEW(RangeList);
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
148 rangeList = rangeList->next;
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
149 rangeList->begin = *ri->ptr;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
150 rangeList->end = *ri->ptr;
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
151 rangeList->next = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
152 }
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
153
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
154 RangeListPtr r = cc->cond.range.next;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
155 cc->cond.range.next = 0;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
156 for (; r; r = r->next) {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
157 cc = insertCharClass(cc, r->begin, r->end,ri->current->bitState);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
158 }
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
159
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
160 n->cc = ri->current->cc = mergeTransition(ri->current,cc);
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
161 // TODO literal support
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
162 // merge rangeList here
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
163 if (*ri->ptr) ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
164 token(ri);
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
165 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
166 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
167
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
168 // <literal> ::= [a-z][A-Z][0-9]
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
169 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
170 NodePtr literal(RegexInfoPtr ri) {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
171 CharClassPtr cc = createCharClassWord(ri);
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
172 token(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
173 NodePtr n = createNode(ri,'a',cc,0,0);
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
174 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
175 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
176
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
177 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
178 void token(RegexInfoPtr ri) {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
179 while (ri->ptr[0] != '\0') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
180 if (ri->ptr[0] == '('){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
181 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
182 ri->tokenType = '(';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
183 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
184 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
185 } else if (ri->ptr[0] == ')') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
186 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
187 ri->tokenType = ')';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
188 ri->tokenValue = ri->ptr;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
189 return;
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
190 } else if (ri->ptr[0] == ']') {
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
191 ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
192 ri->tokenType = ']';
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
193 ri->tokenValue = ri->ptr;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
194 return;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
195 } else if (ri->ptr[0] == '|'){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
196 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
197 ri->tokenType = '|';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
198 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
199 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
200 } else if (ri->ptr[0] == '*'){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
201 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
202 ri->tokenType = '*';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
203 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
204 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
205 } else if (ri->ptr[0] == '\\'){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
206 // need more proccesing
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
207 /*
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
208 \277
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
209 \0xa5
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
210 \[
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
211 \\
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
212 \utf-8 etc...
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
213 */
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
214 } else if (ri->ptr[0] == '[') {
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
215 ri->ptr++;
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
216 ri->tokenType = 'c';
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
217 ri->tokenValue = ri->ptr;
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
218 return;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
219 } else {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
220 ri->tokenType = 'a';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
221 ri->tokenValue = ri->ptr;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
222 if (isalnum(ri->ptr[0])) {
122
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
223 ri->ptr++;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
224 }
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
225 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
226 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
227 }
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
228 ri->tokenType = 0;
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
229 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
230 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
231 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
232
130
7925e9abb078 add or flag
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 129
diff changeset
233 // <regexAtom> ::= <literal>|<charClass>|<group>
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
234 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
235 NodePtr regexAtom(RegexInfoPtr ri) {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
236
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
237 NodePtr n = NULL;
124
masa
parents: 122
diff changeset
238 if (ri->tokenType == 'c') n = charClass(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
239 else if (ri->tokenType == 'a') n = literal(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
240 else if (ri->tokenType == '(') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
241 n = regex(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
242 if (ri->tokenType != ')') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
243 // error
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
244 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
245 token(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
246 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
247 if (ri->tokenType == '*') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
248 n = createNode(ri,'*',0,n,0);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
249 token(ri);
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
250 ri->asterisk = true;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
251 ri->node = n;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
252 }
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
253 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
254 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
255
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
256 RegexInfoPtr createRegexInfo (RegexInfoPtr ri) {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
257 ri->stateNumber++;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
258 ri->asterisk = false;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
259 ri->current = NEW(State);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
260 ri->current->bitState.bitContainer = 0
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
261 bitSet(ri.current->bitState,ri->stateNumber);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
262 ri->current->next = ri->states;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
263 ri->current->cc = NULL;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
264 ri->current->node = NULL;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
265 ri->states = ri->current;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
266 return ri;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
267 }
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
268
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
269
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
270 // <regex> ::= <regexAtom> | <regexAtom>'*'<regex> | <regexAtom>'|'<regex> | <regexAtom><regexAtom>'*' | <regexAtom><regex>
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
271 NodePtr regex(RegexInfoPtr ri) {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
272 token(ri);
128
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 127
diff changeset
273 NodePtr n = regexAtom(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
274 while (ri->tokenType) {
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
275 if (ri->tokenType == '*') {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
276 n = createNode(ri,'*',0,n,0);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
277 token(ri);
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
278 ri->asterisk = true;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
279 ri->node = n;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
280 return n;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
281 } else if (ri->tokenType == '|') {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
282 n = createNode(ri,'|',0,n,0);
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
283 NodePtr n1 = regex(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
284 n->right = n1;
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
285 n->node = n;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
286 } else if (ri->tokenType == ')') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
287 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
288 } else {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
289 n = createNode(ri,'+',0,n,0);
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
290 if (!ri->asterisk) {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
291 StatePtr save = ri->current;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
292 ri = createRegexInfo(ri);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
293 NodePtr n1 = regexAtom(ri);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
294 n->right = n1;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
295 ri->current = save;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
296 } else {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
297 NodePtr n1 = regexAtom(ri);
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
298 n->right = n1;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
299 }
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
300 }
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
301 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
302 return n;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
303 }