Refactored PdePreprocessor class

cmaglie · cmaglie · commit 316b8718297e · 2013-01-23T13:42:09.000+01:00
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -1339,7 +1339,6 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
     // make sure the user didn't hide the sketch folder
     ensureExistence();
 
-    String[] codeFolderPackages = null;
     classPath = buildPath;
 
 //    // figure out the contents of the code folder to see if there
@@ -1381,12 +1380,8 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
     // Note that the headerOffset isn't applied until compile and run, because
     // it only applies to the code after it's been written to the .java file.
     int headerOffset = 0;
-    //PdePreprocessor preprocessor = new PdePreprocessor();
     try {
-      headerOffset = preprocessor.writePrefix(bigCode.toString(),
-                                              buildPath,
-                                              name,
-                                              codeFolderPackages);
+      headerOffset = preprocessor.writePrefix(bigCode.toString());
     } catch (FileNotFoundException fnfe) {
       fnfe.printStackTrace();
       String msg = _("Build folder disappeared or could not be written");
@@ -1399,24 +1394,14 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
     String primaryClassName = null;
 
     try {
-      // if (i != 0) preproc will fail if a pde file is not
-      // java mode, since that's required
-      String className = preprocessor.write();
-
-      if (className == null) {
-        throw new RunnerException(_("Could not find main class"));
-        // this situation might be perfectly fine,
-        // (i.e. if the file is empty)
-        //System.out.println("No class found in " + code[i].name);
-        //System.out.println("(any code in that file will be ignored)");
-        //System.out.println();
-
-//      } else {
-//        code[0].setPreprocName(className + ".java");
-      }
-
+      // Output file
+      File streamFile = new File(buildPath, name + ".cpp");
+      FileOutputStream outputStream = new FileOutputStream(streamFile);
+      preprocessor.write(outputStream);
+      outputStream.close();
+      
       // store this for the compiler and the runtime
-      primaryClassName = className + ".cpp";
+      primaryClassName = name + ".cpp";
 
     } catch (FileNotFoundException fnfe) {
       fnfe.printStackTrace();
@@ -1668,58 +1653,7 @@ protected String upload(String buildPath, String suggestedClassName, boolean usi
     return success ? suggestedClassName : null;
   }
 
-  /**
-   * Replace all commented portions of a given String as spaces.
-   * Utility function used here and in the preprocessor.
-   */
-  static public String scrubComments(String what) {
-    char p[] = what.toCharArray();
-
-    int index = 0;
-    while (index < p.length) {
-      // for any double slash comments, ignore until the end of the line
-      if ((p[index] == '/') &&
-          (index < p.length - 1) &&
-          (p[index+1] == '/')) {
-        p[index++] = ' ';
-        p[index++] = ' ';
-        while ((index < p.length) &&
-               (p[index] != '\n')) {
-          p[index++] = ' ';
-        }
-
-        // check to see if this is the start of a new multiline comment.
-        // if it is, then make sure it's actually terminated somewhere.
-      } else if ((p[index] == '/') &&
-                 (index < p.length - 1) &&
-                 (p[index+1] == '*')) {
-        p[index++] = ' ';
-        p[index++] = ' ';
-        boolean endOfRainbow = false;
-        while (index < p.length - 1) {
-          if ((p[index] == '*') && (p[index+1] == '/')) {
-            p[index++] = ' ';
-            p[index++] = ' ';
-            endOfRainbow = true;
-            break;
-
-          } else {
-            // continue blanking this area
-            p[index++] = ' ';
-          }
-        }
-        if (!endOfRainbow) {
-          throw new RuntimeException(_("Missing the */ from the end of a " +
-                                       "/* comment */"));
-        }
-      } else {  // any old character, move along
-        index++;
-      }
-    }
-    return new String(p);
-  }
-
-
+  
   public boolean exportApplicationPrompt() throws IOException, RunnerException {
     return false;
   }
diff --git a/app/src/processing/app/preproc/PdePreprocessor.java b/app/src/processing/app/preproc/PdePreprocessor.java
@@ -29,6 +29,7 @@ Processing version Copyright (c) 2004-05 Ben Fry and Casey Reas
 
 package processing.app.preproc;
 
+import static processing.app.I18n._;
 import processing.app.*;
 import processing.core.*;
 
@@ -61,38 +62,22 @@ public class PdePreprocessor {
   // than the others, since the imports are auto-generated.
   List<String> codeFolderImports;
 
-  String indent;
-
-  PrintStream stream;
   String program;
-  String buildPath;
-  // starts as sketch name, ends as main class name
-  String name;
 
 
   /**
    * Setup a new preprocessor.
    */
   public PdePreprocessor() { 
-    int tabSize = Preferences.getInteger("editor.tabs.size");
-    char[] indentChars = new char[tabSize];
-    Arrays.fill(indentChars, ' ');
-    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;
-    this.name = sketchName;
-
+  public int writePrefix(String program)
+      throws FileNotFoundException {
     // if the program ends with no CR or LF an OutOfMemoryError will happen.
     // not gonna track down the bug now, so here's a hack for it:
     // http://dev.processing.org/bugs/show_bug.cgi?id=5
@@ -102,7 +87,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);
+    scrubComments(program);
     // If there are errors, an exception is thrown and this fxn exits.
 
     if (Preferences.getBoolean("preproc.substitute_unicode")) {
@@ -134,10 +119,6 @@ public int writePrefix(String program, String buildPath,
     // do this after the program gets re-combobulated
     this.program = program;
     
-    // output the code
-    File streamFile = new File(buildPath, name + ".cpp");
-    stream = new PrintStream(new FileOutputStream(streamFile));
-    
     return headerCount + prototypeCount;
   }
 
@@ -181,17 +162,16 @@ static String substituteUnicode(String program) {
   }
 
   /**
-   * preprocesses a pde file and writes out a java file
-   * @return the classname of the exported Java
+   * preprocesses a pde file and writes out a cpp file into the specified
+   * OutputStream
+   * 
+   * @param output
+   * @throws Exception
    */
-  //public String write(String program, String buildPath, String name,
-  //                  String extraImports[]) throws java.lang.Exception {
-  public String write() throws java.lang.Exception {
+  public void write(OutputStream output) throws Exception {
+    PrintStream stream = new PrintStream(output);
     writeProgram(stream, program, prototypes);
     writeFooter(stream);
-    stream.close();
-    
-    return name;
   }
 
   // Write the pde program to the cpp file
@@ -344,4 +324,56 @@ public ArrayList<String> prototypes(String in) {
     
     return functionMatches;
   }
+
+
+  /**
+   * Replace all commented portions of a given String as spaces.
+   * Utility function used here and in the preprocessor.
+   */
+  static public String scrubComments(String what) {
+    char p[] = what.toCharArray();
+
+    int index = 0;
+    while (index < p.length) {
+      // for any double slash comments, ignore until the end of the line
+      if ((p[index] == '/') &&
+          (index < p.length - 1) &&
+          (p[index+1] == '/')) {
+        p[index++] = ' ';
+        p[index++] = ' ';
+        while ((index < p.length) &&
+               (p[index] != '\n')) {
+          p[index++] = ' ';
+        }
+
+        // check to see if this is the start of a new multiline comment.
+        // if it is, then make sure it's actually terminated somewhere.
+      } else if ((p[index] == '/') &&
+                 (index < p.length - 1) &&
+                 (p[index+1] == '*')) {
+        p[index++] = ' ';
+        p[index++] = ' ';
+        boolean endOfRainbow = false;
+        while (index < p.length - 1) {
+          if ((p[index] == '*') && (p[index+1] == '/')) {
+            p[index++] = ' ';
+            p[index++] = ' ';
+            endOfRainbow = true;
+            break;
+
+          } else {
+            // continue blanking this area
+            p[index++] = ' ';
+          }
+        }
+        if (!endOfRainbow) {
+          throw new RuntimeException(_("Missing the */ from the end of a " +
+                                       "/* comment */"));
+        }
+      } else {  // any old character, move along
+        index++;
+      }
+    }
+    return new String(p);
+  }
 }
