annotate regexParser/node.cc @ 300:3e78631a6222

remove ragne list
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 03 Feb 2016 13:56:01 +0900
parents a9e3512120e2
children 058c87665213
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
79
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
1 #include <stdio.h>
190
3e8e5780ad4a change node::State to State
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 187
diff changeset
2 #include "regexParser.h"
117
166136236891 add header files
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 116
diff changeset
3 #include "node.h"
112
ec485345daf9 some function use static
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 110
diff changeset
4
190
3e8e5780ad4a change node::State to State
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 187
diff changeset
5 void printCharacterClass(CharClassPtr cc, long nodeNumber,int d) {
192
ecf70fb215a5 print charclass
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 190
diff changeset
6 if (!cc) return;
205
b7b8f0c03fe3 add test/ccMerge.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 195
diff changeset
7 if (cc->type == 'a' || cc->type == 'r') {
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
8 if (cc->left) {
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
9 printCharacterClass(cc->left,nodeNumber,d+1);
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
10 }
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
11 printf("%*c",d*4, ' ');
300
3e78631a6222 remove ragne list
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 217
diff changeset
12 RangeList range = cc->cond.range;
3e78631a6222 remove ragne list
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 217
diff changeset
13 printf("[%c-%c] ",(unsigned char)range.begin,(unsigned char)range.end);
214
a94f57af1600 remove allocateCCstate createCCState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 212
diff changeset
14 printf("(%lx)\n",cc->nextState.bitContainer);
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
15 if (cc->right) {
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
16 printCharacterClass(cc->right,nodeNumber,d+1);
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
17 }
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
18 }
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
19 }
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
20
190
3e8e5780ad4a change node::State to State
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 187
diff changeset
21 void descendTree(NodePtr n, int d) {
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 131
diff changeset
22 if (n->left != NULL) {
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
23 descendTree(n->left, d+1);
79
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
24 }
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
25 if (n->tokenType == 'a') {
131
a436526756b9 fix printTree
masa
parents: 130
diff changeset
26 printf("%*c",d*4, ' ');
144
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
27 for (int i = 0; i < n->cc->cond.w.length; i++) {
d8a4922eceae remove some errors (not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 139
diff changeset
28 putchar(n->cc->cond.w.word[i]);
131
a436526756b9 fix printTree
masa
parents: 130
diff changeset
29 }
217
a9e3512120e2 NFA generation end
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 216
diff changeset
30 if (n->state && n->nextState) {
216
4852bfa85db4 spell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 214
diff changeset
31 printf("(%ld)->(%ld)\n",n->state->bitState.bitContainer,n->nextState->bitState.bitContainer);
217
a9e3512120e2 NFA generation end
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 216
diff changeset
32 } else if (n->state) {
a9e3512120e2 NFA generation end
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 216
diff changeset
33 printf("(%ld)\n",n->state->bitState.bitContainer);
216
4852bfa85db4 spell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 214
diff changeset
34 } else {
4852bfa85db4 spell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 214
diff changeset
35 printf("\n");
214
a94f57af1600 remove allocateCCstate createCCState
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 212
diff changeset
36 }
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
37 } else if (n->tokenType == 'c') {
187
ef798db705e9 remove some warnings and errors(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 174
diff changeset
38 printCharacterClass(n->cc,n->stateNum,d);
174
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 if (n->tokenType == 'a') {
187
ef798db705e9 remove some warnings and errors(not working)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 174
diff changeset
40 printf("%*c%c(%d)\n",d*4, ' ',n->tokenType,n->stateNum);
135
e1a262ec75f0 impl charclass
masa
parents: 134
diff changeset
41 } else {
174
b9e913030a47 allocate nodeNumber to character and cclist (not allocate nodenumber '+' '*' '|')
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 167
diff changeset
42 printf("%*c%c\n",d*4, ' ',n->tokenType);
130
7925e9abb078 add or flag
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 120
diff changeset
43 }
89
50a146c05192 add NodeNumber in Regex Parser tree
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 79
diff changeset
44
134
dbafc753078e fix concatination & selection & grouping
masa
parents: 131
diff changeset
45 if (n->right != NULL) {
147
84d32375383a implement insertCharClass
masa
parents: 145
diff changeset
46 descendTree(n->right, d+1);
79
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
47 }
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
48 }
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
49
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
50 void printTree(NodePtr n) {
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
51 puts("---Print Node----");
90
d139af3bbd67 remove static variable in printTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 89
diff changeset
52 int d = 0;
d139af3bbd67 remove static variable in printTree.cc
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 89
diff changeset
53 descendTree(n,d);
79
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
54 puts("-----------------");
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
55 }