From fc1551312dbd09aae9b3cf23c9c8c8c4b2694d41 Mon Sep 17 00:00:00 2001 From: Sei Lisa Date: Thu, 30 Nov 2017 02:09:42 +0100 Subject: [PATCH] Give error when trying to extract a member of a constant vector/rot e.g. ZERO_VECTOR.x Introduced in 24127a6 when constants were added to builtins.txt. Fixes #63. --- lslmini.cc | 7 +++++-- scripts/bugs/0063.lsl | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 scripts/bugs/0063.lsl diff --git a/lslmini.cc b/lslmini.cc index 315fe98..e4abc1c 100644 --- a/lslmini.cc +++ b/lslmini.cc @@ -185,7 +185,7 @@ void LLASTNode::define_symbol(LLScriptSymbol *symbol) { if ( parent ) { shadow = parent->lookup_symbol(symbol->get_name(), SYM_ANY); - if ( shadow!= NULL ) { + if ( shadow != NULL ) { if (shadow->get_sub_type() == SYM_BUILTIN) { // Events and constants are reserved; functions aren't. @@ -256,7 +256,7 @@ void LLScriptGlobalVariable::define_symbols() { identifier->set_symbol( new LLScriptSymbol(identifier->get_name(), identifier->get_type(), SYM_VARIABLE, SYM_GLOBAL, identifier->get_lloc())); define_symbol(identifier->get_symbol()); - // if it's initialized, set it's constant value + // if it's initialized, set its constant value if ( get_child(1)->get_node_type() == NODE_SIMPLE_ASSIGNABLE ) identifier->get_symbol()->set_constant_value( get_child(1)->get_child(0)->get_constant_value() ); } @@ -638,6 +638,9 @@ void LLScriptFunctionExpression::determine_type() { void LLScriptLValueExpression::determine_type() { LLScriptIdentifier *id = (LLScriptIdentifier *) get_child(0); id->resolve_symbol( SYM_VARIABLE ); + if ( id->get_symbol() != NULL && id->get_symbol()->get_sub_type() == SYM_BUILTIN && id->get_member() != NULL ) { + ERROR( HERE, E_INVALID_MEMBER, id->get_name(), id->get_member() ); + } type = id->get_type(); } diff --git a/scripts/bugs/0063.lsl b/scripts/bugs/0063.lsl new file mode 100644 index 0000000..781e162 --- /dev/null +++ b/scripts/bugs/0063.lsl @@ -0,0 +1,12 @@ +default{timer(){ + + vector v; + ZERO_VECTOR.x; // $[E10008] Invalid member ZERO_VECTOR.x + ZERO_ROTATION.s; // $[E10008] + TOUCH_INVALID_TEXCOORD.z; // $[E10008] + <1,0,0>.x; // $[E10019] syntax error, unexpected PERIOD + llGetPos().z; // $[E10019] + v.s; // $[E10008] + v.y; // works + +}}