throw exceptions to prevent sketches from continuing

benfry · benfry · commit 9883ba7eb529 · 2015-06-04T23:26:39.000-05:00
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -252,7 +252,8 @@ static private StringList breakCommas(String contents) {
    * @param fussy true if it should show an error message if bad size()
    * @return null if there was an error, otherwise an array (might contain some/all nulls)
    */
-  static public SizeInfo parseSketchSize(String code, boolean fussy) {
+  static public SizeInfo parseSketchSize(String code,
+                                         boolean fussy) throws SketchException {
     // This matches against any uses of the size() function, whether numbers
     // or variables or whatever. This way, no warning is shown if size() isn't
     // actually used in the applet, which is the case especially for anyone
@@ -299,8 +300,8 @@ make sure that it uses numbers (or displayWidth/Height), copy into settings
         }
       }
       if (closeBrace == -1) {
-//        throw new SketchException("Found a { that's missing a matching }");
-        return null;
+        throw new SketchException("Found a { that's missing a matching }", false);
+//        return null;
       }
       searchArea = sb.toString();
     }
@@ -323,19 +324,20 @@ make sure that it uses numbers (or displayWidth/Height), copy into settings
       // making a square sketch window? Not going to
 
       if (info.hasOldSyntax()) {
-        return null;
+//        return null;
+        throw new SketchException("Please update your code to continue.", false);
       }
 
       if (info.hasBadSize() && fussy) {
         // found a reference to size, but it didn't seem to contain numbers
         final String message =
-          "The size of this applet could not automatically\n" +
-          "be determined from your code. Use only numeric\n" +
-          "values (not variables) for the size() command.\n" +
-          "See the size() reference for an explanation.";
+          "The size of this sketch could not be determined from your code.\n" +
+          "Use only numbers (not variables) for the size() command.\n" +
+          "Read the size() reference for more details.";
         Base.showWarning("Could not find sketch size", message, null);
 //        new Exception().printStackTrace(System.out);
-        return null;
+//        return null;
+        throw new SketchException("Please fix the size() line to continue.", false);
       }
 
       info.checkEmpty();
