1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
##### LM #####
token newline / '\n' /
token index / 'Index:' [ \t]* /
token consume_line / [^\n]* /
def index_stmt [index consume_line newline]
token separator_line / '='+ '\n' /
# Whitespace separated word list
lex
token word /[^\t \n]+/
ignore /[\t ]+/
def word_list
[word word_list]
| []
end
token old_file_start / '---' [\t ]+ /
token new_file_start / '+++' [\t ]+ /
def old_file
[old_file_start word_list newline]
def new_file
[new_file_start word_list newline]
def file_header
[index_stmt separator_line old_file new_file]
token hunk_header / '@@' any* :>> '@@' '\n' /
token hunk_line / ( ' ' | '-' | '+' ) [^\n]* '\n' /
def hunk_body
[hunk_line*]
def hunk
[hunk_header hunk_body]
# diff of a single file: header followed by a hunk list.
def file_diff
[file_header hunk*]
def start
[file_diff*]
parse S: start[ stdin ]
for OF: old_file in S {
# Get the first word and check if it is
# the file we are interested in.
if match OF [
"--- fsmrun.cpp"
Rest: word_list
"\n"
]
{
OF = construct old_file
["--- newfilename.cpp " Rest "\n"]
}
}
print( S )
##### IN #####
Index: fsmrun.cpp
===================================================================
--- fsmrun.cpp (revision 4555)
+++ fsmrun.cpp (working copy)
@@ -150,7 +150,7 @@
peof = 0;
if ( parser != 0 ) {
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
else {
region = 0;
@@ -189,7 +189,7 @@
tokstart = 0;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
void FsmRun::sendToken( int id )
@@ -222,7 +222,7 @@
parser = newParser;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
else {
#ifdef LOG_ACTIONS
@@ -355,7 +355,7 @@
/* Set the current state from the next region. */
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
}
@@ -452,7 +452,7 @@
/* First thing check for error. */
if ( cs == tables->errorState ) {
if ( parser != 0 ) {
- if ( getStateFromNextRegion( 1 ) != 0 ) {
+ if ( parser->getNextRegion( 1 ) != 0 ) {
#ifdef LOG_BACKTRACK
cerr << "scanner failed, trying next region" << endl;
#endif
@@ -462,7 +462,7 @@
parser->nextRegionInd += 1;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
cerr << "new token region: " <<
parser->tables->gbl->regionInfo[region].name << endl;
continue;
@@ -495,7 +495,7 @@
}
else {
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
cerr << "new token region: " <<
parser->tables->gbl->regionInfo[region].name << endl;
continue;
Index: junk.cpp
===================================================================
---
+++ junk.cpp (working copy)
Index: fsmrun.h
===================================================================
--- fsmrun.h (revision 4557)
+++ fsmrun.h (working copy)
@@ -197,10 +197,6 @@
void runOnInputStream( PdaRun *parser, InputStream &in );
void execute();
- /* Offset can be used to look at the next nextRegionInd. */
- int getStateFromNextRegion( int offset = 0 )
- { return tables->entryByRegion[parser->getNextRegion(offset)]; }
-
FsmTables *tables;
PdaRun *parser;
InputStream *inputStream;
##### EXP #####
Index: fsmrun.cpp
===================================================================
--- newfilename.cpp (revision 4555)
+++ fsmrun.cpp (working copy)
@@ -150,7 +150,7 @@
peof = 0;
if ( parser != 0 ) {
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
else {
region = 0;
@@ -189,7 +189,7 @@
tokstart = 0;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
void FsmRun::sendToken( int id )
@@ -222,7 +222,7 @@
parser = newParser;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
else {
#ifdef LOG_ACTIONS
@@ -355,7 +355,7 @@
/* Set the current state from the next region. */
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
}
}
@@ -452,7 +452,7 @@
/* First thing check for error. */
if ( cs == tables->errorState ) {
if ( parser != 0 ) {
- if ( getStateFromNextRegion( 1 ) != 0 ) {
+ if ( parser->getNextRegion( 1 ) != 0 ) {
#ifdef LOG_BACKTRACK
cerr << "scanner failed, trying next region" << endl;
#endif
@@ -462,7 +462,7 @@
parser->nextRegionInd += 1;
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
cerr << "new token region: " <<
parser->tables->gbl->regionInfo[region].name << endl;
continue;
@@ -495,7 +495,7 @@
}
else {
region = parser->getNextRegion();
- cs = getStateFromNextRegion();
+ cs = tables->entryByRegion[region];
cerr << "new token region: " <<
parser->tables->gbl->regionInfo[region].name << endl;
continue;
Index: junk.cpp
===================================================================
---
+++ junk.cpp (working copy)
Index: fsmrun.h
===================================================================
--- fsmrun.h (revision 4557)
+++ fsmrun.h (working copy)
@@ -197,10 +197,6 @@
void runOnInputStream( PdaRun *parser, InputStream &in );
void execute();
- /* Offset can be used to look at the next nextRegionInd. */
- int getStateFromNextRegion( int offset = 0 )
- { return tables->entryByRegion[parser->getNextRegion(offset)]; }
-
FsmTables *tables;
PdaRun *parser;
InputStream *inputStream;
|
