summaryrefslogtreecommitdiff
path: root/rules/jflex-bootstrap/0003-jlex.patch
blob: 96ca444e2501aa25c751af1e9f368003e7b7a29b (plain)
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
From 61505fb5919b72f2b300508e3e64896946fa24ab Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 6 Jun 2014 15:37:50 -0400
Subject: [PATCH 3/3] Use JLex to bootstrap the lexer.

---
 build.xml        |  32 ++++++++++------
 jflex2jlex.patch | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 jflex2jlex.sed   |  97 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 228 insertions(+), 11 deletions(-)
 create mode 100644 jflex2jlex.patch
 create mode 100644 jflex2jlex.sed

diff --git a/build.xml b/build.xml
index 334d439..dea8a54 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,6 @@
 <project name="JFlex" default="help">
 
   <property name="version" value="1.5.1-SNAPSHOT" />
-  <property name="bootstrap.version" value="1.5.0" />
   <property name="junit.version" value="4.11" />
   <property name="java.source.version" value="1.5" />
     
@@ -14,14 +13,13 @@
   <property name="lib.dir" value="lib"/>
     
   <!-- override these if you want to use your own versions -->
-  <property name="bootstrap.jflex.jar" value="${lib.dir}/jflex-${bootstrap.version}.jar" />
+  <property name="sed.exe" value="sed" />
+  <property name="jlex.exe" value="jlex" />
   <property name="cup.exe" value="java-cup" />
   <property name="junit.jar" value="${lib.dir}/junit-${junit.version}.jar" />
 
   <!-- where to get tool jars from -->
   <property name="maven.central.url" value="http://central.maven.org/maven2" />
-  <property name="bootstrap.jflex.jar.url" 
-  	        value="${maven.central.url}/de/jflex/jflex/${bootstrap.version}/jflex-${bootstrap.version}.jar" />
   <property name="junit.jar.url"
             value="${maven.central.url}/junit/junit/${junit.version}/junit-${junit.version}.jar" />
 
@@ -50,7 +48,6 @@
   </target> 
 
   <target name="gettools" description="download development tools">
-    <get src="${bootstrap.jflex.jar.url}" dest="${bootstrap.jflex.jar}"/>
     <get src="${junit.jar.url}" dest="${junit.jar}"/>
   </target>
 
@@ -114,13 +111,26 @@
   </target>
 
   <target name="-generate-scanner">
-    <taskdef classname="jflex.anttask.JFlexTask" 
-             name="jflex" classpath="${bootstrap.jflex.jar}"/>
     <mkdir dir="${generated.sources.dir}/jflex"/>
-    <jflex file="src/main/jflex/LexScan.flex"
-           outdir="${generated.sources.dir}/jflex"
-           skeleton="src/main/jflex/skeleton.nested"
-           nobak="on"/>
+    <exec executable="${sed.exe}"
+          input="src/main/jflex/LexScan.flex"
+          output="${generated.sources.dir}/jflex/LexScan.lex"
+          failonerror="true">
+      <arg value="-rnf"/>
+      <arg value="jflex2jlex.sed"/>
+    </exec>
+    <patch patchfile="jflex2jlex.patch"
+           originalfile="${generated.sources.dir}/jflex/LexScan.lex"
+           failonerror="true"/>
+    <exec executable="${jlex.exe}" failonerror="true">
+      <arg value="${generated.sources.dir}/jflex/LexScan.lex"/>
+    </exec>
+    <replaceregexp file="${generated.sources.dir}/jflex/LexScan.lex.java"
+                   match="^public class LexScan .*\{$"
+                   replace="public class LexScan implements sym, java_cup.runtime.Scanner {"
+                   byline="true"/>
+    <move file="${generated.sources.dir}/jflex/LexScan.lex.java"
+          tofile="${generated.sources.dir}/jflex/LexScan.java"/>
   </target>
 
   <target name="-generate-parser">
diff --git a/jflex2jlex.patch b/jflex2jlex.patch
new file mode 100644
index 0000000..5b2113b
--- /dev/null
+++ b/jflex2jlex.patch
@@ -0,0 +1,110 @@
+--- LexScan.lex	2014-06-06 13:46:02.242828126 -0400
++++ src/main/jflex/LexScan.flex	2014-06-06 13:07:58.611333045 -0400
+@@ -203,28 +203,57 @@
+       throw new ScannerException(file,ErrorMessages.NOT_READABLE, yyline);
+     }
+   }
++
++  int yycolumn = -1;
++
++  private static final String ZZ_PUSHBACK_2BIG = "Error: pushback value was too large";
++  private static final String ZZ_UNIMPLEMENTED = "Error: unimplemented feature";
++  private void zzScanError(String message) {
++    System.out.println(message);
++    System.out.flush();
++    throw new Error("Fatal Error.\n");
++  }
++
++  private boolean yymoreStreams() { return false; }
++  private void yypushStream(java.io.Reader reader) { zzScanError(ZZ_UNIMPLEMENTED); }
++  private void yypopStream() { zzScanError(ZZ_UNIMPLEMENTED); }
++
++  private void yypushback(int number) {
++    if ( number > yylength() )
++      zzScanError(ZZ_PUSHBACK_2BIG);
++    yy_buffer_end -= number;
++    yy_buffer_index = yy_buffer_end;
++  }
+ %}
+ 
+ %init{
+   states.insert("YYINITIAL", true);
+ %init}
+ 
++%eofval{
++           if ( yymoreStreams() ) {
++             file = (File) files.pop();
++             yypopStream();
++           }
++           else
++             return symbol(EOF);
++%eofval}
+ 
+ Digit      = ([0-9])
+ HexDigit   = ([0-9a-fA-F])
+ OctDigit   = ([0-7])
+ 
+ Number     = ({Digit}+)
+-HexNumber  = (\\x{HexDigit}{2})
+-OctNumber  = (\\[0-3]?{OctDigit}{1,2})
++HexNumber  = (\\x{HexDigit}{HexDigit})
++OctNumber  = (\\[0-3]?{OctDigit}{OctDigit}?)
+ 
+-Unicode4  = (\\u{HexDigit}{1,4})
++Unicode4  = (\\u{HexDigit}({HexDigit}({HexDigit}{HexDigit}?)?)?)
+ 
+-Unicode6  = (\\U{HexDigit}{1,6})
++Unicode6  = (\\U{HexDigit}({HexDigit}({HexDigit}({HexDigit}({HexDigit}{HexDigit}?)?)?)?)?)
+ 
+ WSP        = ([ \t\b])
+ WSPNL      = ([\u2028\u2029\u000A\u000B\u000C\u000D\u0085\t\b\ ])
+-NWSPNL     = ([^\u2028\u2029\u000A\u000B\u000C\u000D\u0085\t\b\ ])
++NWSPNL     = ([^\u2028\u2029\u000A\u000B\u000C\u000D\u0085\t\b\ <}])
+ NL         = ([\u2028\u2029\u000A\u000B\u000C\u000D\u0085]|\u000D\u000A)
+ NNL        = ([^\u2028\u2029\u000A\u000B\u000C\u000D\u0085])
+ 
+@@ -255,13 +284,13 @@
+ CharLiteral = (\'([^\u2028\u2029\u000A\u000B\u000C\u000D\u0085\'\\]|{EscapeSequence})\')
+ StringLiteral = (\"({StringCharacter}|{EscapeSequence})*\")
+ 
+-EscapeSequence = (\\[^\u2028\u2029\u000A\u000B\u000C\u000D\u0085]|\\+u{HexDigit}{4}|\\[0-3]?{OctDigit}{1,2})
++EscapeSequence = (\\[^\u2028\u2029\u000A\u000B\u000C\u000D\u0085]|\\+u{HexDigit}{HexDigit}{HexDigit}{HexDigit}|\\[0-3]?{OctDigit}{OctDigit}?)
+ 
+ 
+ JavaRest = ([^\{\}\"\'/]|"/"[^*/])
+ JavaCode = (({JavaRest}|{StringLiteral}|{CharLiteral}|{JavaComment})+)
+ 
+-DottedVersion =  ([1-9][0-9]*(\.[0-9]+){0,2})
++DottedVersion =  ([1-9][0-9]*(\.[0-9]+(\.[0-9]+)?)?)
+ 
+ %%
+ 
+@@ -441,7 +470,7 @@
+                                    return s;
+                                  }
+ <REGEXPSTART> ^{WSP}*{NWSPNL}              { yypushback(yylength()); yybegin(REGEXP); }
+-<REGEXPSTART> {WSP}|{NL}                   { }
++<REGEXPSTART> ({WSP}|{NL})                 { }
+ 
+ <STATES> {Ident}                     { return symbol(IDENT, yytext()); }
+ <STATES> ","                         { return symbol(COMMA); }
+@@ -491,7 +520,7 @@
+                                  }
+ 
+ <REGEXP> {WSPNL}+"{"    { actionText.setLength(0); yybegin(JAVA_CODE); action_line = yyline+1; return symbol(REGEXPEND); }
+-<REGEXP> {NL}{if(macroDefinition) { yybegin(MACROS); } return symbol(REGEXPEND); }
++<REGEXP> {NL}            { if (macroDefinition) { yybegin(MACROS); } return symbol(REGEXPEND); }
+ 
+ <REGEXP> {WSPNL}*"/*"    { nextState = REGEXP; yybegin(COMMENT); }
+ 
+@@ -627,10 +656,3 @@
+ 
+ .  { throw new ScannerException(file,ErrorMessages.UNEXPECTED_CHAR, yyline, yycolumn); }
+ \n { throw new ScannerException(file,ErrorMessages.UNEXPECTED_NL, yyline, yycolumn); }
+-
+-<<EOF>>  { if ( yymoreStreams() ) {
+-             file = (File) files.pop();
+-             yypopStream();
+-           }
+-           else
+-             return symbol(EOF); }
diff --git a/jflex2jlex.sed b/jflex2jlex.sed
new file mode 100644
index 0000000..064452a
--- /dev/null
+++ b/jflex2jlex.sed
@@ -0,0 +1,97 @@
+#!/usr/bin/sed -rnf
+# (Mostly) transforms a JFlex file into a JLex file
+
+:usercode
+	# Don't make any changes
+	/^%%$/ { p; n; b macros; }
+	p; n; b usercode
+
+:macros
+	/^%%$/ { p; n; b regex; }
+
+	# Preserve code blocks verbatim
+	/^%(|init)\{\s*$/ { p; n; b macros_codeblock; }
+
+	# Get rid of %-symbols not supported
+	/^%(final|column|eofclose|inputstreamctor)/ { n; b macros; }
+
+	# Get rid of comments
+	/^\s*\/\// { n; b macros; }
+	/^\s*\/*.*\*\/$/ { n; b macros; }
+
+	/^[A-Z].*=/ {
+	    # Parenthesize macros
+	    s:^([^=]*=\s*)(\S.*):\1(\2):
+	    # Remove whitespace
+	    :macros_again
+	    s:(= .*[^\[]) :\1:
+	    t macros_again
+	    s:(= .*\\\\) :\1:
+	    t macros_again
+	}
+
+	# (Rough) character class conversion
+	s/\[:jletter:\]/[A-Za-z$_]/
+	s/\[:jletterdigit:\]/[A-Za-z0-9$_]/
+
+	p; n; b macros
+:macros_codeblock
+	/^%(|init)\}\s*$/ { p; n; b macros; }
+	p; n; b macros_codeblock
+
+# De-shorthand nested state-prefixed patterns
+# Only supports nesting 2 levels deep
+:regex
+	s: <<EOF>> : ,,EOF,, :g
+	/^\s*\/\// { n; b regex; }
+	/^<[^>]*>\s*\{\s*$/ {
+		s:\s*\{.*::
+		h
+		n; b regex_stateblock
+	}
+	:regex_again
+	s:^([^>]+>\s+.*[^ \[]) (.*\S\s+\{ ):\1\2: ; t regex_again
+	p; n; b regex
+:regex_stateblock
+	s: <<EOF>> : ,,EOF,, :g
+	/^\s*\/\// { n; b regex_stateblock; }
+	/^  [^ <]/ {
+		x
+		G
+		s:\n  : :
+		:regex_stateblock_again
+		s:^([^>]+>\s+.*[^ \[]) (.*\S\s+\{ ):\1\2: ; t regex_stateblock_again
+		p
+		s:>.*:>:
+		x
+		n; b regex_stateblock
+	}
+	/^  <[^>]*>\s*\{\s*$/ {
+		x
+		G
+		s:>\s*\n\s*<:, :
+		s:\s*\{.*::
+		h
+		n; b regex_stateblock2
+	}
+	/^\}/ { n; b regex; }
+	p; n; b regex_stateblock
+:regex_stateblock2
+	s: <<EOF>> : ,,EOF,, :g
+	/^\s*\/\// { n; b regex_stateblock2; }
+	/^    [^ <]/ {
+		x
+		G
+		s:\n    : :
+		p
+		s:>.*:>:
+		x
+		n; b regex_stateblock2
+	}
+	/^  \}/ {
+		x
+		s:,.*:>:
+		h
+		n; b regex_stateblock
+	}
+	p; n; b regex_stateblock2
-- 
2.0.0