annotate c/regexParser/main.cc @ 79:52da06c3f050

add printTree.cc & fix Makefile
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Tue, 29 Sep 2015 18:36:31 +0900
parents 7f53a587bf97
children 0a452d69f0e2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
1 /*
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
2 * <literal> ::= [a-z][A-Z][0-9]
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
3 * <charClass> ::= '['<literal>'-'<literal>']'
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
4 * <group> ::= '('<regex>')'
66
f8fb3b463f70 fix when '|' come procces
Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
parents: 65
diff changeset
5 * <regexAtom> ::= <literal>|<charClass>|<group>
f8fb3b463f70 fix when '|' come procces
Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
parents: 65
diff changeset
6 * <regex> ::= <regexAtom>|<regexAtom>'*'|<regexAtom>'|'<regex>|<regexAtom><regex>
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
7 */
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
8
45
89a198fa6b23 add dfrTobin
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
9 #include <stdio.h>
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
10 #include <stdlib.h>
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
11 #include <string.h>
77
7f53a587bf97 add regexParser.h
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 76
diff changeset
12 #include "regexParser.h"
76
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
13
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
14 unsigned char *ptr;
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
15 unsigned char tokenType;
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
16 int tokenValue;
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
17
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
18 NodePtr charClass();
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
19 NodePtr group();
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
20 NodePtr regex();
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
21 NodePtr createNode(unsigned char,NodePtr,NodePtr);
76
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
22 void token();
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
23 NodePtr regexAtom();
79
52da06c3f050 add printTree.cc & fix Makefile
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 77
diff changeset
24 extern void printTree(NodePtr);
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
25
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
26
62
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
27 bool isLiteral(char c) {
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
28 if (*ptr > 0x7f) return true;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
29 else if (*ptr == '(') return false;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
30 else if (*ptr == '[') return false;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
31 else if (*ptr == '|') return false;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
32 else if (*ptr == '*') return false;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
33 return true;
62
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
34 }
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
35
76
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
36 /**
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
37 * Create a node of regex parse tree.
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
38 * tokenType
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
39 * regexPosition(state)
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
40 * stateTransitionTable
d98a036441e2 add createNode comment
masa
parents: 75
diff changeset
41 */
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
42 NodePtr createNode(unsigned char character, NodePtr left, NodePtr right) {
57
71b497d25273 fix literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 56
diff changeset
43 NodePtr n = (NodePtr)malloc(sizeof(Node));
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
44 n->self = n;
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
45 n->Value.character = character;
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
46 n->left = left;
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
47 n->right = right;
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
48 return n;
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
49 }
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
50
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
51 // <charClass> ::= '['<literal>'-'<literal>']'
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
52 NodePtr charClass() {
62
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
53 NodePtr n = (NodePtr)malloc(sizeof(Node));
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
54 unsigned char startChar = *ptr;
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
55 while (*ptr == '-') {
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
56 ptr++;
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
57 }
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
58 unsigned char endChar = *ptr;
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
59 unsigned char *charTable = (unsigned char*)malloc(sizeof(char)*256);
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
60
62
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
61 return n;
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
62 }
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
63
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
64 // <literal> ::= [a-z][A-Z][0-9]
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
65 NodePtr literal() {
65
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 64
diff changeset
66 NodePtr n = createNode(*ptr,0,0);
57
71b497d25273 fix literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 56
diff changeset
67 ptr++;
71b497d25273 fix literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 56
diff changeset
68 return n;
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
69 }
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
70
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
71 // <group> ::= '('<regex>')'
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
72 NodePtr group() {
75
6541eae41a73 fix group function
masa
parents: 74
diff changeset
73 return regex();
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
74 }
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
75
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
76
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
77
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
78 void token() {
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
79 while (*ptr != '\0') {
74
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
80 if (*ptr == '('){
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
81 ptr++;
70
87dff3a124ab resolve segmentation fault(But not correct performance)
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 69
diff changeset
82 tokenType = '(';
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
83 tokenValue = 0;
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
84 if (ptr[1] == ')') {
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
85 ptr++;
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
86 }
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
87 return;
74
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
88 } else if (*ptr == ')') {
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
89 ptr++;
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
90 tokenType = ')';
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
91 tokenValue = *ptr;
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
92 return;
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
93 } else if (*ptr == '[') {
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
94 ptr++;
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
95 tokenType = '[';
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
96 tokenValue = *ptr;
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
97 if (ptr[1] == ']') {
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
98 ptr++;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
99 }
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
100 return;
58
4053c3e0fa7f implement group()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 57
diff changeset
101 } else if (*ptr == '|'){
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
102 ptr++;
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
103 tokenType = '|';
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
104 tokenValue = 0;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
105 return;
60
8616a045a7f4 impl asterisk
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 59
diff changeset
106 } else if (*ptr == '*'){
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
107 ptr++;
63
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
108 tokenType = '*';
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
109 tokenValue = 0;
8fd3d35e9861 add token function
masa
parents: 62
diff changeset
110 return;
73
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
111 } else if (*ptr == '\\'){
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
112 // need more proccesing
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
113 /*
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
114 \277
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
115 \0xa5
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
116 \[
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
117 \\
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
118 \utf-8 etc...
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
119 */
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
120 } else {
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
121 tokenType = 'a';
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
122 tokenValue = *ptr;
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 72
diff changeset
123 return;
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
124 }
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
125 }
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
126
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
127 tokenType = 0;
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
128 tokenValue = 0;
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
129 return;
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
130 }
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
131
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
132 // <regexAtom> ::= <literal>|<charClass>|<group>
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
133 NodePtr regexAtom() {
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
134
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
135 token();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
136 NodePtr n = NULL;
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
137 if (tokenType == 'a') n = literal();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
138 else if (tokenType == '[') n = charClass();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
139 else if (tokenType == '(') n = group();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
140
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
141 return n;
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
142 }
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
143
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
144 // <regex> ::= <regexAtom>|<regexAtom>'*'|<regexAtom>'|'<regex>|<regexAtom><regex>
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
145 NodePtr regex() {
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
146 NodePtr n = regexAtom();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
147 while (*ptr) {
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
148 token();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
149 if (tokenType == '*') {
71
58d2b10988c9 move ptr++ in token()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 70
diff changeset
150 n = createNode('*',n,0);
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
151 } else if (tokenType == '|') {
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
152 NodePtr n1 = regex();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
153 n = createNode('|',n,n1);
74
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
154 } else if (tokenType == ')') {
b11dfc48f698 fix grouping function
masa
parents: 73
diff changeset
155 return n;
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
156 } else {
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
157 NodePtr n1 = regex();
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
158 n = createNode('+',n,n1);
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
159 }
67
4842ca2cf8ee print character
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 66
diff changeset
160 } return n;
68
d27b3af1fe75 remove string()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 67
diff changeset
161 }
d27b3af1fe75 remove string()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 67
diff changeset
162
66
f8fb3b463f70 fix when '|' come procces
Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
parents: 65
diff changeset
163
62
a49b4a8b8c14 implement isLiteral
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 61
diff changeset
164 int main(int argc, char **argv)
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
165 {
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
166 for (int i = 1; i < argc; i++) {
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
167 if (strcmp(argv[i],"-regex") == 0) {
64
e0ad6c145f89 remove some errors
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 63
diff changeset
168 ptr = (unsigned char*)argv[i+1]; i++;
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
169 }
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
170 }
55
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 54
diff changeset
171
56
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
172 printf("regex : %s\n",ptr);
8901bc071d33 implement string() and literal()
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents: 55
diff changeset
173 NodePtr n = regex();
66
f8fb3b463f70 fix when '|' come procces
Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
parents: 65
diff changeset
174 printTree(n);
45
89a198fa6b23 add dfrTobin
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
175 return 0;
89a198fa6b23 add dfrTobin
Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
176 }