From 8c3527ec5bcb97933344c3f5f269dd59742290df Mon Sep 17 00:00:00 2001 From: Builders Brewery Date: Fri, 28 Jun 2013 17:42:57 +0200 Subject: [PATCH] updated LSL mode - added changes from wiki.secondlife.com/wiki/Release_Notes/Second_Life_RC_LeTigre/13#13.06.21.277682 to highlight rules and snippets - reviewed invalid grammar and text mode test --- demo/kitchen-sink/docs/lsl.lsl | 6 +++--- lib/ace/mode/_test/tokens_lsl.json | 14 +++++++------- lib/ace/mode/lsl_highlight_rules.js | 24 ++++++++++++++---------- lib/ace/snippets/lsl.snippets | 4 ++-- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/demo/kitchen-sink/docs/lsl.lsl b/demo/kitchen-sink/docs/lsl.lsl index 185b9dd4..474e3023 100644 --- a/demo/kitchen-sink/docs/lsl.lsl +++ b/demo/kitchen-sink/docs/lsl.lsl @@ -8,7 +8,7 @@ integer someIntNormal = 3672; integer someIntHex = 0x00000000; integer someIntMath = PI_BY_TWO; -integer event = 5673; // invalid reserved keyword! +integer event = 5673; // unimplemented reserved keyword! key someKeyTexture = TEXTURE_DEFAULT; string someStringSpecial = EOF; @@ -53,12 +53,12 @@ default someIntHex = 0x00000000; someIntMath = PI_BY_TWO; - event = 5673; // invalid reserved keyword! + event = 5673; // unimplemented reserved keyword! someKeyTexture = TEXTURE_DEFAULT; someStringSpecial = EOF; - llCollisionSprite(someKeyTexture); // invalid deprecated function! + llCloud(ZERO_VECTOR); // invalid deprecated function! llWhisper(PUBLIC_CHANNEL, "Leaving \"default\" now..."); state other; diff --git a/lib/ace/mode/_test/tokens_lsl.json b/lib/ace/mode/_test/tokens_lsl.json index a34106a6..1e30c7c6 100644 --- a/lib/ace/mode/_test/tokens_lsl.json +++ b/lib/ace/mode/_test/tokens_lsl.json @@ -51,14 +51,14 @@ "start", ["storage.type.lsl","integer"], ["text.lsl"," "], - ["invalid.illegal.lsl","event"], + ["invalid.unimplemented.lsl","event"], ["text.lsl"," "], ["keyword.operator.lsl","="], ["text.lsl"," "], ["constant.numeric.lsl","5673"], ["punctuation.operator.lsl",";"], ["text.lsl"," "], - ["comment.line.double-slash.lsl","// invalid reserved keyword!"] + ["comment.line.double-slash.lsl","// unimplemented reserved keyword!"] ],[ "start" ],[ @@ -368,14 +368,14 @@ ],[ "start", ["text.lsl"," "], - ["invalid.illegal.lsl","event"], + ["invalid.unimplemented.lsl","event"], ["text.lsl"," "], ["keyword.operator.lsl","="], ["text.lsl"," "], ["constant.numeric.lsl","5673"], ["punctuation.operator.lsl",";"], ["text.lsl"," "], - ["comment.line.double-slash.lsl","// invalid reserved keyword!"] + ["comment.line.double-slash.lsl","// unimplemented reserved keyword!"] ],[ "start" ],[ @@ -401,12 +401,12 @@ ],[ "start", ["text.lsl"," "], - ["invalid.deprecated.lsl","llCollisionSprite"], + ["invalid.deprecated.lsl","llCloud"], ["paren.lparen.lsl","("], - ["identifier","someKeyTexture"], + ["constant.language.vector.lsl","ZERO_VECTOR"], ["paren.rparen.lsl",")"], ["punctuation.operator.lsl",";"], - ["text.lsl"," "], + ["text.lsl"," "], ["comment.line.double-slash.lsl","// invalid deprecated function!"] ],[ "start" diff --git a/lib/ace/mode/lsl_highlight_rules.js b/lib/ace/mode/lsl_highlight_rules.js index d774eb08..752abc21 100644 --- a/lib/ace/mode/lsl_highlight_rules.js +++ b/lib/ace/mode/lsl_highlight_rules.js @@ -194,17 +194,21 @@ function LSLHighlightRules() { "TEXTURE_BLANK|TEXTURE_DEFAULT|TEXTURE_MEDIA|TEXTURE_PLYWOOD|" + "TEXTURE_TRANSPARENT|URL_REQUEST_DENIED|URL_REQUEST_GRANTED", "constant.language.vector.lsl" : "TOUCH_INVALID_TEXCOORD|TOUCH_INVALID_VECTOR|ZERO_VECTOR", - "invalid.deprecated.lsl" : "llCloud|llCollisionSprite|llGodLikeRezObject|" + - "llMakeExplosion|llMakeFountain|llMakeSmoke|llMakeFire|llPointAt|llStopPointAt|" + - "llRefreshPrimURL|llSetPrimURL|llReleaseCamera|llTakeCamera|llRemoteDataSetRegion|" + - "llRemoteLoadScript|llSetInventoryPermMask|llSetObjectPermMask|llSound|" + - "llSoundPreload|llXorBase64Strings|ATTACH_LPEC|ATTACH_RPEC|CHARACTER_MAX_ANGULAR_ACCEL|" + + "invalid.broken.lsl": "LAND_LARGE_BRUSH|LAND_MEDIUM_BRUSH|LAND_SMALL_BRUSH", + "invalid.deprecated.lsl" : "ATTACH_LPEC|ATTACH_RPEC|CHARACTER_MAX_ANGULAR_ACCEL|" + "CHARACTER_MAX_ANGULAR_SPEED|CHARACTER_TURN_SPEED_MULTIPLIER|DATA_RATING|" + - "LAND_LARGE_BRUSH|LAND_MEDIUM_BRUSH|LAND_SMALL_BRUSH|PERMISSION_CHANGE_JOINTS|" + - "PERMISSION_CHANGE_PERMISSIONS|PERMISSION_RELEASE_OWNERSHIP|PERMISSION_REMAP_CONTROLS|" + "PRIM_CAST_SHADOWS|PRIM_MATERIAL_LIGHT|PRIM_PHYSICS_MATERIAL|PRIM_TYPE_LEGACY|" + - "PSYS_SRC_INNERANGLE|PSYS_SRC_OBJ_REL_MASK|PSYS_SRC_OUTERANGLE|VEHICLE_FLAG_NO_FLY_UP", - "invalid.illegal.lsl" : "event|print", + "PSYS_SRC_INNERANGLE|PSYS_SRC_OUTERANGLE|VEHICLE_FLAG_NO_FLY_UP|llCloud|" + + "llGodLikeRezObject|llMakeExplosion|llMakeFire|llMakeFountain|llMakeSmoke|" + + "llRemoteDataSetRegion|llSetInventoryPermMask|llSetObjectPermMask|llSound|" + + "llSoundPreload|llXorBase64Strings|llXorBase64StringsCorrect", + "invalid.godmode.lsl": "llGodLikeRezObject|llSetInventoryPermMask|llSetObjectPermMask", + "invalid.illegal.lsl" : "print", + "invalid.unimplemented.lsl": "CHARACTER_MAX_ANGULAR_ACCEL|CHARACTER_MAX_ANGULAR_SPEED|" + + "CHARACTER_TURN_SPEED_MULTIPLIER|PERMISSION_CHANGE_JOINTS|PERMISSION_CHANGE_PERMISSIONS|" + + "PERMISSION_RELEASE_OWNERSHIP|PERMISSION_REMAP_CONTROLS|PRIM_PHYSICS_MATERIAL|PRIM_TYPE_LEGACY|" + + "PSYS_SRC_OBJ_REL_MASK|event|llCollisionSprite|llPointAt|llRefreshPrimURL|" + + "llReleaseCamera|llRemoteLoadScript|llSetPrimURL|llStopPointAt|llTakeCamera", "keyword.control.lsl" : "do|else|for|if|jump|return|while", "storage.type.lsl" : "float|integer|key|list|quaternion|rotation|string|vector", "support.function.lsl": "llAbs|llAcos|llAddToLandBanList|llAddToLandPassList|" + @@ -287,7 +291,7 @@ function LSLHighlightRules() { "llTeleportAgent|llTeleportAgentGlobalCoords|llTeleportAgentHome|llTextBox|" + "llToLower|llToUpper|llTransferLindenDollars|llTriggerSound|llTriggerSoundLimited|" + "llUnescapeURL|llUnSit|llUpdateCharacter|llVecDist|llVecMag|llVecNorm|" + - "llVolumeDetect|llWanderWithin|llWater|llWhisper|llWind|llXorBase64StringsCorrect", + "llVolumeDetect|llWanderWithin|llWater|llWhisper|llWind|llXorBase64", "support.function.event.lsl" : "at_rot_target|at_target|attach|changed|collision|" + "collision_end|collision_start|control|dataserver|email|http_request|" + "http_response|land_collision|land_collision_end|land_collision_start|" + diff --git a/lib/ace/snippets/lsl.snippets b/lib/ace/snippets/lsl.snippets index 3dfca48e..e65f7771 100644 --- a/lib/ace/snippets/lsl.snippets +++ b/lib/ace/snippets/lsl.snippets @@ -821,8 +821,8 @@ snippet llWhisper llWhisper(${1:integer channel}, ${2:string msg}) snippet llWind llWind(${1:vector offset}) -snippet llXorBase64StringsCorrect - llXorBase64StringsCorrect(${1:string str1}, ${2:string str2} +snippet llXorBase64 + llXorBase64(${1:string str1}, ${2:string str2} snippet money money(${1:key id}, ${2:integer amount}) {