Revert "Removed dependencies from regex library oro.jar"

This reverts commit 2b43910.

Author: David A. Mellis

app/build.xml

@@ -43,7 +43,7 @@
 	   excludes="**/tools/format/**" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
+	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/oro.jar; lib/RXTXcomm.jar" />
   </target>
 
   <target name="build" depends="compile" description="Build PDE">

app/lib/oro.jar

@@ -35,7 +35,7 @@ Processing version Copyright (c) 2004-05 Ben Fry and Casey Reas
 import java.io.*;
 import java.util.*;
 
-import java.util.regex.*;
+import com.oroinc.text.regex.*;
 
 
 /**
@@ -49,17 +49,16 @@ public class PdePreprocessor {
   // we always write one header: WProgram.h
   public int headerCount = 1;
 
-  // the prototypes that are generated by the preprocessor
-  List<String> prototypes;
+  List prototypes;
 
   // these ones have the .* at the end, since a class name might be at the end
   // instead of .* which would make trouble other classes using this can lop
   // off the . and anything after it to produce a package name consistently.
-  List<String> programImports;
+  ArrayList<String> programImports;
 
   // imports just from the code folder, treated differently
   // than the others, since the imports are auto-generated.
-  List<String> codeFolderImports;
+  ArrayList<String> codeFolderImports;
 
   String indent;
 
@@ -80,14 +79,6 @@ public PdePreprocessor() {
     indent = new String(indentChars);
   }
 
-  /**
-   * Writes out the head of the c++ code generated for a sketch. 
-   * Called from processing.app.Sketch.
-   * @param program the concatenated code from all tabs containing pde-files
-   * @param buildPath the path into which the processed pde-code is to be written
-   * @param name the name of the sketch 
-   * @param codeFolderPackages unused param (leftover from processing)
-   */
   public int writePrefix(String program, String buildPath,
                          String sketchName, String codeFolderPackages[]) throws FileNotFoundException {
     this.buildPath = buildPath;
@@ -102,7 +93,7 @@ public int writePrefix(String program, String buildPath,
     // an OutOfMemoryError or NullPointerException will happen.
     // again, not gonna bother tracking this down, but here's a hack.
     // http://dev.processing.org/bugs/show_bug.cgi?id=16
-    Sketch.scrubComments(program);
+    String scrubbed = Sketch.scrubComments(program);
     // If there are errors, an exception is thrown and this fxn exits.
 
     if (Preferences.getBoolean("preproc.substitute_unicode")) {
@@ -126,7 +117,14 @@ public int writePrefix(String program, String buildPath,
 //      }
 //    }
 
-    prototypes = prototypes(program);
+    prototypes = new ArrayList();
+    
+    try {
+      prototypes = prototypes(program);
+    } catch (MalformedPatternException e) {
+      System.out.println("Internal error while pre-processing; " +
+        "not generating function prototypes.\n\n" + e);
+    }
 
     // store # of prototypes so that line number reporting can be adjusted
     prototypeCount = prototypes.size();
@@ -195,7 +193,7 @@ public String write() throws java.lang.Exception {
   }
 
   // Write the pde program to the cpp file
-  protected void writeProgram(PrintStream out, String program, List<String> prototypes) {
+  protected void writeProgram(PrintStream out, String program, List prototypes) {
     int prototypeInsertionPoint = firstStatement(program);
 
     out.print(program.substring(0, prototypeInsertionPoint));
@@ -218,7 +216,7 @@ protected void writeProgram(PrintStream out, String program, List<String> protot
   protected void writeFooter(PrintStream out) throws java.lang.Exception {}
 
 
-  public List<String> getExtraImports() {
+  public ArrayList<String> getExtraImports() {
     return programImports;
   }
 
@@ -231,23 +229,31 @@ public List<String> getExtraImports() {
    * or a pre-processor directive.
    */
   public int firstStatement(String in) {
-    // whitespace
-    String p = "\\s+";
+    PatternMatcherInput input = new PatternMatcherInput(in);
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
+    Pattern pattern = null;
 
-    // multi-line and single-line comment
-    //p += "|" + "(//\\s*?$)|(/\\*\\s*?\\*/)";
-    p += "|(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)|(//.*?$)";
-
-    // pre-processor directive
-    p += "|(#(?:\\\\\\n|.)*)";
-    Pattern pattern = Pattern.compile(p, Pattern.MULTILINE);
+    try {
+      pattern = compiler.compile(
+        // XXX: doesn't properly handle special single-quoted characters
+        // whitespace
+        "\\s+" + "|" +
+        // multi-line comment
+        "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
+        // single-line comment
+        "(//.*?$)" + "|" +
+        // pre-processor directive
+        "(#(?:\\\\\\n|.)*)",
+        Perl5Compiler.MULTILINE_MASK);
+    } catch (MalformedPatternException e) {
+      throw new RuntimeException("Internal error in firstStatement()", e);
+    }
 
-    Matcher matcher = pattern.matcher(in);
     int i = 0;
-    while (matcher.find()) {
-      if (matcher.start()!=i)
-        break;
-      i = matcher.end();
+    while (matcher.matchesPrefix(input, pattern)) {
+      i = matcher.getMatch().endOffset(0);
+      input.setCurrentOffset(i);
     }
 
     return i;
@@ -259,24 +265,31 @@ public int firstStatement(String in) {
    * @param in the String to strip
    * @return the stripped String
    */
-  public String strip(String in) {
-    // XXX: doesn't properly handle special single-quoted characters
-    // single-quoted character
-    String p = "('.')";
-    
-    // double-quoted string
-    p += "|(\"(?:[^\"\\\\]|\\\\.)*\")";
-    
-    // single and multi-line comment
-    //p += "|" + "(//\\s*?$)|(/\\*\\s*?\\*/)";
-    p += "|(//.*?$)|(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)";
+  public String strip(String in) throws MalformedPatternException {
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
+    Pattern pattern = compiler.compile(
+      // XXX: doesn't properly handle special single-quoted characters
+      // single-quoted character
+      "('.')" + "|" +
+      // double-quoted string
+      "(\"(?:[^\"\\\\]|\\\\.)*\")" + "|" +
+      // multi-line comment
+      "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
+      // single-line comment
+      "(//.*?$)" + "|" +
+      // pre-processor directive
+      "(^\\s*#.*?$)",
+      Perl5Compiler.MULTILINE_MASK);
+      
+    while (matcher.contains(in, pattern)) {
+      MatchResult result = matcher.getMatch();
+      // XXX: should preserve newlines in the result so that line numbers of
+      // the stripped string correspond to those in the original source.
+      in = in.substring(0, result.beginOffset(0)) + " " + in.substring(result.endOffset(0));
+    }
 
-    // pre-processor directive
-    p += "|" + "(^\\s*#.*?$)";
-
-    Pattern pattern = Pattern.compile(p, Pattern.MULTILINE);
-    Matcher matcher = pattern.matcher(in);
-    return matcher.replaceAll(" ");
+    return in;
   }
 
   /**
@@ -311,17 +324,21 @@ private String collapseBraces(String in) {
     return buffer.toString();
   }
 
-  public ArrayList<String> prototypes(String in) {
+  public List prototypes(String in) throws MalformedPatternException {
     in = collapseBraces(strip(in));
 
+    PatternMatcherInput input = new PatternMatcherInput(in);
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
     // XXX: doesn't handle ... varargs
     // XXX: doesn't handle function pointers
-    Pattern pattern = Pattern.compile("[\\w\\[\\]\\*]+\\s+[&\\[\\]\\*\\w\\s]+\\([&,\\[\\]\\*\\w\\s]*\\)(?=\\s*\\{)");
+    Pattern pattern = compiler.compile(
+      "[\\w\\[\\]\\*]+\\s+[\\[\\]\\*\\w\\s]+\\([,\\[\\]\\*\\w\\s]*\\)(?=\\s*\\{)");
+    List matches = new ArrayList();
 
-    ArrayList<String> matches = new ArrayList<String>();
-    Matcher matcher = pattern.matcher(in);
-    while (matcher.find())
-      matches.add(matcher.group(0) + ";");
+    while (matcher.contains(input, pattern)) {
+      matches.add(matcher.getMatch().group(0) + ";");
+    }
 
     return matches;
   }

app/src/processing/app/preproc/PdePreprocessor.java

@@ -19,6 +19,7 @@
     <include name="app/pde.jar" />
     <include name="app/lib/ecj.jar" />
     <include name="app/lib/jna.jar" />
+    <include name="app/lib/oro.jar" />
     <include name="app/lib/RXTXcomm.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />

build/build.xml

@@ -72,7 +72,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/RXTXcomm.jar</string>
+      <string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/oro.jar:$JAVAROOT/RXTXcomm.jar</string>
 
       <key>JVMArchs</key>  
       <array>  

build/macosx/template.app/Contents/Info.plist

@@ -19,6 +19,7 @@
     <cp>lib/core.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/ecj.jar</cp>
+    <cp>lib/oro.jar</cp>
     <cp>lib/RXTXcomm.jar</cp>
   </classPath>
   <jre>

build/windows/launcher/config.xml

@@ -105,6 +105,7 @@ Sketch.java
 PreProcessor.java
  - split write() into writeHeader() and write() as in Processing?
  - add getExtraImports() function instead of having Sketch grab them directly.
+ - don't use oro.jar
 
 Base.java
  - add keywords from libraries to the syntax coloring