Mercurial > hg > Applications > Grep

annotate regexParser/regexParser.cc @ 187:ef798db705e9 pairPro

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove some warnings and errors(not working)
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Thu, 24 Dec 2015 22:38:50 +0900
parents d25f4f3b4c34
children 109d22faf7b5
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
187
ef798db705e9 remove some warnings and errors(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 185
diff changeset
28 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
29 NodePtr n = allocateNode();
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
30 n->tokenType = type;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
31 n->cc = cc;
183
7ae0a3070647 implement generateTransitionList
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 180
diff changeset
32 n->state = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
33 n->left = left;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
34 n->right = right;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
35 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
36 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
37
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
38 CharClassPtr createCharClassWord(RegexInfoPtr ri) {
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
39 CharClassPtr cc = NEW(CharClass);
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
40 cc->type = 'a';
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
41 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
42 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
43 cc->cond.range.begin = cc->cond.range.end = *ri->tokenValue;
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
44 return cc;
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
45 }
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
46
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
47 /*
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
48 cond.range.begin cond.range.end
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
49 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
50 1.b---e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
51 2.b------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
52 3.b------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
53 4.b-----------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
54 5.b----------------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
55
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 6. b---------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
58 7. b----------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
59 8. b---------------------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
60
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
61 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
62 9. b-----e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
63 10. b--------e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
64 11. b-------------e
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 |----------------|
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
67 12. b-----e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
68
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 13. b--e
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
71
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
72 */
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
73 CharClassPtr insertCharClass(CharClassPtr cc, unsigned long begin, unsigned long end) {
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
74 if (cc == NULL) {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
75 createCharClassRange(begin,end,0,0);
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
76 }
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
77 if (end < cc->cond.range.begin ) { // 1
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
78 if (cc->left) {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
79 cc->left = insertCharClass(cc->left,begin,end);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
80 } else {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
81 cc->left = createCharClassRange(begin,end,0,0);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
82 }
152
1c9e8ba64f6a add implement charclassMerge (not working)
masa
parents: 151
diff changeset
83 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
84 } else if (end == cc->cond.range.begin ) { // 2
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
85 cc->cond.range.begin = begin;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
86 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
87 } 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
88 if (begin < cc->cond.range.begin) { // 3,4
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
89 cc->cond.range.begin = begin;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
90 }
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
91 return cc;
149
f1880f25fabf add insertCharClass images
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 148
diff changeset
92 } else if (begin > cc->cond.range.end ) { // 13
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
93 if (cc->right) {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
94 cc->right = insertCharClass(cc->right,begin,end);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
95 } else {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
96 cc->right = createCharClassRange(begin,end,0,0);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
97 }
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
98 return cc;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
99 }
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
100 if (cc->right) {
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
101 CharClassPtr right = cc->right;
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
102 begin = cc->cond.range.begin;
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
103 free(cc);
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
104 return insertCharClass(right,begin,end);
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
105 }
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
106 if (begin >= cc->cond.range.begin && begin <= cc->cond.range.end) { // 12
151
6ba059ce9109 test file
Nozomi
parents: 150
diff changeset
107 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
108 } else if (begin < cc->cond.range.begin) { // 5
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
109 cc->cond.range.begin = begin;
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
110 cc->cond.range.end = end;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
111 } else {
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
112 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
113 }
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
114 return cc;
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
115 }
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
116
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
117 // <charClass> ::= '['<literal>'-'<literal>']'
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
118 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
119 NodePtr charClass(RegexInfoPtr ri) {
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
120 CharClassPtr cc = NEW(CharClass);
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
121 NodePtr n = createNode(ri,'c',cc,0,0);
126
639b0b437ebf remove error (do not work)
masa
parents: 125
diff changeset
122 cc->type = 'r';
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
123 cc->nextState.bitContainer = 0;
148
d1ebba6e117a add test routing
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 147
diff changeset
124 cc->left = NULL;
d1ebba6e117a add test routing
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 147
diff changeset
125 cc->right = NULL;
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
126 RangeListPtr rangeList = &cc->cond.range;
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
127 rangeList->begin = *ri->ptr;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
128 rangeList->end = *ri->ptr;
145
50217a0545e8 fix charClass()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 144
diff changeset
129 rangeList->next = NULL;
130
7925e9abb078 add or flag
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 129
diff changeset
130
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
131 for (ri->ptr++; *ri->ptr && *ri->ptr != ']'; ri->ptr++) {
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
132 if (*ri->ptr == '-') {
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
133 rangeList->end = *(ri->ptr + 1);
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
134 ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
135 continue;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
136 }
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
137 if (ri->ptr[0] == 0 || ri->ptr[0] == ']') break;
126
639b0b437ebf remove error (do not work)
masa
parents: 125
diff changeset
138 rangeList->next = NEW(RangeList);
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
139 rangeList = rangeList->next;
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
140 rangeList->begin = *ri->ptr;
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
141 rangeList->end = *ri->ptr;
125
4d6ac69801ad fix createNode
Nozomi
parents: 122
diff changeset
142 rangeList->next = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
143 }
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
144
150
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
145 RangeListPtr r = cc->cond.range.next;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
146 cc->cond.range.next = 0;
a4940a8dd263 implement insertCharClass
masa
parents: 149
diff changeset
147 for (; r; r = r->next) {
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
148 cc = insertCharClass(cc, r->begin, r->end);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
149 }
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
150
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
151 // TODO literal support
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
152 // merge rangeList here
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
153 if (*ri->ptr) ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
154 token(ri);
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
155 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
156 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
157
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
158 // <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
159 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
160 NodePtr literal(RegexInfoPtr ri) {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
161 CharClassPtr cc = createCharClassWord(ri);
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 143
diff changeset
162 token(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
163 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
164 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
165 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
166
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
167 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
168 void token(RegexInfoPtr ri) {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
169 while (ri->ptr[0] != '\0') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
170 if (ri->ptr[0] == '('){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
171 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
172 ri->tokenType = '(';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
173 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
174 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
175 } else if (ri->ptr[0] == ')') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
176 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
177 ri->tokenType = ')';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
178 ri->tokenValue = ri->ptr;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
179 return;
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
180 } else if (ri->ptr[0] == ']') {
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
181 ri->ptr++;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
182 ri->tokenType = ']';
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
183 ri->tokenValue = ri->ptr;
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
184 return;
82
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 = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
189 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
190 } else if (ri->ptr[0] == '*'){
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
191 ri->ptr++;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
192 ri->tokenType = '*';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
193 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
194 return;
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 // need more proccesing
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
197 /*
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
198 \277
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
199 \0xa5
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
200 \[
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
201 \\
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
202 \utf-8 etc...
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
203 */
142
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
204 } else if (ri->ptr[0] == '[') {
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
205 ri->ptr++;
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
206 ri->tokenType = 'c';
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
207 ri->tokenValue = ri->ptr;
de0f332d560c insert charClassMerge function
masa
parents: 136
diff changeset
208 return;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
209 } else {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
210 ri->tokenType = 'a';
118
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
211 ri->tokenValue = ri->ptr;
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
212 if (isalnum(ri->ptr[0])) {
122
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
213 ri->ptr++;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 121
diff changeset
214 }
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
215 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
216 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
217 }
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
218 ri->tokenType = 0;
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
219 ri->tokenValue = NULL;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
220 return;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
221 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
222
130
7925e9abb078 add or flag
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 129
diff changeset
223 // <regexAtom> ::= <literal>|<charClass>|<group>
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 108
diff changeset
224 static
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
225 NodePtr regexAtom(RegexInfoPtr ri) {
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 NodePtr n = NULL;
124
masa
parents: 122
diff changeset
228 if (ri->tokenType == 'c') n = charClass(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
229 else if (ri->tokenType == 'a') n = literal(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
230 else if (ri->tokenType == '(') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
231 n = regex(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
232 if (ri->tokenType != ')') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
233 // error
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
234 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
235 token(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
236 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
237 if (ri->tokenType == '*') {
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
238 n = createNode(ri,'*',0,n,0);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
239 token(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
240 }
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
241 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
242 }
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
243
178
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
244 RegexInfoPtr createRegexInfo (RegexInfoPtr ri) {
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
245 ri->stateNumber++;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
246 return ri;
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
247 }
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
248
5e8c6857934c implement charClassMerge
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 175
diff changeset
249
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
250 // <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
251 NodePtr regex(RegexInfoPtr ri) {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
252 token(ri);
128
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 127
diff changeset
253 NodePtr n = regexAtom(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
254 while (ri->tokenType) {
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
255 if (ri->tokenType == '*') {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
256 n = createNode(ri,'*',0,n,0);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
257 token(ri);
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
258 return n;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
259 } else if (ri->tokenType == '|') {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
260 n = createNode(ri,'|',0,n,0);
133
ccc673449351 Look ahead '*'
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 132
diff changeset
261 NodePtr n1 = regex(ri);
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
262 n->right = n1;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
263 } else if (ri->tokenType == ')') {
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
264 return n;
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
265 } else {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
266 n = createNode(ri,'+',0,n,0);
180
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
267 NodePtr n1 = regexAtom(ri);
d97bcab546e8 implement getNext
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 179
diff changeset
268 n->right = n1;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
269 }
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
270 }
dbafc753078e fix concatination & selection & grouping
masa
parents: 133
diff changeset
271 return n;
82
1d9bbf922bb6 add createRegexTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
272 }