File tree Expand file tree Collapse file tree 3 files changed +15
-12
lines changed
src/processing/mode/java/preproc Expand file tree Collapse file tree 3 files changed +15
-12
lines changed Original file line number Diff line number Diff line change 44 * - changes main entry point to reflect sketch types 'static' | 'active'
55 * - adds support for type converter functions like "int()"
66 * - adds pseudo primitive type "color"
7- * - adds HTML hex notation with hash symbol: #ff5522
7+ * - adds HTML hex notation with hash symbol: #ff5522
8+ * - allow color to appear as part of qualified names (like in imports)
89 */
910
1011grammar Processing;
@@ -47,8 +48,8 @@ variableDeclaratorId
4748// https://github.com/processing/processing/issues/93
4849// prevent from types being used as variable names
4950warnTypeAsVariableName
50- : primitiveType (' [' ' ]' )* {
51- notifyErrorListeners(" Type names are not allowed as variable names: " +$primitiveType.text);
51+ : primitiveType (' [' ' ]' )* {
52+ notifyErrorListeners(" Type names are not allowed as variable names: " +$primitiveType.text);
5253 }
5354 ;
5455
@@ -89,6 +90,10 @@ colorPrimitiveType
8990 : ' color'
9091 ;
9192
93+ qualifiedName
94+ : (IDENTIFIER | colorPrimitiveType) (' .' (IDENTIFIER | colorPrimitiveType))*
95+ ;
96+
9297// added HexColorLiteral
9398literal
9499 : integerLiteral
@@ -127,4 +132,3 @@ LINE_COMMENT
127132 ;
128133
129134CHAR_LITERAL : ' \' ' (~[' \\\r\n ] | EscapeSequence)* ' \' ' ; // A bit nasty but let JDT tackle invalid chars
130-
Original file line number Diff line number Diff line change @@ -3,6 +3,8 @@ import processing.data.*;
33import processing.event.*;
44import processing.opengl.*;
55
6+ import test.color;
7+
68import java.util.HashMap;
79import java.util.ArrayList;
810import java.io.File;
@@ -12,19 +14,18 @@ import java.io.InputStream;
1214import java.io.OutputStream;
1315import java.io.IOException;
1416
15- import test.color;
16-
1717public class colorimport extends PApplet {
1818
1919 public void setup() {
20+
21+
2022boolean test = true;
21- int c1 = color(255, 255, 255);
22- int c2 = test ? 0xFFA011CD : 0xC0C0C0C0;
23- noLoop();
23+
24+ noLoop();
2425 }
2526
2627 static public void main(String[] passedArgs) {
27- String[] appletArgs = new String[] { "color " };
28+ String[] appletArgs = new String[] { "colorimport " };
2829 if (passedArgs != null) {
2930 PApplet.main(concat(appletArgs, passedArgs));
3031 } else {
Original file line number Diff line number Diff line change 11import test.color ;
22
33boolean test = true ;
4- color c1 = color (255 , 255 , 255 );
5- color c2 = test ? #A011CD : #C0C0C0C0 ;
You can’t perform that action at this time.
0 commit comments