From fc65ac081e0541982ed2e42961f14810f0d03848 Mon Sep 17 00:00:00 2001 From: Casey Reas Date: Sat, 15 Jan 2022 08:43:47 -0800 Subject: [PATCH] New keywords.txt for 4.0 beta releases --- java/keywords.txt | 81 +++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/java/keywords.txt b/java/keywords.txt index eafb70235..bf02b74d9 100644 --- a/java/keywords.txt +++ b/java/keywords.txt @@ -1,5 +1,10 @@ -# THE TEXT BELOW IS HAND WRITTEN AND FOUND IN THE FILE "keywords_base.txt" -# IN THE PROCESSING-DOCS REPO. DON'T EDITS THE keywords.txt FILE DIRECTLY. +# WELCOME TO KEYWORDS.TXT, THE FILE THAT DETERMINES +# THE COLOR CODING AND REFERENCE LINKS WITHIN THE +# PROCESSING DEVELOPMENT ENVIRONMENT (PDE) + +# THE TEXT THAT FOLLOWS IS FROM keywords_base.txt +# IN THE PROCESSING-WEBSITE REPO. IF YOU WANT TO MAKE A CHANGE, +# DO IT THERE, DO NOT EDIT THE keywords.txt FILE DIRECTLY. # For an explanation of these tags, see Token.java # trunk/processing/app/src/processing/app/syntax/Token.java @@ -89,7 +94,6 @@ GRAY LITERAL2 filter_ GREEN_MASK LITERAL2 GROUP LITERAL2 HALF LITERAL2 -HALF_PI LITERAL2 HALF_PI HAND LITERAL2 cursor_ HARD_LIGHT LITERAL2 blend_ HINT_COUNT LITERAL2 @@ -126,7 +130,6 @@ PDF LITERAL2 size_ P2D LITERAL2 size_ P3D LITERAL2 size_ PERSPECTIVE LITERAL2 -PI LITERAL2 PI PIE LITERAL2 PIXEL_CENTER LITERAL2 POINT LITERAL2 @@ -138,7 +141,6 @@ PROJECT LITERAL2 strokeCap_ QUAD LITERAL2 createShape_ QUAD_STRIP LITERAL2 beginShape_ QUADS LITERAL2 beginShape_ -QUARTER_PI LITERAL2 QUARTER_PI RAD_TO_DEG LITERAL2 RADIUS LITERAL2 RADIANS LITERAL2 @@ -165,7 +167,6 @@ SVG LITERAL2 SVIDEO LITERAL2 TAB LITERAL2 keyCode TARGA LITERAL2 -TAU LITERAL2 TAU TEXT LITERAL2 cursor_ TFF LITERAL2 THIRD_PI LITERAL2 @@ -178,7 +179,6 @@ TRIANGLES LITERAL2 beginShape_ TRIANGLE_STRIP LITERAL2 beginShape_ TUNER LITERAL2 TWO LITERAL2 -TWO_PI LITERAL2 TWO_PI UP LITERAL2 keyCode WAIT LITERAL2 cursor_ WHITESPACE LITERAL2 @@ -216,7 +216,7 @@ void KEYWORD1 void volatile KEYWORD1 -# Java keywords which can be followed by a parenthesis +# Java keywords that can be followed by a parenthesis assert KEYWORD6 case KEYWORD6 case @@ -235,7 +235,6 @@ Byte KEYWORD5 BufferedReader KEYWORD5 BufferedReader Character KEYWORD5 Class KEYWORD5 class -Double KEYWORD5 Float KEYWORD5 Integer KEYWORD5 HashMap KEYWORD5 HashMap @@ -249,11 +248,10 @@ byte KEYWORD5 byte char KEYWORD5 char color KEYWORD5 color_datatype double KEYWORD5 double -float KEYWORD5 float +float KEYWORD5 float int KEYWORD5 int long KEYWORD5 long -short KEYWORD5 -var KEYWORD5 +var KEYWORD5 # Flow structures @@ -327,10 +325,6 @@ setLong FUNCTION2 length KEYWORD2 String -# Temporary additions 3 September 2012 as the reference is getting updated -#end FUNCTION1 -#addChild FUNCTION1 - # Operators are without KEYWORDS += addassign @@ -369,25 +363,24 @@ length KEYWORD2 String ; semicolon -= subtractassign -# Suppressed from Generate to avoid conflicts with variables inside methods + +# Suppressed from Generate to avoid conflicts with +# variables inside methods width KEYWORD4 width_ height KEYWORD4 height_ -PVector FUNCTION1 PVector ArrayList FUNCTION1 ArrayList HashMap FUNCTION1 HashMap -# pixelHeight is not generating correctly: https://github.com/processing/processing-docs/issues/260 -pixelHeight KEYWORD4 pixelHeight - - -# THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE "keywords_base.txt" in processing/processing-docs/generate +# THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE +# "keywords_base.txt" in processing/processing-website # # THE TEXT BELOW IS AUTO-GENERATED # # SO +# PLEASE # DON'T # TOUCH # IT @@ -418,13 +411,13 @@ bezierTangent FUNCTION1 bezierTangent_ bezierVertex FUNCTION1 bezierVertex_ binary FUNCTION1 binary_ blend FUNCTION1 blend_ -blendColor FUNCTION1 blendColor_ blendMode FUNCTION1 blendMode_ blue FUNCTION1 blue_ box FUNCTION1 box_ brightness FUNCTION1 brightness_ camera FUNCTION1 camera_ ceil FUNCTION1 ceil_ +circle FUNCTION1 circle_ clear FUNCTION1 clear_ clip FUNCTION1 clip_ color FUNCTION1 color_ @@ -478,6 +471,8 @@ get FUNCTION2 FloatDict_get_ hasKey FUNCTION2 FloatDict_hasKey_ keyArray FUNCTION2 FloatDict_keyArray_ keys FUNCTION2 FloatDict_keys_ +maxIndex FUNCTION2 FloatDict_maxIndex_ +minIndex FUNCTION2 FloatDict_minIndex_ mult FUNCTION2 FloatDict_mult_ remove FUNCTION2 FloatDict_remove_ set FUNCTION2 FloatDict_set_ @@ -517,7 +512,7 @@ frustum FUNCTION1 frustum_ fullScreen FUNCTION1 fullScreen_ get FUNCTION1 get_ green FUNCTION1 green_ -HALF_PI LITERAL2 HALF_PI +HALF_PI KEYWORD4 HALF_PI hex FUNCTION1 hex_ hint FUNCTION1 hint_ hour FUNCTION1 hour_ @@ -600,8 +595,8 @@ setJSONObject FUNCTION2 JSONObject_setJSONObject_ setString FUNCTION2 JSONObject_setString_ key KEYWORD4 key keyCode KEYWORD4 keyCode -keyPressed FUNCTION4 keyPressed keyPressed KEYWORD4 keyPressed +keyPressed FUNCTION4 keyPressed keyReleased FUNCTION4 keyReleased keyTyped FUNCTION4 keyTyped launch FUNCTION1 launch_ @@ -626,6 +621,7 @@ log FUNCTION1 log_ loop FUNCTION1 loop_ mag FUNCTION1 mag_ map FUNCTION1 map_ +mask FUNCTION1 mask_ match FUNCTION1 match_ matchAll FUNCTION1 matchAll_ max FUNCTION1 max_ @@ -640,8 +636,8 @@ mouseButton KEYWORD4 mouseButton mouseClicked FUNCTION4 mouseClicked mouseDragged FUNCTION4 mouseDragged mouseMoved FUNCTION4 mouseMoved -mousePressed FUNCTION4 mousePressed mousePressed KEYWORD4 mousePressed +mousePressed FUNCTION4 mousePressed mouseReleased FUNCTION4 mouseReleased mouseWheel FUNCTION4 mouseWheel mouseX KEYWORD4 mouseX @@ -669,13 +665,14 @@ parseJSONObject FUNCTION1 parseJSONObject_ parseXML FUNCTION1 parseXML_ perspective FUNCTION1 perspective_ PFont KEYWORD5 PFont -list FUNCTION1 PFont_list_ +list FUNCTION2 PFont_list_ PGraphics KEYWORD5 PGraphics beginDraw FUNCTION2 PGraphics_beginDraw_ endDraw FUNCTION2 PGraphics_endDraw_ -PI LITERAL2 PI +PI KEYWORD4 PI PImage KEYWORD5 PImage blend FUNCTION2 PImage_blend_ +blendColor FUNCTION2 PImage_blendColor_ copy FUNCTION2 PImage_copy_ filter FUNCTION2 PImage_filter_ get FUNCTION2 PImage_get_ @@ -687,13 +684,14 @@ save FUNCTION2 PImage_save_ set FUNCTION2 PImage_set_ updatePixels FUNCTION2 PImage_updatePixels_ pixelDensity FUNCTION1 pixelDensity_ -pixelHeight FUNCTION1 pixelHeight_ +pixelHeight KEYWORD4 pixelHeight pixels KEYWORD4 pixels pixelWidth KEYWORD4 pixelWidth pmouseX KEYWORD4 pmouseX pmouseY KEYWORD4 pmouseY point FUNCTION1 point_ pointLight FUNCTION1 pointLight_ +pop FUNCTION1 pop_ popMatrix FUNCTION1 popMatrix_ popStyle FUNCTION1 popStyle_ pow FUNCTION1 pow_ @@ -704,7 +702,7 @@ println FUNCTION1 println_ printMatrix FUNCTION1 printMatrix_ printProjection FUNCTION1 printProjection_ PShader KEYWORD5 PShader -PShader FUNCTION2 PShader_set_ +set FUNCTION2 PShader_set_ PShape KEYWORD5 PShape addChild FUNCTION2 PShape_addChild_ beginContour FUNCTION2 PShape_beginContour_ @@ -729,6 +727,7 @@ setStroke FUNCTION2 PShape_setStroke_ setVertex FUNCTION2 PShape_setVertex_ setVisible FUNCTION2 PShape_setVisible_ translate FUNCTION2 PShape_translate_ +push FUNCTION1 push_ pushMatrix FUNCTION1 pushMatrix_ pushStyle FUNCTION1 pushStyle_ PVector KEYWORD5 PVector @@ -741,7 +740,6 @@ dist FUNCTION2 PVector_dist_ div FUNCTION2 PVector_div_ dot FUNCTION2 PVector_dot_ fromAngle FUNCTION2 PVector_fromAngle_ -get FUNCTION2 PVector_get_ heading FUNCTION2 PVector_heading_ lerp FUNCTION2 PVector_lerp_ limit FUNCTION2 PVector_limit_ @@ -757,7 +755,7 @@ setMag FUNCTION2 PVector_setMag_ sub FUNCTION2 PVector_sub_ quad FUNCTION1 quad_ quadraticVertex FUNCTION1 quadraticVertex_ -QUARTER_PI LITERAL2 QUARTER_PI +QUARTER_PI KEYWORD4 QUARTER_PI radians FUNCTION1 radians_ random FUNCTION1 random_ randomGaussian FUNCTION1 randomGaussian_ @@ -794,7 +792,10 @@ selectFolder FUNCTION1 selectFolder_ selectInput FUNCTION1 selectInput_ selectOutput FUNCTION1 selectOutput_ set FUNCTION1 set_ +setLocation FUNCTION1 setLocation_ +setResizable FUNCTION1 setResizable_ settings FUNCTION4 settings +setTitle FUNCTION1 setTitle_ setup FUNCTION4 setup shader FUNCTION1 shader_ shape FUNCTION1 shape_ @@ -816,6 +817,7 @@ splitTokens FUNCTION1 splitTokens_ spotLight FUNCTION1 spotLight_ sq FUNCTION1 sq_ sqrt FUNCTION1 sqrt_ +square FUNCTION1 square_ StringDict KEYWORD5 StringDict clear FUNCTION2 StringDict_clear_ get FUNCTION2 StringDict_get_ @@ -865,6 +867,7 @@ getRowCount FUNCTION2 Table_getRowCount_ getString FUNCTION2 Table_getString_ getStringColumn FUNCTION2 Table_getStringColumn_ matchRow FUNCTION2 Table_matchRow_ +matchRowIterator FUNCTION2 Table_matchRowIterator_ matchRows FUNCTION2 Table_matchRows_ removeColumn FUNCTION2 Table_removeColumn_ removeRow FUNCTION2 Table_removeRow_ @@ -873,6 +876,7 @@ rows FUNCTION2 Table_rows_ setFloat FUNCTION2 Table_setFloat_ setInt FUNCTION2 Table_setInt_ setString FUNCTION2 Table_setString_ +sort FUNCTION2 Table_sort_ trim FUNCTION2 Table_trim_ TableRow KEYWORD5 TableRow getColumnCount FUNCTION2 TableRow_getColumnCount_ @@ -884,7 +888,7 @@ setFloat FUNCTION2 TableRow_setFloat_ setInt FUNCTION2 TableRow_setInt_ setString FUNCTION2 TableRow_setString_ tan FUNCTION1 tan_ -TAU LITERAL2 TAU +TAU KEYWORD4 TAU text FUNCTION1 text_ textAlign FUNCTION1 textAlign_ textAscent FUNCTION1 textAscent_ @@ -902,7 +906,7 @@ tint FUNCTION1 tint_ translate FUNCTION1 translate_ triangle FUNCTION1 triangle_ trim FUNCTION1 trim_ -TWO_PI LITERAL2 TWO_PI +TWO_PI KEYWORD4 TWO_PI unbinary FUNCTION1 unbinary_ unhex FUNCTION1 unhex_ updatePixels FUNCTION1 updatePixels_ @@ -912,12 +916,13 @@ addChild FUNCTION2 XML_addChild_ format FUNCTION2 XML_format_ getAttributeCount FUNCTION2 XML_getAttributeCount_ getChild FUNCTION2 XML_getChild_ +getChildCount FUNCTION2 XML_getChildCount_ getChildren FUNCTION2 XML_getChildren_ getContent FUNCTION2 XML_getContent_ getFloat FUNCTION2 XML_getFloat_ -getContent FUNCTION2 XML_getFloatContent_ +getFloatContent FUNCTION2 XML_getFloatContent_ getInt FUNCTION2 XML_getInt_ -getContent FUNCTION2 XML_getIntContent_ +getIntContent FUNCTION2 XML_getIntContent_ getName FUNCTION2 XML_getName_ getParent FUNCTION2 XML_getParent_ getString FUNCTION2 XML_getString_ @@ -925,10 +930,12 @@ hasAttribute FUNCTION2 XML_hasAttribute_ hasChildren FUNCTION2 XML_hasChildren_ listAttributes FUNCTION2 XML_listAttributes_ listChildren FUNCTION2 XML_listChildren_ +parse FUNCTION2 XML_parse_ removeChild FUNCTION2 XML_removeChild_ setContent FUNCTION2 XML_setContent_ setFloat FUNCTION2 XML_setFloat_ setInt FUNCTION2 XML_setInt_ +setLong FUNCTION2 XML_setLong_ setName FUNCTION2 XML_setName_ setString FUNCTION2 XML_setString_ toString FUNCTION2 XML_toString_