Skip to content

Commit fc65ac0

Browse files
committed
New keywords.txt for 4.0 beta releases
1 parent 86fed23 commit fc65ac0

File tree

1 file changed

+44
-37
lines changed

1 file changed

+44
-37
lines changed

java/keywords.txt

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
# THE TEXT BELOW IS HAND WRITTEN AND FOUND IN THE FILE "keywords_base.txt"
2-
# IN THE PROCESSING-DOCS REPO. DON'T EDITS THE keywords.txt FILE DIRECTLY.
1+
# WELCOME TO KEYWORDS.TXT, THE FILE THAT DETERMINES
2+
# THE COLOR CODING AND REFERENCE LINKS WITHIN THE
3+
# PROCESSING DEVELOPMENT ENVIRONMENT (PDE)
4+
5+
# THE TEXT THAT FOLLOWS IS FROM keywords_base.txt
6+
# IN THE PROCESSING-WEBSITE REPO. IF YOU WANT TO MAKE A CHANGE,
7+
# DO IT THERE, DO NOT EDIT THE keywords.txt FILE DIRECTLY.
38

49
# For an explanation of these tags, see Token.java
510
# trunk/processing/app/src/processing/app/syntax/Token.java
@@ -89,7 +94,6 @@ GRAY LITERAL2 filter_
8994
GREEN_MASK LITERAL2
9095
GROUP LITERAL2
9196
HALF LITERAL2
92-
HALF_PI LITERAL2 HALF_PI
9397
HAND LITERAL2 cursor_
9498
HARD_LIGHT LITERAL2 blend_
9599
HINT_COUNT LITERAL2
@@ -126,7 +130,6 @@ PDF LITERAL2 size_
126130
P2D LITERAL2 size_
127131
P3D LITERAL2 size_
128132
PERSPECTIVE LITERAL2
129-
PI LITERAL2 PI
130133
PIE LITERAL2
131134
PIXEL_CENTER LITERAL2
132135
POINT LITERAL2
@@ -138,7 +141,6 @@ PROJECT LITERAL2 strokeCap_
138141
QUAD LITERAL2 createShape_
139142
QUAD_STRIP LITERAL2 beginShape_
140143
QUADS LITERAL2 beginShape_
141-
QUARTER_PI LITERAL2 QUARTER_PI
142144
RAD_TO_DEG LITERAL2
143145
RADIUS LITERAL2
144146
RADIANS LITERAL2
@@ -165,7 +167,6 @@ SVG LITERAL2
165167
SVIDEO LITERAL2
166168
TAB LITERAL2 keyCode
167169
TARGA LITERAL2
168-
TAU LITERAL2 TAU
169170
TEXT LITERAL2 cursor_
170171
TFF LITERAL2
171172
THIRD_PI LITERAL2
@@ -178,7 +179,6 @@ TRIANGLES LITERAL2 beginShape_
178179
TRIANGLE_STRIP LITERAL2 beginShape_
179180
TUNER LITERAL2
180181
TWO LITERAL2
181-
TWO_PI LITERAL2 TWO_PI
182182
UP LITERAL2 keyCode
183183
WAIT LITERAL2 cursor_
184184
WHITESPACE LITERAL2
@@ -216,7 +216,7 @@ void KEYWORD1 void
216216
volatile KEYWORD1
217217

218218

219-
# Java keywords which can be followed by a parenthesis
219+
# Java keywords that can be followed by a parenthesis
220220

221221
assert KEYWORD6
222222
case KEYWORD6 case
@@ -235,7 +235,6 @@ Byte KEYWORD5
235235
BufferedReader KEYWORD5 BufferedReader
236236
Character KEYWORD5
237237
Class KEYWORD5 class
238-
Double KEYWORD5
239238
Float KEYWORD5
240239
Integer KEYWORD5
241240
HashMap KEYWORD5 HashMap
@@ -249,11 +248,10 @@ byte KEYWORD5 byte
249248
char KEYWORD5 char
250249
color KEYWORD5 color_datatype
251250
double KEYWORD5 double
252-
float KEYWORD5 float
251+
float KEYWORD5 float
253252
int KEYWORD5 int
254253
long KEYWORD5 long
255-
short KEYWORD5
256-
var KEYWORD5
254+
var KEYWORD5
257255

258256

259257
# Flow structures
@@ -327,10 +325,6 @@ setLong FUNCTION2
327325
length KEYWORD2 String
328326

329327

330-
# Temporary additions 3 September 2012 as the reference is getting updated
331-
#end FUNCTION1
332-
#addChild FUNCTION1
333-
334328
# Operators are without KEYWORDS
335329

336330
+= addassign
@@ -369,25 +363,24 @@ length KEYWORD2 String
369363
; semicolon
370364
-= subtractassign
371365

372-
# Suppressed from Generate to avoid conflicts with variables inside methods
366+
367+
# Suppressed from Generate to avoid conflicts with
368+
# variables inside methods
373369

374370
width KEYWORD4 width_
375371
height KEYWORD4 height_
376372

377-
PVector FUNCTION1 PVector
378373
ArrayList FUNCTION1 ArrayList
379374
HashMap FUNCTION1 HashMap
380375

381-
# pixelHeight is not generating correctly: https://github.com/processing/processing-docs/issues/260
382-
383-
pixelHeight KEYWORD4 pixelHeight
384-
385376

386-
# THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE "keywords_base.txt" in processing/processing-docs/generate
377+
# THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE
378+
# "keywords_base.txt" in processing/processing-website
387379
#
388380
# THE TEXT BELOW IS AUTO-GENERATED
389381
#
390382
# SO
383+
# PLEASE
391384
# DON'T
392385
# TOUCH
393386
# IT
@@ -418,13 +411,13 @@ bezierTangent FUNCTION1 bezierTangent_
418411
bezierVertex FUNCTION1 bezierVertex_
419412
binary FUNCTION1 binary_
420413
blend FUNCTION1 blend_
421-
blendColor FUNCTION1 blendColor_
422414
blendMode FUNCTION1 blendMode_
423415
blue FUNCTION1 blue_
424416
box FUNCTION1 box_
425417
brightness FUNCTION1 brightness_
426418
camera FUNCTION1 camera_
427419
ceil FUNCTION1 ceil_
420+
circle FUNCTION1 circle_
428421
clear FUNCTION1 clear_
429422
clip FUNCTION1 clip_
430423
color FUNCTION1 color_
@@ -478,6 +471,8 @@ get FUNCTION2 FloatDict_get_
478471
hasKey FUNCTION2 FloatDict_hasKey_
479472
keyArray FUNCTION2 FloatDict_keyArray_
480473
keys FUNCTION2 FloatDict_keys_
474+
maxIndex FUNCTION2 FloatDict_maxIndex_
475+
minIndex FUNCTION2 FloatDict_minIndex_
481476
mult FUNCTION2 FloatDict_mult_
482477
remove FUNCTION2 FloatDict_remove_
483478
set FUNCTION2 FloatDict_set_
@@ -517,7 +512,7 @@ frustum FUNCTION1 frustum_
517512
fullScreen FUNCTION1 fullScreen_
518513
get FUNCTION1 get_
519514
green FUNCTION1 green_
520-
HALF_PILITERAL2HALF_PI
515+
HALF_PIKEYWORD4HALF_PI
521516
hex FUNCTION1 hex_
522517
hint FUNCTION1 hint_
523518
hour FUNCTION1 hour_
@@ -600,8 +595,8 @@ setJSONObject FUNCTION2 JSONObject_setJSONObject_
600595
setString FUNCTION2 JSONObject_setString_
601596
key KEYWORD4 key
602597
keyCode KEYWORD4 keyCode
603-
keyPressed FUNCTION4 keyPressed
604598
keyPressed KEYWORD4 keyPressed
599+
keyPressed FUNCTION4 keyPressed
605600
keyReleased FUNCTION4 keyReleased
606601
keyTyped FUNCTION4 keyTyped
607602
launch FUNCTION1 launch_
@@ -626,6 +621,7 @@ log FUNCTION1 log_
626621
loop FUNCTION1 loop_
627622
mag FUNCTION1 mag_
628623
map FUNCTION1 map_
624+
mask FUNCTION1 mask_
629625
match FUNCTION1 match_
630626
matchAll FUNCTION1 matchAll_
631627
max FUNCTION1 max_
@@ -640,8 +636,8 @@ mouseButton KEYWORD4 mouseButton
640636
mouseClicked FUNCTION4 mouseClicked
641637
mouseDragged FUNCTION4 mouseDragged
642638
mouseMoved FUNCTION4 mouseMoved
643-
mousePressed FUNCTION4 mousePressed
644639
mousePressed KEYWORD4 mousePressed
640+
mousePressed FUNCTION4 mousePressed
645641
mouseReleased FUNCTION4 mouseReleased
646642
mouseWheel FUNCTION4 mouseWheel
647643
mouseX KEYWORD4 mouseX
@@ -669,13 +665,14 @@ parseJSONObject FUNCTION1 parseJSONObject_
669665
parseXML FUNCTION1 parseXML_
670666
perspective FUNCTION1 perspective_
671667
PFont KEYWORD5 PFont
672-
listFUNCTION1PFont_list_
668+
listFUNCTION2PFont_list_
673669
PGraphics KEYWORD5 PGraphics
674670
beginDraw FUNCTION2 PGraphics_beginDraw_
675671
endDraw FUNCTION2 PGraphics_endDraw_
676-
PILITERAL2PI
672+
PIKEYWORD4PI
677673
PImage KEYWORD5 PImage
678674
blend FUNCTION2 PImage_blend_
675+
blendColor FUNCTION2 PImage_blendColor_
679676
copy FUNCTION2 PImage_copy_
680677
filter FUNCTION2 PImage_filter_
681678
get FUNCTION2 PImage_get_
@@ -687,13 +684,14 @@ save FUNCTION2 PImage_save_
687684
set FUNCTION2 PImage_set_
688685
updatePixels FUNCTION2 PImage_updatePixels_
689686
pixelDensity FUNCTION1 pixelDensity_
690-
pixelHeightFUNCTION1 pixelHeight_
687+
pixelHeightKEYWORD4 pixelHeight
691688
pixels KEYWORD4 pixels
692689
pixelWidth KEYWORD4 pixelWidth
693690
pmouseX KEYWORD4 pmouseX
694691
pmouseY KEYWORD4 pmouseY
695692
point FUNCTION1 point_
696693
pointLight FUNCTION1 pointLight_
694+
pop FUNCTION1 pop_
697695
popMatrix FUNCTION1 popMatrix_
698696
popStyle FUNCTION1 popStyle_
699697
pow FUNCTION1 pow_
@@ -704,7 +702,7 @@ println FUNCTION1 println_
704702
printMatrix FUNCTION1 printMatrix_
705703
printProjection FUNCTION1 printProjection_
706704
PShader KEYWORD5 PShader
707-
PShaderFUNCTION2 PShader_set_
705+
setFUNCTION2 PShader_set_
708706
PShape KEYWORD5 PShape
709707
addChild FUNCTION2 PShape_addChild_
710708
beginContour FUNCTION2 PShape_beginContour_
@@ -729,6 +727,7 @@ setStroke FUNCTION2 PShape_setStroke_
729727
setVertex FUNCTION2 PShape_setVertex_
730728
setVisible FUNCTION2 PShape_setVisible_
731729
translate FUNCTION2 PShape_translate_
730+
push FUNCTION1 push_
732731
pushMatrix FUNCTION1 pushMatrix_
733732
pushStyle FUNCTION1 pushStyle_
734733
PVector KEYWORD5 PVector
@@ -741,7 +740,6 @@ dist FUNCTION2 PVector_dist_
741740
div FUNCTION2 PVector_div_
742741
dot FUNCTION2 PVector_dot_
743742
fromAngle FUNCTION2 PVector_fromAngle_
744-
get FUNCTION2 PVector_get_
745743
heading FUNCTION2 PVector_heading_
746744
lerp FUNCTION2 PVector_lerp_
747745
limit FUNCTION2 PVector_limit_
@@ -757,7 +755,7 @@ setMag FUNCTION2 PVector_setMag_
757755
sub FUNCTION2 PVector_sub_
758756
quad FUNCTION1 quad_
759757
quadraticVertex FUNCTION1 quadraticVertex_
760-
QUARTER_PILITERAL2QUARTER_PI
758+
QUARTER_PIKEYWORD4QUARTER_PI
761759
radians FUNCTION1 radians_
762760
random FUNCTION1 random_
763761
randomGaussian FUNCTION1 randomGaussian_
@@ -794,7 +792,10 @@ selectFolder FUNCTION1 selectFolder_
794792
selectInput FUNCTION1 selectInput_
795793
selectOutput FUNCTION1 selectOutput_
796794
set FUNCTION1 set_
795+
setLocation FUNCTION1 setLocation_
796+
setResizable FUNCTION1 setResizable_
797797
settings FUNCTION4 settings
798+
setTitle FUNCTION1 setTitle_
798799
setup FUNCTION4 setup
799800
shader FUNCTION1 shader_
800801
shape FUNCTION1 shape_
@@ -816,6 +817,7 @@ splitTokens FUNCTION1 splitTokens_
816817
spotLight FUNCTION1 spotLight_
817818
sq FUNCTION1 sq_
818819
sqrt FUNCTION1 sqrt_
820+
square FUNCTION1 square_
819821
StringDict KEYWORD5 StringDict
820822
clear FUNCTION2 StringDict_clear_
821823
get FUNCTION2 StringDict_get_
@@ -865,6 +867,7 @@ getRowCount FUNCTION2 Table_getRowCount_
865867
getString FUNCTION2 Table_getString_
866868
getStringColumn FUNCTION2 Table_getStringColumn_
867869
matchRow FUNCTION2 Table_matchRow_
870+
matchRowIterator FUNCTION2 Table_matchRowIterator_
868871
matchRows FUNCTION2 Table_matchRows_
869872
removeColumn FUNCTION2 Table_removeColumn_
870873
removeRow FUNCTION2 Table_removeRow_
@@ -873,6 +876,7 @@ rows FUNCTION2 Table_rows_
873876
setFloat FUNCTION2 Table_setFloat_
874877
setInt FUNCTION2 Table_setInt_
875878
setString FUNCTION2 Table_setString_
879+
sort FUNCTION2 Table_sort_
876880
trim FUNCTION2 Table_trim_
877881
TableRow KEYWORD5 TableRow
878882
getColumnCount FUNCTION2 TableRow_getColumnCount_
@@ -884,7 +888,7 @@ setFloat FUNCTION2 TableRow_setFloat_
884888
setInt FUNCTION2 TableRow_setInt_
885889
setString FUNCTION2 TableRow_setString_
886890
tan FUNCTION1 tan_
887-
TAULITERAL2TAU
891+
TAUKEYWORD4TAU
888892
text FUNCTION1 text_
889893
textAlign FUNCTION1 textAlign_
890894
textAscent FUNCTION1 textAscent_
@@ -902,7 +906,7 @@ tint FUNCTION1 tint_
902906
translate FUNCTION1 translate_
903907
triangle FUNCTION1 triangle_
904908
trim FUNCTION1 trim_
905-
TWO_PILITERAL2TWO_PI
909+
TWO_PIKEYWORD4TWO_PI
906910
unbinary FUNCTION1 unbinary_
907911
unhex FUNCTION1 unhex_
908912
updatePixels FUNCTION1 updatePixels_
@@ -912,23 +916,26 @@ addChild FUNCTION2 XML_addChild_
912916
format FUNCTION2 XML_format_
913917
getAttributeCount FUNCTION2 XML_getAttributeCount_
914918
getChild FUNCTION2 XML_getChild_
919+
getChildCount FUNCTION2 XML_getChildCount_
915920
getChildren FUNCTION2 XML_getChildren_
916921
getContent FUNCTION2 XML_getContent_
917922
getFloat FUNCTION2 XML_getFloat_
918-
getContentFUNCTION2 XML_getFloatContent_
923+
getFloatContentFUNCTION2 XML_getFloatContent_
919924
getInt FUNCTION2 XML_getInt_
920-
getContentFUNCTION2 XML_getIntContent_
925+
getIntContentFUNCTION2 XML_getIntContent_
921926
getName FUNCTION2 XML_getName_
922927
getParent FUNCTION2 XML_getParent_
923928
getString FUNCTION2 XML_getString_
924929
hasAttribute FUNCTION2 XML_hasAttribute_
925930
hasChildren FUNCTION2 XML_hasChildren_
926931
listAttributes FUNCTION2 XML_listAttributes_
927932
listChildren FUNCTION2 XML_listChildren_
933+
parse FUNCTION2 XML_parse_
928934
removeChild FUNCTION2 XML_removeChild_
929935
setContent FUNCTION2 XML_setContent_
930936
setFloat FUNCTION2 XML_setFloat_
931937
setInt FUNCTION2 XML_setInt_
938+
setLong FUNCTION2 XML_setLong_
932939
setName FUNCTION2 XML_setName_
933940
setString FUNCTION2 XML_setString_
934941
toString FUNCTION2 XML_toString_

0 commit comments

Comments
 (0)