From 4031b30c23cf27936c217047191f419eeac1a257 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 5 Jun 2014 21:58:03 -0400
Subject: [PATCH 2/3] Support the last stable release of CUP, instead of
 requiring a beta.

Unfortunately, the last stable release (0.10k) predates Java 5, and
thus does not support generics.  This requires some clever
work-arounds.
---
 build.xml                             | 25 ++++++++++++++++---------
 src/main/java/jflex/IntCharSet.java   |  8 ++++----
 src/main/java/jflex/IntegerList.java  | 14 ++++++++++++++
 src/main/java/jflex/IntervalList.java | 14 ++++++++++++++
 4 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/jflex/IntegerList.java
 create mode 100644 src/main/java/jflex/IntervalList.java

diff --git a/build.xml b/build.xml
index b4a5124..334d439 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,6 @@
   <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="cup.version" value="11a" />
   <property name="java.source.version" value="1.5" />
     
   <!-- use any of these files to override properties -->
@@ -16,7 +15,7 @@
     
   <!-- override these if you want to use your own versions -->
   <property name="bootstrap.jflex.jar" value="${lib.dir}/jflex-${bootstrap.version}.jar" />
-  <property name="cup.jar" value="${lib.dir}/java-cup-${cup.version}.jar" />
+  <property name="cup.exe" value="java-cup" />
   <property name="junit.jar" value="${lib.dir}/junit-${junit.version}.jar" />
 
   <!-- where to get tool jars from -->
@@ -125,13 +124,21 @@
   </target>
 
   <target name="-generate-parser">
-    <taskdef classname="java_cup.anttask.CUPTask" 
-             name="cup" classpath="${cup.jar}"/>
-    <mkdir dir="${generated.sources.dir}"/>
-    <cup srcfile="src/main/cup/LexParse.cup" 
-         destdir="${generated.sources.dir}" 
-         interface="true" 
-         parser="LexParse"/>
+    <mkdir dir="${generated.sources.dir}/jflex"/>
+    <copy file="src/main/cup/LexParse.cup"
+          tofile="${generated.sources.dir}/jflex/LexParse.cup"/>
+    <replaceregexp file="${generated.sources.dir}/jflex/LexParse.cup"
+                   match="(Array)?List&lt;([^&gt;]*)&gt;"
+                   replace="\2List"
+                   flags="g"/>
+    <exec executable="${cup.exe}"
+          input="${generated.sources.dir}/jflex/LexParse.cup"
+          dir="${generated.sources.dir}/jflex"
+          failonerror="true">
+      <arg value="-interface"/>
+      <arg value="-parser"/>
+      <arg value="LexParse"/>
+    </exec>
   </target>
     
   <target name="-compile-test" depends="compile">
diff --git a/src/main/java/jflex/IntCharSet.java b/src/main/java/jflex/IntCharSet.java
index 570c0cb..0f3a7cb 100644
--- a/src/main/java/jflex/IntCharSet.java
+++ b/src/main/java/jflex/IntCharSet.java
@@ -26,11 +26,11 @@ public final class IntCharSet {
   private final static boolean DEBUG = false;
 
   /* invariant: all intervals are disjoint, ordered */
-  private List<Interval> intervals;
+  private IntervalList intervals;
   private int pos;
 
   public IntCharSet() {
-    this.intervals = new ArrayList<Interval>();
+    this.intervals = new IntervalList();
   }
 
   public IntCharSet(char c) {
@@ -44,7 +44,7 @@ public final class IntCharSet {
 
   public IntCharSet(List<Interval> chars) {
     int size = chars.size();
-    intervals = new ArrayList<Interval>(size);
+    intervals = new IntervalList(size);
 
     for (Interval interval : chars)
       add(interval);
@@ -329,7 +329,7 @@ public final class IntCharSet {
     return intervals.size();
   }
 
-  public List<Interval> getIntervals() {
+  public IntervalList getIntervals() {
     return intervals;
   }
 
diff --git a/src/main/java/jflex/IntegerList.java b/src/main/java/jflex/IntegerList.java
new file mode 100644
index 0000000..c793ef9
--- /dev/null
+++ b/src/main/java/jflex/IntegerList.java
@@ -0,0 +1,14 @@
+package jflex;
+import java.util.ArrayList;
+import java.util.Collection;
+public class IntegerList extends ArrayList<Integer> {
+	public IntegerList() {
+		super();
+	}
+	public IntegerList(Collection<? extends Integer> c) {
+		super(c);
+	}
+	public IntegerList(int initialCapacity) {
+		super(initialCapacity);
+	}
+}
diff --git a/src/main/java/jflex/IntervalList.java b/src/main/java/jflex/IntervalList.java
new file mode 100644
index 0000000..4731832
--- /dev/null
+++ b/src/main/java/jflex/IntervalList.java
@@ -0,0 +1,14 @@
+package jflex;
+import java.util.ArrayList;
+import java.util.Collection;
+public class IntervalList extends ArrayList<Interval> {
+	public IntervalList() {
+		super();
+	}
+	public IntervalList(Collection<? extends Interval> c) {
+		super(c);
+	}
+	public IntervalList(int initialCapacity) {
+		super(initialCapacity);
+	}
+}
-- 
2.0.0