added a check for length 0 arrays in expand()

inkwellsiesta · inkwellsiesta · commit 3cd6b4011da2 · 2016-06-02T15:30:14.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -1870,7 +1870,7 @@ public void fullScreen(String renderer) {
 
 
   /**
-   * @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN) 
+   * @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN)
    */
 
   public void fullScreen(String renderer, int display) {
@@ -7842,7 +7842,7 @@ static public void arraycopy(Object src, Object dst) {
    * @see PApplet#shorten(boolean[])
    */
   static public boolean[] expand(boolean list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   /**
@@ -7855,7 +7855,7 @@ static public boolean[] expand(boolean list[], int newSize) {
   }
 
   static public byte[] expand(byte list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public byte[] expand(byte list[], int newSize) {
@@ -7865,7 +7865,7 @@ static public byte[] expand(byte list[], int newSize) {
   }
 
   static public char[] expand(char list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public char[] expand(char list[], int newSize) {
@@ -7875,7 +7875,7 @@ static public char[] expand(char list[], int newSize) {
   }
 
   static public int[] expand(int list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public int[] expand(int list[], int newSize) {
@@ -7885,7 +7885,7 @@ static public int[] expand(int list[], int newSize) {
   }
 
   static public long[] expand(long list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public long[] expand(long list[], int newSize) {
@@ -7895,7 +7895,7 @@ static public long[] expand(long list[], int newSize) {
   }
 
   static public float[] expand(float list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public float[] expand(float list[], int newSize) {
@@ -7905,7 +7905,7 @@ static public float[] expand(float list[], int newSize) {
   }
 
   static public double[] expand(double list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public double[] expand(double list[], int newSize) {
@@ -7915,7 +7915,7 @@ static public double[] expand(double list[], int newSize) {
   }
 
   static public String[] expand(String list[]) {
-    return expand(list, list.length << 1);
+    return expand(list, list.length > 0 ? list.length << 1 : 1);
   }
 
   static public String[] expand(String list[], int newSize) {
@@ -7929,7 +7929,8 @@ static public String[] expand(String list[], int newSize) {
   * @nowebref
   */
   static public Object expand(Object array) {
-    return expand(array, Array.getLength(array) << 1);
+    int len = Array.getLength(array);
+    return expand(array, len > 0 ? len << 1 : 1);
   }
 
   static public Object expand(Object list, int newSize) {

Original file line number	Diff line number	Diff line change
`@@ -1870,7 +1870,7 @@ public void fullScreen(String renderer) {`
`1870`	`1870`
`1871`	`1871`
`1872`	`1872`	`/**`
`1873`		`- * @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN)`
	`1873`	`+ * @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN)`
`1874`	`1874`	`*/`
`1875`	`1875`
`1876`	`1876`	`public void fullScreen(String renderer, int display) {`
`@@ -7842,7 +7842,7 @@ static public void arraycopy(Object src, Object dst) {`
`7842`	`7842`	`* @see PApplet#shorten(boolean[])`
`7843`	`7843`	`*/`
`7844`	`7844`	`static public boolean[] expand(boolean list[]) {`
`7845`		`- return expand(list, list.length << 1);`
	`7845`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7846`	`7846`	`}`
`7847`	`7847`
`7848`	`7848`	`/**`
`@@ -7855,7 +7855,7 @@ static public boolean[] expand(boolean list[], int newSize) {`
`7855`	`7855`	`}`
`7856`	`7856`
`7857`	`7857`	`static public byte[] expand(byte list[]) {`
`7858`		`- return expand(list, list.length << 1);`
	`7858`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7859`	`7859`	`}`
`7860`	`7860`
`7861`	`7861`	`static public byte[] expand(byte list[], int newSize) {`
`@@ -7865,7 +7865,7 @@ static public byte[] expand(byte list[], int newSize) {`
`7865`	`7865`	`}`
`7866`	`7866`
`7867`	`7867`	`static public char[] expand(char list[]) {`
`7868`		`- return expand(list, list.length << 1);`
	`7868`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7869`	`7869`	`}`
`7870`	`7870`
`7871`	`7871`	`static public char[] expand(char list[], int newSize) {`
`@@ -7875,7 +7875,7 @@ static public char[] expand(char list[], int newSize) {`
`7875`	`7875`	`}`
`7876`	`7876`
`7877`	`7877`	`static public int[] expand(int list[]) {`
`7878`		`- return expand(list, list.length << 1);`
	`7878`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7879`	`7879`	`}`
`7880`	`7880`
`7881`	`7881`	`static public int[] expand(int list[], int newSize) {`
`@@ -7885,7 +7885,7 @@ static public int[] expand(int list[], int newSize) {`
`7885`	`7885`	`}`
`7886`	`7886`
`7887`	`7887`	`static public long[] expand(long list[]) {`
`7888`		`- return expand(list, list.length << 1);`
	`7888`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7889`	`7889`	`}`
`7890`	`7890`
`7891`	`7891`	`static public long[] expand(long list[], int newSize) {`
`@@ -7895,7 +7895,7 @@ static public long[] expand(long list[], int newSize) {`
`7895`	`7895`	`}`
`7896`	`7896`
`7897`	`7897`	`static public float[] expand(float list[]) {`
`7898`		`- return expand(list, list.length << 1);`
	`7898`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7899`	`7899`	`}`
`7900`	`7900`
`7901`	`7901`	`static public float[] expand(float list[], int newSize) {`
`@@ -7905,7 +7905,7 @@ static public float[] expand(float list[], int newSize) {`
`7905`	`7905`	`}`
`7906`	`7906`
`7907`	`7907`	`static public double[] expand(double list[]) {`
`7908`		`- return expand(list, list.length << 1);`
	`7908`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7909`	`7909`	`}`
`7910`	`7910`
`7911`	`7911`	`static public double[] expand(double list[], int newSize) {`
`@@ -7915,7 +7915,7 @@ static public double[] expand(double list[], int newSize) {`
`7915`	`7915`	`}`
`7916`	`7916`
`7917`	`7917`	`static public String[] expand(String list[]) {`
`7918`		`- return expand(list, list.length << 1);`
	`7918`	`+ return expand(list, list.length > 0 ? list.length << 1 : 1);`
`7919`	`7919`	`}`
`7920`	`7920`
`7921`	`7921`	`static public String[] expand(String list[], int newSize) {`
`@@ -7929,7 +7929,8 @@ static public String[] expand(String list[], int newSize) {`
`7929`	`7929`	`* @nowebref`
`7930`	`7930`	`*/`
`7931`	`7931`	`static public Object expand(Object array) {`
`7932`		`- return expand(array, Array.getLength(array) << 1);`
	`7932`	`+ int len = Array.getLength(array);`
	`7933`	`+ return expand(array, len > 0 ? len << 1 : 1);`
`7933`	`7934`	`}`
`7934`	`7935`
`7935`	`7936`	`static public Object expand(Object list, int newSize) {`