X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fexec_ast.c;h=7a94dc426f0b33096186ff38c59497fd91665e59;hb=a01827f4eeade250266325ce61f829175de2dba8;hp=0421686f95cf94e6866b70f056b5559f37a0dd6c;hpb=86f49ede5038704ac4f12eab9794e9a8110a4985;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/libspiderscript.so_src/exec_ast.c b/Usermode/Libraries/libspiderscript.so_src/exec_ast.c index 0421686f..7a94dc42 100644 --- a/Usermode/Libraries/libspiderscript.so_src/exec_ast.c +++ b/Usermode/Libraries/libspiderscript.so_src/exec_ast.c @@ -1,238 +1,120 @@ /* + * SpiderScript Library + * + * AST Execution */ #include #include +#include #include +#include "common.h" #include "ast.h" -// === PROTOTYPES === -void Object_Dereference(tSpiderValue *Object); -void Object_Reference(tSpiderValue *Object); -tSpiderValue *Object_CreateInteger(uint64_t Value); -tSpiderValue *Object_CreateReal(double Value); -tSpiderValue *Object_CreateString(int Length, const char *Data); -tSpiderValue *Object_CastTo(int Type, tSpiderValue *Source); - int Object_IsTrue(tSpiderValue *Value); +#define TRACE_VAR_LOOKUPS 0 +#define TRACE_NODE_RETURNS 0 -tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node); +// === IMPORTS === -tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name); -void Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderValue *Value); -tSpiderValue *Variable_GetValue(tAST_BlockState *Block, const char *Name); +// === PROTOTYPES === +// - Node Execution +tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node); +tSpiderValue *AST_ExecuteNode_BinOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right); +tSpiderValue *AST_ExecuteNode_UniOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Value); +// - Variables +tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name, tSpiderValue *Value); + int Variable_SetValue(tAST_BlockState *Block, tAST_Node *VarNode, tSpiderValue *Value); +tSpiderValue *Variable_GetValue(tAST_BlockState *Block, tAST_Node *VarNode); void Variable_Destroy(tAST_Variable *Variable); +// - Errors +void AST_RuntimeMessage(tAST_Node *Node, const char *Type, const char *Format, ...); +void AST_RuntimeError(tAST_Node *Node, const char *Format, ...); -// === CODE === -/** - * \brief Dereference a created object - */ -void Object_Dereference(tSpiderValue *Object) -{ - if(!Object) return ; - Object->ReferenceCount --; - if( Object->ReferenceCount == 0 ) { - switch( (enum eSpiderScript_DataTypes) Object->Type ) - { - case SS_DATATYPE_OBJECT: - Object->Object->Type->Destructor( Object->Object ); - break; - case SS_DATATYPE_OPAQUE: - Object->Opaque.Destroy( Object->Opaque.Data ); - break; - default: - break; - } - free(Object); - } -} - -void Object_Reference(tSpiderValue *Object) -{ - if(!Object) return ; - Object->ReferenceCount ++; -} - -/** - * \brief Create an integer object - */ -tSpiderValue *Object_CreateInteger(uint64_t Value) -{ - tSpiderValue *ret = malloc( sizeof(tSpiderValue) ); - ret->Type = SS_DATATYPE_INTEGER; - ret->ReferenceCount = 1; - ret->Integer = Value; - return ret; -} - -/** - * \brief Create an real number object - */ -tSpiderValue *Object_CreateReal(double Value) -{ - tSpiderValue *ret = malloc( sizeof(tSpiderValue) ); - ret->Type = SS_DATATYPE_REAL; - ret->ReferenceCount = 1; - ret->Real = Value; - return ret; -} - -/** - * \brief Create an string object - */ -tSpiderValue *Object_CreateString(int Length, const char *Data) -{ - tSpiderValue *ret = malloc( sizeof(tSpiderValue) + Length + 1 ); - ret->Type = SS_DATATYPE_STRING; - ret->ReferenceCount = 1; - ret->String.Length = Length; - memcpy(ret->String.Data, Data, Length); - ret->String.Data[Length] = '\0'; - return ret; -} +// === GLOBALS === + int giNextBlockIdent = 1; -/** - * \brief Concatenate two strings - */ -tSpiderValue *Object_StringConcat(tSpiderValue *Str1, tSpiderValue *Str2) +// === CODE === +tSpiderValue *AST_ExecuteFunction(tSpiderScript *Script, tScript_Function *Fcn, int NArguments, tSpiderValue **Arguments) { - int newLen = 0; + tAST_BlockState bs; tSpiderValue *ret; - if(Str1) newLen += Str1->String.Length; - if(Str2) newLen += Str2->String.Length; - ret = malloc( sizeof(tSpiderValue) + newLen + 1 ); - ret->Type = SS_DATATYPE_STRING; - ret->ReferenceCount = 1; - ret->String.Length = newLen; - if(Str1) - memcpy(ret->String.Data, Str1->String.Data, Str1->String.Length); - if(Str2) { - if(Str1) - memcpy(ret->String.Data+Str1->String.Length, Str2->String.Data, Str2->String.Length); - else - memcpy(ret->String.Data, Str2->String.Data, Str2->String.Length); - } - ret->String.Data[ newLen ] = '\0'; - return ret; -} - -/** - * \brief Cast one object to another - * \brief Type Destination type - * \brief Source Input data - */ -tSpiderValue *Object_CastTo(int Type, tSpiderValue *Source) -{ - tSpiderValue *ret = ERRPTR; - // Check if anything needs to be done - if( Source->Type == Type ) { - Object_Reference(Source); - return Source; - } + int i = 0; - switch( (enum eSpiderScript_DataTypes)Type ) - { - case SS_DATATYPE_UNDEF: - case SS_DATATYPE_NULL: - case SS_DATATYPE_ARRAY: - case SS_DATATYPE_OPAQUE: - fprintf(stderr, "Object_CastTo - Invalid cast to %i\n", Type); - return ERRPTR; + // Build a block State + bs.FirstVar = NULL; + bs.RetVal = NULL; + bs.Parent = NULL; + bs.BaseNamespace = &Script->Variant->RootNamespace; + bs.CurNamespace = NULL; + bs.Script = Script; + bs.Ident = giNextBlockIdent ++; - case SS_DATATYPE_INTEGER: - ret = malloc(sizeof(tSpiderValue)); - ret->Type = SS_DATATYPE_INTEGER; - ret->ReferenceCount = 1; - switch(Source->Type) - { - case SS_DATATYPE_INTEGER: break; // Handled above - case SS_DATATYPE_STRING: ret->Integer = atoi(Source->String.Data); break; - case SS_DATATYPE_REAL: ret->Integer = Source->Real; break; - default: - fprintf(stderr, "Object_CastTo - Invalid cast from %i\n", Source->Type); - free(ret); - ret = ERRPTR; - break; - } - break; - default: - fprintf(stderr, "BUG REPORT: Unimplemented cast target\n"); - break; + // Parse arguments + for( i = 0; i < Fcn->ArgumentCount; i ++ ) + { + if( i >= NArguments ) break; // TODO: Return gracefully + // TODO: Type checks + Variable_Define(&bs, + Fcn->Arguments[i].Type, Fcn->Arguments[i].Name, + Arguments[i]); } - - return ret; -} - -/** - * \brief Condenses a value down to a boolean - */ -int Object_IsTrue(tSpiderValue *Value) -{ - switch( (enum eSpiderScript_DataTypes)Value->Type ) + + // Execute function + ret = AST_ExecuteNode(&bs, Fcn->ASTFcn); + if(ret != ERRPTR) { - case SS_DATATYPE_UNDEF: - case SS_DATATYPE_NULL: - return 0; - - case SS_DATATYPE_INTEGER: - return !!Value->Integer; - - case SS_DATATYPE_REAL: - return (-.5f < Value->Real && Value->Real < 0.5f); - - case SS_DATATYPE_STRING: - return Value->String.Length > 0; - - case SS_DATATYPE_OBJECT: - return Value->Object != NULL; - - case SS_DATATYPE_OPAQUE: - return Value->Opaque.Data != NULL; - - case SS_DATATYPE_ARRAY: - return Value->Array.Length > 0; - default: - fprintf(stderr, "Spiderscript internal error: Unknown type %i in Object_IsTrue\n", Value->Type); - return 0; + SpiderScript_DereferenceValue(ret); // Dereference output of last block statement + ret = bs.RetVal; // Set to return value of block } - return 0; + + while(bs.FirstVar) + { + tAST_Variable *nextVar = bs.FirstVar->Next; + Variable_Destroy( bs.FirstVar ); + bs.FirstVar = nextVar; + } + return ret; } /** * \brief Execute an AST node and return its value + * \param Block Execution context + * \param Node Node to execute */ tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node) { tAST_Node *node; tSpiderValue *ret = NULL, *tmpobj; tSpiderValue *op1, *op2; // Binary operations - int cmp; // Used in comparisons + int i; switch(Node->Type) { // No Operation - case NODETYPE_NOP: ret = NULL; break; + case NODETYPE_NOP: + ret = NULL; + break; // Code block case NODETYPE_BLOCK: { tAST_BlockState blockInfo; - blockInfo.FirstVar = NULL; blockInfo.Parent = Block; blockInfo.Script = Block->Script; + blockInfo.FirstVar = NULL; + blockInfo.RetVal = NULL; + blockInfo.BaseNamespace = Block->BaseNamespace; + blockInfo.CurNamespace = NULL; + blockInfo.BreakTarget = NULL; + blockInfo.Ident = giNextBlockIdent ++; ret = NULL; - for(node = Node->Block.FirstChild; node; node = node->NextSibling ) + // Loop over all nodes, or until the return value is set + for(node = Node->Block.FirstChild; + node && !blockInfo.RetVal && !blockInfo.BreakTarget; + node = node->NextSibling ) { - if(node->Type == NODETYPE_RETURN) { - ret = AST_ExecuteNode(&blockInfo, node); - break ; - } - else { - tmpobj = AST_ExecuteNode(&blockInfo, node); - if(tmpobj == ERRPTR) { // Error check - ret = ERRPTR; - break ; - } - if(tmpobj) Object_Dereference(tmpobj); // Free unused value - } + ret = AST_ExecuteNode(&blockInfo, node); + if(ret == ERRPTR) break; // Error check + if(ret != NULL) SpiderScript_DereferenceValue(ret); // Free unused value } // Clean up variables while(blockInfo.FirstVar) @@ -241,97 +123,423 @@ tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node) Variable_Destroy( blockInfo.FirstVar ); blockInfo.FirstVar = nextVar; } + // Clear ret if not an error + if(ret != ERRPTR) ret = NULL; + + // Set parent's return value if needed + if( blockInfo.RetVal ) + Block->RetVal = blockInfo.RetVal; + if( blockInfo.BreakTarget ) { + Block->BreakTarget = blockInfo.BreakTarget; + Block->BreakType = blockInfo.BreakType; + } + + // TODO: Unset break if break type deontes a block break } break; // Assignment case NODETYPE_ASSIGN: + // TODO: Support assigning to object attributes if( Node->Assign.Dest->Type != NODETYPE_VARIABLE ) { - fprintf(stderr, "Syntax error: LVALUE of assignment is not a variable\n"); + AST_RuntimeError(Node, "LVALUE of assignment is not a variable"); return ERRPTR; } ret = AST_ExecuteNode(Block, Node->Assign.Value); - if(ret != ERRPTR) - Variable_SetValue( Block, Node->Assign.Dest->Variable.Name, ret ); + if(ret == ERRPTR) return ERRPTR; + + // Perform assignment operation + if( Node->Assign.Operation != NODETYPE_NOP ) + { + tSpiderValue *varVal, *value; + + varVal = Variable_GetValue(Block, Node->Assign.Dest); + if(varVal == ERRPTR) return ERRPTR; + #if 0 + #else + if(varVal && varVal->ReferenceCount == 2) { + SpiderScript_DereferenceValue(varVal); +// printf("pre: (%s) varVal->ReferenceCount = %i\n", +// Node->Assign.Dest->Variable.Name, +// varVal->ReferenceCount); + } + #endif + value = AST_ExecuteNode_BinOp(Block->Script, Node, Node->Assign.Operation, varVal, ret); + if(value == ERRPTR) return ERRPTR; + + if(ret) SpiderScript_DereferenceValue(ret); + #if 0 + if(varVal) SpiderScript_DereferenceValue(varVal); + #else + if(varVal && varVal->ReferenceCount == 1) { + SpiderScript_ReferenceValue(varVal); +// printf("post: varVal->ReferenceCount = %i\n", varVal->ReferenceCount); + break; // If varVal was non-null, it has been updated by _BinOp + } + #endif + // Else, it was NULL, so has to be assigned + ret = value; + } + + // Set the variable value + if( Variable_SetValue( Block, Node->Assign.Dest, ret ) ) { + SpiderScript_DereferenceValue( ret ); + return ERRPTR; + } + break; + + // Post increment/decrement + case NODETYPE_POSTINC: + case NODETYPE_POSTDEC: + { + tSpiderValue *varVal, *value; + static tSpiderValue one = { + .Type = SS_DATATYPE_INTEGER, + .ReferenceCount = 1, + {.Integer = 1} + }; + + // TODO: Support assigning to object attributes + if( Node->UniOp.Value->Type != NODETYPE_VARIABLE ) { + AST_RuntimeError(Node, "LVALUE of assignment is not a variable"); + return ERRPTR; + } + + // Get values (current variable contents and a static one) + varVal = Variable_GetValue(Block, Node->UniOp.Value); + + if( Node->Type == NODETYPE_POSTDEC ) + value = AST_ExecuteNode_BinOp(Block->Script, Node, NODETYPE_SUBTRACT, varVal, &one); + else + value = AST_ExecuteNode_BinOp(Block->Script, Node, NODETYPE_ADD, varVal, &one); + if( value == ERRPTR ) + return ERRPTR; + + ret = varVal; + + if( Variable_SetValue( Block, Node->UniOp.Value, value ) ) { + SpiderScript_DereferenceValue( ret ); + return ERRPTR; + } + SpiderScript_DereferenceValue( value ); + } break; // Function Call + case NODETYPE_METHODCALL: case NODETYPE_FUNCTIONCALL: + case NODETYPE_CREATEOBJECT: + // Logical block (used to allocate `params`) { - int nParams = 0; - for(node = Node->FunctionCall.FirstArg; node; node = node->NextSibling) { - nParams ++; + tSpiderNamespace *ns = Block->CurNamespace; + tSpiderValue *params[Node->FunctionCall.NumArgs]; + i = 0; + for(node = Node->FunctionCall.FirstArg; node; node = node->NextSibling) + { + params[i] = AST_ExecuteNode(Block, node); + if( params[i] == ERRPTR ) { + while(i--) SpiderScript_DereferenceValue(params[i]); + ret = ERRPTR; + goto _return; + } + i ++; + } + + if( !ns ) ns = Block->BaseNamespace; + + // Call the function + if( Node->Type == NODETYPE_CREATEOBJECT ) + { + ret = SpiderScript_CreateObject(Block->Script, + ns, + Node->FunctionCall.Name, + Node->FunctionCall.NumArgs, params + ); + } + else if( Node->Type == NODETYPE_METHODCALL ) + { + tSpiderValue *obj = AST_ExecuteNode(Block, Node->FunctionCall.Object); + if( !obj || obj == ERRPTR || obj->Type != SS_DATATYPE_OBJECT ) { + AST_RuntimeError(Node->FunctionCall.Object, + "Type Mismatch - Required SS_DATATYPE_OBJECT for method call"); + while(i--) SpiderScript_DereferenceValue(params[i]); + ret = ERRPTR; + break; + } + ret = SpiderScript_ExecuteMethod(Block->Script, + obj->Object, Node->FunctionCall.Name, + Node->FunctionCall.NumArgs, params + ); + SpiderScript_DereferenceValue(obj); } - // Logical block (used to allocate `params`) + else { - tSpiderValue *params[nParams]; - int i=0; - for(node = Node->FunctionCall.FirstArg; node; node = node->NextSibling) { - params[i] = AST_ExecuteNode(Block, node); - if( params[i] == ERRPTR ) { - while(i--) Object_Dereference(params[i]); - ret = ERRPTR; - goto _return; + ret = SpiderScript_ExecuteFunction(Block->Script, + ns, Node->FunctionCall.Name, + Node->FunctionCall.NumArgs, params + ); + } + + + // Dereference parameters + while(i--) SpiderScript_DereferenceValue(params[i]); + + // falls out + } + break; + + // Conditional + case NODETYPE_IF: + ret = AST_ExecuteNode(Block, Node->If.Condition); + if( ret == ERRPTR ) break; + if( SpiderScript_IsValueTrue(ret) ) { + tmpobj = AST_ExecuteNode(Block, Node->If.True); + } + else { + tmpobj = AST_ExecuteNode(Block, Node->If.False); + } + SpiderScript_DereferenceValue(ret); + if( tmpobj == ERRPTR ) return ERRPTR; + SpiderScript_DereferenceValue(tmpobj); + ret = NULL; + break; + + // Loop + case NODETYPE_LOOP: + // Initialise + ret = AST_ExecuteNode(Block, Node->For.Init); + if(ret == ERRPTR) break; + + // Check initial condition + if( !Node->For.bCheckAfter ) + { + SpiderScript_DereferenceValue(ret); + + ret = AST_ExecuteNode(Block, Node->For.Condition); + if(ret == ERRPTR) return ERRPTR; + if(!SpiderScript_IsValueTrue(ret)) { + SpiderScript_DereferenceValue(ret); + ret = NULL; + break; + } + } + + // Perform loop + for( ;; ) + { + SpiderScript_DereferenceValue(ret); + + // Code + ret = AST_ExecuteNode(Block, Node->For.Code); + if(ret == ERRPTR) return ERRPTR; + SpiderScript_DereferenceValue(ret); + + if(Block->BreakTarget) + { + if( Block->BreakTarget[0] == '\0' || strcmp(Block->BreakTarget, Node->For.Tag) == 0 ) + { + // Ours + free((void*)Block->BreakTarget); Block->BreakTarget = NULL; + if( Block->BreakType == NODETYPE_CONTINUE ) { + // Continue, just keep going } - i ++; + else + break; } - - // Call the function (SpiderScript_ExecuteMethod does the - // required namespace handling) - ret = SpiderScript_ExecuteMethod(Block->Script, Node->FunctionCall.Name, nParams, params); - - // Dereference parameters - while(i--) Object_Dereference(params[i]); - - // falls out + else + break; // Break out of this loop } + + // Increment + ret = AST_ExecuteNode(Block, Node->For.Increment); + if(ret == ERRPTR) return ERRPTR; + SpiderScript_DereferenceValue(ret); + + // Check condition + ret = AST_ExecuteNode(Block, Node->For.Condition); + if(ret == ERRPTR) return ERRPTR; + if(!SpiderScript_IsValueTrue(ret)) break; } + SpiderScript_DereferenceValue(ret); + ret = NULL; break; - // Return's special handling happens elsewhere + // Return case NODETYPE_RETURN: ret = AST_ExecuteNode(Block, Node->UniOp.Value); + if(ret == ERRPTR) break; + Block->RetVal = ret; // Return value set + ret = NULL; // the `return` statement does not return a value + break; + + case NODETYPE_BREAK: + case NODETYPE_CONTINUE: + Block->BreakTarget = strdup(Node->Variable.Name); + Block->BreakType = Node->Type; break; // Define a variable case NODETYPE_DEFVAR: + if( Node->DefVar.InitialValue ) { + tmpobj = AST_ExecuteNode(Block, Node->DefVar.InitialValue); + if(tmpobj == ERRPTR) return ERRPTR; + } + else { + tmpobj = NULL; + } + // TODO: Handle arrays ret = NULL; - if( Variable_Define(Block, Node->DefVar.DataType, Node->DefVar.Name) == ERRPTR ) + if( Variable_Define(Block, Node->DefVar.DataType, Node->DefVar.Name, tmpobj) == ERRPTR ) + ret = ERRPTR; + SpiderScript_DereferenceValue(tmpobj); + break; + + // Scope + case NODETYPE_SCOPE: + { + tSpiderNamespace *ns; + + // Set current namespace if unset + if( !Block->CurNamespace ) + Block->CurNamespace = Block->BaseNamespace; + + // Empty string means use the root namespace + if( Node->Scope.Name[0] == '\0' ) + { + ns = &Block->Script->Variant->RootNamespace; + } + else + { + // Otherwise scan the current namespace for the element + for( ns = Block->CurNamespace->FirstChild; ns; ns = ns->Next ) + { + if( strcmp(ns->Name, Node->Scope.Name) == 0 ) + break; + } + } + if(!ns) { + AST_RuntimeError(Node, "Unknown namespace '%s'", Node->Scope.Name); ret = ERRPTR; + break; + } + Block->CurNamespace = ns; + + ret = AST_ExecuteNode(Block, Node->Scope.Element); + } break; // Variable case NODETYPE_VARIABLE: - ret = Variable_GetValue( Block, Node->Variable.Name ); + ret = Variable_GetValue( Block, Node ); + break; + + // Element of an Object + case NODETYPE_ELEMENT: + tmpobj = AST_ExecuteNode( Block, Node->Scope.Element ); + if(tmpobj == ERRPTR) return ERRPTR; + if( !tmpobj || tmpobj->Type != SS_DATATYPE_OBJECT ) + { + AST_RuntimeError(Node->Scope.Element, "Unable to dereference a non-object"); + ret = ERRPTR; + break ; + } + + for( i = 0; i < tmpobj->Object->Type->NAttributes; i ++ ) + { + if( strcmp(Node->Scope.Name, tmpobj->Object->Type->AttributeDefs[i].Name) == 0 ) + { + ret = tmpobj->Object->Attributes[i]; + SpiderScript_ReferenceValue(ret); + break; + } + } + if( i == tmpobj->Object->Type->NAttributes ) + { + AST_RuntimeError(Node->Scope.Element, "Unknown attribute '%s' of class '%s'", + Node->Scope.Name, tmpobj->Object->Type->Name); + ret = ERRPTR; + } break; // Cast a value to another case NODETYPE_CAST: - ret = Object_CastTo( - Node->Cast.DataType, - AST_ExecuteNode(Block, Node->Cast.Value) - ); + { + tmpobj = AST_ExecuteNode(Block, Node->Cast.Value); + if(tmpobj == ERRPTR) return ERRPTR; + ret = SpiderScript_CastValueTo( Node->Cast.DataType, tmpobj ); + SpiderScript_DereferenceValue(tmpobj); + } break; // Index into an array case NODETYPE_INDEX: - fprintf(stderr, "TODO: Array indexing\n"); - ret = ERRPTR; + op1 = AST_ExecuteNode(Block, Node->BinOp.Left); // Array + if(op1 == ERRPTR) return ERRPTR; + op2 = AST_ExecuteNode(Block, Node->BinOp.Right); // Offset + if(op2 == ERRPTR) { + SpiderScript_DereferenceValue(op1); + return ERRPTR; + } + + if( !op1 || op1->Type != SS_DATATYPE_ARRAY ) + { + // TODO: Implement "operator []" on objects + AST_RuntimeError(Node, "Indexing non-array"); + ret = ERRPTR; + break; + } + + if( (!op2 || op2->Type != SS_DATATYPE_INTEGER) && !Block->Script->Variant->bImplicitCasts ) { + AST_RuntimeError(Node, "Array index is not an integer"); + ret = ERRPTR; + break; + } + + if( !op2 || op2->Type != SS_DATATYPE_INTEGER ) + { + tmpobj = SpiderScript_CastValueTo(SS_DATATYPE_INTEGER, op2); + SpiderScript_DereferenceValue(op2); + op2 = tmpobj; + } + + if( op2->Integer >= op1->Array.Length ) { + AST_RuntimeError(Node, "Array index out of bounds %i >= %i", + op2->Integer, op1->Array.Length); + ret = ERRPTR; + break; + } + + ret = op1->Array.Items[ op2->Integer ]; + SpiderScript_ReferenceValue(ret); + + SpiderScript_DereferenceValue(op1); + SpiderScript_DereferenceValue(op2); break; // TODO: Implement runtime constants case NODETYPE_CONSTANT: - fprintf(stderr, "TODO: Runtime Constants\n"); + // TODO: Scan namespace for constant name + AST_RuntimeError(Node, "TODO - Runtime Constants"); ret = ERRPTR; break; + // Constant Values - case NODETYPE_STRING: ret = Object_CreateString( Node->String.Length, Node->String.Data ); break; - case NODETYPE_INTEGER: ret = Object_CreateInteger( Node->Integer ); break; - case NODETYPE_REAL: ret = Object_CreateReal( Node->Real ); break; + case NODETYPE_STRING: + case NODETYPE_INTEGER: + case NODETYPE_REAL: + ret = &Node->Constant; + SpiderScript_ReferenceValue(ret); + break; // --- Operations --- // Boolean Operations + case NODETYPE_LOGICALNOT: // Logical NOT (!) + op1 = AST_ExecuteNode(Block, Node->UniOp.Value); + if(op1 == ERRPTR) return ERRPTR; + ret = SpiderScript_CreateInteger( !SpiderScript_IsValueTrue(op1) ); + SpiderScript_DereferenceValue(op1); + break; case NODETYPE_LOGICALAND: // Logical AND (&&) case NODETYPE_LOGICALOR: // Logical OR (||) case NODETYPE_LOGICALXOR: // Logical XOR (^^) @@ -339,230 +547,379 @@ tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node) if(op1 == ERRPTR) return ERRPTR; op2 = AST_ExecuteNode(Block, Node->BinOp.Right); if(op2 == ERRPTR) { - Object_Dereference(op1); + SpiderScript_DereferenceValue(op1); return ERRPTR; } switch( Node->Type ) { case NODETYPE_LOGICALAND: - ret = Object_CreateInteger( Object_IsTrue(op1) && Object_IsTrue(op2) ); + ret = SpiderScript_CreateInteger( SpiderScript_IsValueTrue(op1) && SpiderScript_IsValueTrue(op2) ); break; case NODETYPE_LOGICALOR: - ret = Object_CreateInteger( Object_IsTrue(op1) || Object_IsTrue(op2) ); + ret = SpiderScript_CreateInteger( SpiderScript_IsValueTrue(op1) || SpiderScript_IsValueTrue(op2) ); break; case NODETYPE_LOGICALXOR: - ret = Object_CreateInteger( Object_IsTrue(op1) ^ Object_IsTrue(op2) ); + ret = SpiderScript_CreateInteger( SpiderScript_IsValueTrue(op1) ^ SpiderScript_IsValueTrue(op2) ); break; default: break; } // Free intermediate objects - Object_Dereference(op1); - Object_Dereference(op2); + SpiderScript_DereferenceValue(op1); + SpiderScript_DereferenceValue(op2); break; - // Comparisons + // General Unary Operations + case NODETYPE_BWNOT: // Bitwise NOT (~) + case NODETYPE_NEGATE: // Negation (-) + op1 = AST_ExecuteNode(Block, Node->UniOp.Value); + if(op1 == ERRPTR) return ERRPTR; + ret = AST_ExecuteNode_UniOp(Block->Script, Node, Node->Type, op1); + SpiderScript_DereferenceValue(op1); + break; + + // General Binary Operations + case NODETYPE_ADD: + case NODETYPE_SUBTRACT: + case NODETYPE_MULTIPLY: + case NODETYPE_DIVIDE: + case NODETYPE_MODULO: + case NODETYPE_BWAND: + case NODETYPE_BWOR: + case NODETYPE_BWXOR: + case NODETYPE_BITSHIFTLEFT: + case NODETYPE_BITSHIFTRIGHT: + case NODETYPE_BITROTATELEFT: case NODETYPE_EQUALS: case NODETYPE_LESSTHAN: case NODETYPE_GREATERTHAN: + case NODETYPE_LESSTHANEQUAL: + case NODETYPE_GREATERTHANEQUAL: + // Get operands op1 = AST_ExecuteNode(Block, Node->BinOp.Left); if(op1 == ERRPTR) return ERRPTR; op2 = AST_ExecuteNode(Block, Node->BinOp.Right); if(op2 == ERRPTR) { - Object_Dereference(op1); + SpiderScript_DereferenceValue(op1); return ERRPTR; } - // No conversion done for NULL - // TODO: Determine if this will ever be needed - if( op1->Type == SS_DATATYPE_NULL ) + ret = AST_ExecuteNode_BinOp(Block->Script, Node, Node->Type, op1, op2); + + // Free intermediate objects + SpiderScript_DereferenceValue(op1); + SpiderScript_DereferenceValue(op2); + break; + + //default: + // ret = NULL; + // AST_RuntimeError(Node, "BUG - SpiderScript AST_ExecuteNode Unimplemented %i", Node->Type); + // break; + } +_return: + // Reset namespace when no longer needed + if( Node->Type != NODETYPE_SCOPE ) + Block->CurNamespace = NULL; + + #if TRACE_NODE_RETURNS + if(ret && ret != ERRPTR) { + AST_RuntimeError(Node, "Ret type of %p %i is %i", Node, Node->Type, ret->Type); + } + else { + AST_RuntimeError(Node, "Ret type of %p %i is %p", Node, Node->Type, ret); + } + #endif + + return ret; +} + +tSpiderValue *AST_ExecuteNode_UniOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Value) +{ + tSpiderValue *ret; + #if 0 + if( Value->Type == SS_DATATYPE_OBJECT ) + { + const char *fcnname; + switch(Operation) { - // NULLs always typecheck - ret = Object_CreateInteger(op2->Type == SS_DATATYPE_NULL); - break; + case NODETYPE_NEGATE: fcnname = "-ve"; break; + case NODETYPE_BWNOT: fcnname = "~"; break; + default: fcnname = NULL; break; } - // Convert types - if( op1->Type != op2->Type ) { - // If dynamically typed, convert op2 to op1's type - if(Block->Script->Variant->bDyamicTyped) + if( fcnname ) + { + ret = Object_ExecuteMethod(Value->Object, fcnname, ); + if( ret != ERRPTR ) + return ret; + } + } + #endif + switch(Value->Type) + { + // Integer Operations + case SS_DATATYPE_INTEGER: + if( Value->ReferenceCount == 1 ) + SpiderScript_ReferenceValue(ret = Value); + else + ret = SpiderScript_CreateInteger(0); + switch(Operation) + { + case NODETYPE_NEGATE: ret->Integer = -Value->Integer; break; + case NODETYPE_BWNOT: ret->Integer = ~Value->Integer; break; + default: + AST_RuntimeError(Node, "SpiderScript internal error: Exec,UniOP,Integer unknown op %i", Operation); + SpiderScript_DereferenceValue(ret); + ret = ERRPTR; + break; + } + break; + // Real number Operations + case SS_DATATYPE_REAL: + switch(Operation) + { + case NODETYPE_NEGATE: ret = SpiderScript_CreateInteger( -Value->Real ); break; + default: + AST_RuntimeError(Node, "SpiderScript internal error: Exec,UniOP,Real unknown op %i", Operation); + ret = ERRPTR; + break; + } + break; + + default: + AST_RuntimeError(NULL, "Invalid operation (%i) on type (%i)", Operation, Value->Type); + ret = ERRPTR; + break; + } + + return ret; +} + +tSpiderValue *AST_ExecuteNode_BinOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right) +{ + tSpiderValue *preCastValue = Right; + tSpiderValue *ret; + + // Convert types + if( Left && Right && Left->Type != Right->Type ) + { + #if 0 + // Object types + // - Operator overload functions + if( Left->Type == SS_DATATYPE_OBJECT ) + { + const char *fcnname; + switch(Operation) { - tmpobj = op2; - op2 = Object_CastTo(op1->Type, op2); - Object_Dereference(tmpobj); - if(op2 == ERRPTR) { - Object_Dereference(op1); - return ERRPTR; - } + case NODETYPE_ADD: fcnname = "+"; break; + case NODETYPE_SUBTRACT: fcnname = "-"; break; + case NODETYPE_MULTIPLY: fcnname = "*"; break; + case NODETYPE_DIVIDE: fcnname = "/"; break; + case NODETYPE_MODULO: fcnname = "%"; break; + case NODETYPE_BWAND: fcnname = "&"; break; + case NODETYPE_BWOR: fcnname = "|"; break; + case NODETYPE_BWXOR: fcnname = "^"; break; + case NODETYPE_BITSHIFTLEFT: fcnname = "<<"; break; + case NODETYPE_BITSHIFTRIGHT:fcnname = ">>"; break; + case NODETYPE_BITROTATELEFT:fcnname = "<<<"; break; + default: fcnname = NULL; break; } - // If statically typed, this should never happen, but catch it anyway - else { - fprintf(stderr, "PARSER ERROR: Statically typed implicit cast\n"); - ret = ERRPTR; - break; + + if( fcnname ) + { + ret = Object_ExecuteMethod(Left->Object, fcnname, Right); + if( ret != ERRPTR ) + return ret; + // Fall through and try casting (which will usually fail) } } + #endif + + // If implicit casts are allowed, convert Right to Left's type + if(Script->Variant->bImplicitCasts) + { + Right = SpiderScript_CastValueTo(Left->Type, Right); + if(Right == ERRPTR) + return ERRPTR; + } + // If statically typed, this should never happen, but catch it anyway + else { + AST_RuntimeError(Node, "Implicit cast not allowed (from %i to %i)", Right->Type, Left->Type); + return ERRPTR; + } + } + + // NULL Check + if( Left == NULL || Right == NULL ) { + if(Right && Right != preCastValue) free(Right); + return NULL; + } + + // Catch comparisons + switch(Operation) + { + case NODETYPE_EQUALS: + case NODETYPE_LESSTHAN: + case NODETYPE_GREATERTHAN: + case NODETYPE_LESSTHANEQUAL: + case NODETYPE_GREATERTHANEQUAL: { + int cmp; + ret = NULL; // Do operation - switch(op1->Type) + switch(Left->Type) { - // - NULL - case SS_DATATYPE_NULL: break; // - String Compare (does a strcmp, well memcmp) case SS_DATATYPE_STRING: // Call memcmp to do most of the work cmp = memcmp( - op1->String.Data, op2->String.Data, - (op1->String.Length < op2->String.Length) ? op1->String.Length : op2->String.Length + Left->String.Data, Right->String.Data, + (Left->String.Length < Right->String.Length) ? Left->String.Length : Right->String.Length ); // Handle reaching the end of the string if( cmp == 0 ) { - if( op1->String.Length == op2->String.Length ) + if( Left->String.Length == Right->String.Length ) cmp = 0; - else if( op1->String.Length < op2->String.Length ) + else if( Left->String.Length < Right->String.Length ) cmp = 1; else cmp = -1; } break; - default: - fprintf(stderr, "SpiderScript internal error: TODO: Comparison of type %i\n", op1->Type); - ret = ERRPTR; - break; - } - // Free intermediate objects - Object_Dereference(op1); - Object_Dereference(op2); - - // Error check - if( ret == ERRPTR ) + // - Integer Comparisons + case SS_DATATYPE_INTEGER: + if( Left->Integer == Right->Integer ) + cmp = 0; + else if( Left->Integer < Right->Integer ) + cmp = -1; + else + cmp = 1; + break; + // - Real Number Comparisons + case SS_DATATYPE_REAL: + cmp = (Left->Real - Right->Real) / Right->Real * 10000; // < 0.1% difference is equality break; - - // Create return - switch(Node->Type) - { - case NODETYPE_EQUALS: ret = Object_CreateInteger(cmp == 0); break; - case NODETYPE_LESSTHAN: ret = Object_CreateInteger(cmp < 0); break; - case NODETYPE_GREATERTHAN: ret = Object_CreateInteger(cmp > 0); break; default: - fprintf(stderr, "SpiderScript internal error: Exec,CmpOp unknown op %i", Node->Type); + AST_RuntimeError(Node, "TODO - Comparison of type %i", Left->Type); ret = ERRPTR; break; } - break; - - // General Binary Operations - case NODETYPE_ADD: - case NODETYPE_SUBTRACT: - case NODETYPE_MULTIPLY: - case NODETYPE_DIVIDE: - case NODETYPE_MODULO: - case NODETYPE_BWAND: - case NODETYPE_BWOR: - case NODETYPE_BWXOR: - case NODETYPE_BITSHIFTLEFT: - case NODETYPE_BITSHIFTRIGHT: - case NODETYPE_BITROTATELEFT: - // Get operands - op1 = AST_ExecuteNode(Block, Node->BinOp.Left); - if(op1 == ERRPTR) return ERRPTR; - op2 = AST_ExecuteNode(Block, Node->BinOp.Right); - if(op2 == ERRPTR) { - Object_Dereference(op1); - return ERRPTR; - } - // Convert types - if( op1 && op2 && op1->Type != op2->Type ) { - // If dynamically typed, convert op2 to op1's type - if(Block->Script->Variant->bDyamicTyped) - { - tmpobj = op2; - op2 = Object_CastTo(op1->Type, op2); - Object_Dereference(tmpobj); - if(op2 == ERRPTR) { - Object_Dereference(op1); - return ERRPTR; - } - } - // If statically typed, this should never happen, but catch it anyway - else { - fprintf(stderr, "PARSER ERROR: Statically typed implicit cast\n"); - ret = ERRPTR; - break; - } - } - - // Do operation - switch(op1->Type) + // Error check + if( ret != ERRPTR ) { - case SS_DATATYPE_NULL: break; - // String Concatenation - case SS_DATATYPE_STRING: - switch(Node->Type) + if(Left->ReferenceCount == 1 && Left->Type != SS_DATATYPE_STRING) + SpiderScript_ReferenceValue(ret = Left); + else + ret = SpiderScript_CreateInteger(0); + + // Create return + switch(Operation) { - case NODETYPE_ADD: // Concatenate - ret = Object_StringConcat(op1, op2); - break; + case NODETYPE_EQUALS: ret->Integer = (cmp == 0); break; + case NODETYPE_LESSTHAN: ret->Integer = (cmp < 0); break; + case NODETYPE_GREATERTHAN: ret->Integer = (cmp > 0); break; + case NODETYPE_LESSTHANEQUAL: ret->Integer = (cmp <= 0); break; + case NODETYPE_GREATERTHANEQUAL: ret->Integer = (cmp >= 0); break; default: - fprintf(stderr, "SpiderScript internal error: Exec,BinOP,String unknown op %i\n", Node->Type); + AST_RuntimeError(Node, "Exec,CmpOp unknown op %i", Operation); + SpiderScript_DereferenceValue(ret); ret = ERRPTR; break; } + } + if(Right && Right != preCastValue) free(Right); + return ret; + } + + // Fall through and sort by type instead + default: + break; + } + + // Do operation + switch(Left->Type) + { + // String Concatenation + case SS_DATATYPE_STRING: + switch(Operation) + { + case NODETYPE_ADD: // Concatenate + ret = SpiderScript_StringConcat(Left, Right); break; - // Integer Operations - case SS_DATATYPE_INTEGER: - switch(Node->Type) - { - case NODETYPE_ADD: ret = Object_CreateInteger( op1->Integer + op2->Integer ); break; - case NODETYPE_SUBTRACT: ret = Object_CreateInteger( op1->Integer - op2->Integer ); break; - case NODETYPE_MULTIPLY: ret = Object_CreateInteger( op1->Integer * op2->Integer ); break; - case NODETYPE_DIVIDE: ret = Object_CreateInteger( op1->Integer / op2->Integer ); break; - case NODETYPE_MODULO: ret = Object_CreateInteger( op1->Integer % op2->Integer ); break; - case NODETYPE_BWAND: ret = Object_CreateInteger( op1->Integer & op2->Integer ); break; - case NODETYPE_BWOR: ret = Object_CreateInteger( op1->Integer | op2->Integer ); break; - case NODETYPE_BWXOR: ret = Object_CreateInteger( op1->Integer ^ op2->Integer ); break; - case NODETYPE_BITSHIFTLEFT: ret = Object_CreateInteger( op1->Integer << op2->Integer ); break; - case NODETYPE_BITSHIFTRIGHT:ret = Object_CreateInteger( op1->Integer >> op2->Integer ); break; - case NODETYPE_BITROTATELEFT: - ret = Object_CreateInteger( (op1->Integer << op2->Integer) | (op1->Integer >> (64-op2->Integer)) ); - break; - default: - fprintf(stderr, "SpiderScript internal error: Exec,BinOP,Integer unknown op %i\n", Node->Type); - ret = ERRPTR; - break; - } + // TODO: Support python style 'i = %i' % i ? + // Might do it via a function call + // Implement it via % with an array, but getting past the cast will be fun +// case NODETYPE_MODULUS: +// break; + // TODO: Support string repititions +// case NODETYPE_MULTIPLY: +// break; + + default: + AST_RuntimeError(Node, "SpiderScript internal error: Exec,BinOP,String unknown op %i", Operation); + ret = ERRPTR; break; - - // Real Numbers - case SS_DATATYPE_REAL: - switch(Node->Type) - { - default: - fprintf(stderr, "SpiderScript internal error: Exec,BinOP,Real unknown op %i\n", Node->Type); - ret = ERRPTR; - break; - } + } + break; + // Integer Operations + case SS_DATATYPE_INTEGER: + if( Left->ReferenceCount == 1 ) + SpiderScript_ReferenceValue(ret = Left); + else + ret = SpiderScript_CreateInteger(0); + switch(Operation) + { + case NODETYPE_ADD: ret->Integer = Left->Integer + Right->Integer; break; + case NODETYPE_SUBTRACT: ret->Integer = Left->Integer - Right->Integer; break; + case NODETYPE_MULTIPLY: ret->Integer = Left->Integer * Right->Integer; break; + case NODETYPE_DIVIDE: ret->Integer = Left->Integer / Right->Integer; break; + case NODETYPE_MODULO: ret->Integer = Left->Integer % Right->Integer; break; + case NODETYPE_BWAND: ret->Integer = Left->Integer & Right->Integer; break; + case NODETYPE_BWOR: ret->Integer = Left->Integer | Right->Integer; break; + case NODETYPE_BWXOR: ret->Integer = Left->Integer ^ Right->Integer; break; + case NODETYPE_BITSHIFTLEFT: ret->Integer = Left->Integer << Right->Integer; break; + case NODETYPE_BITSHIFTRIGHT:ret->Integer = Left->Integer >> Right->Integer; break; + case NODETYPE_BITROTATELEFT: + ret->Integer = (Left->Integer << Right->Integer) | (Left->Integer >> (64-Right->Integer)); break; - default: - fprintf(stderr, "SpiderScript error: Invalid operation (%i) on type (%i)\n", Node->Type, op1->Type); + AST_RuntimeError(Node, "SpiderScript internal error: Exec,BinOP,Integer unknown op %i", Operation); + SpiderScript_DereferenceValue(ret); ret = ERRPTR; break; } - - // Free intermediate objects - Object_Dereference(op1); - Object_Dereference(op2); break; - //default: - // ret = NULL; - // fprintf(stderr, "ERROR: SpiderScript AST_ExecuteNode Unimplemented %i\n", Node->Type); - // break; + // Real Numbers + case SS_DATATYPE_REAL: + if( Left->ReferenceCount == 1 ) + SpiderScript_ReferenceValue(ret = Left); + else + ret = SpiderScript_CreateReal(0); + switch(Operation) + { + case NODETYPE_ADD: ret->Real = Left->Real + Right->Real; break; + case NODETYPE_SUBTRACT: ret->Real = Left->Real - Right->Real; break; + case NODETYPE_MULTIPLY: ret->Real = Left->Real * Right->Real; break; + case NODETYPE_DIVIDE: ret->Real = Left->Real / Right->Real; break; + default: + AST_RuntimeError(Node, "SpiderScript internal error: Exec,BinOP,Real unknown op %i", Operation); + SpiderScript_DereferenceValue(ret); + ret = ERRPTR; + break; + } + break; + + default: + AST_RuntimeError(Node, "BUG - Invalid operation (%i) on type (%i)", Operation, Left->Type); + ret = ERRPTR; + break; } -_return: + + if(Right && Right != preCastValue) free(Right); + return ret; } @@ -573,14 +930,14 @@ _return: * \param Name Name of the variable * \return Boolean Failure */ -tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name) +tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name, tSpiderValue *Value) { tAST_Variable *var, *prev = NULL; for( var = Block->FirstVar; var; prev = var, var = var->Next ) { if( strcmp(var->Name, Name) == 0 ) { - fprintf(stderr, "ERROR: Redefinition of variable '%s'\n", Name); + AST_RuntimeError(NULL, "Redefinition of variable '%s'", Name); return ERRPTR; } } @@ -588,7 +945,8 @@ tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Nam var = malloc( sizeof(tAST_Variable) + strlen(Name) + 1 ); var->Next = NULL; var->Type = Type; - var->Object = NULL; + var->Object = Value; + if(Value) SpiderScript_ReferenceValue(Value); strcpy(var->Name, Name); if(prev) prev->Next = var; @@ -599,67 +957,97 @@ tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Nam return var; } -/** - * \brief Set the value of a variable - */ -void Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderValue *Value) -{ - tAST_Variable *var; - tAST_BlockState *bs; +tAST_Variable *Variable_Lookup(tAST_BlockState *Block, tAST_Node *VarNode, int CreateType) +{ + tAST_Variable *var = NULL; - for( bs = Block; bs; bs = bs->Parent ) + // Speed hack + if( VarNode->BlockState == Block && VarNode->BlockIdent == Block->Ident ) { + var = VarNode->ValueCache; + #if TRACE_VAR_LOOKUPS + AST_RuntimeMessage(VarNode, "debug", "Fast var fetch on '%s' %p (%p:%i)", + VarNode->Variable.Name, var, + VarNode->BlockState, VarNode->BlockIdent + ); + #endif + } + else { - for( var = bs->FirstVar; var; var = var->Next ) + tAST_BlockState *bs; + for( bs = Block; bs; bs = bs->Parent ) { - if( strcmp(var->Name, Name) == 0 ) { - if( !Block->Script->Variant->bDyamicTyped - && (Value && var->Type != Value->Type) ) { - fprintf(stderr, "ERROR: Type mismatch assigning to '%s'\n", Name); - return ; - } - Object_Reference(Value); - Object_Dereference(var->Object); - var->Object = Value; - return ; + for( var = bs->FirstVar; var; var = var->Next ) + { + if( strcmp(var->Name, VarNode->Variable.Name) == 0 ) + break; } + if(var) break; } + + if( !var ) + { + if( Block->Script->Variant->bDyamicTyped && CreateType != SS_DATATYPE_UNDEF ) { + // Define variable + var = Variable_Define(Block, CreateType, VarNode->Variable.Name, NULL); + } + else + { + AST_RuntimeError(VarNode, "Variable '%s' is undefined", VarNode->Variable.Name); + return NULL; + } + } + + #if TRACE_VAR_LOOKUPS + AST_RuntimeMessage(VarNode, "debug", "Saved variable lookup of '%s' %p (%p:%i)", + VarNode->Variable.Name, var, + Block, Block->Ident); + #endif + + VarNode->ValueCache = var; + VarNode->BlockState = Block; + VarNode->BlockIdent = Block->Ident; } - if( Block->Script->Variant->bDyamicTyped ) - { - // Define variable - var = Variable_Define(Block, Value->Type, Name); - Object_Reference(Value); - var->Object = Value; - } - else - { - fprintf(stderr, "ERROR: Variable '%s' set while undefined\n", Name); - } + return var; } /** - * \brief Get the value of a variable + * \brief Set the value of a variable + * \return Boolean Failure */ -tSpiderValue *Variable_GetValue(tAST_BlockState *Block, const char *Name) +int Variable_SetValue(tAST_BlockState *Block, tAST_Node *VarNode, tSpiderValue *Value) { tAST_Variable *var; - tAST_BlockState *bs; - for( bs = Block; bs; bs = bs->Parent ) + var = Variable_Lookup(Block, VarNode, (Value ? Value->Type : SS_DATATYPE_UNDEF)); + + if( !var ) return -1; + + if( !Block->Script->Variant->bDyamicTyped && (Value && var->Type != Value->Type) ) { - for( var = bs->FirstVar; var; var = var->Next ) - { - if( strcmp(var->Name, Name) == 0 ) { - Object_Reference(var->Object); - return var->Object; - } - } + AST_RuntimeError(VarNode, "Type mismatch assigning to '%s'", + VarNode->Variable.Name); + return -2; } + +// printf("Assign %p to '%s'\n", Value, var->Name); + SpiderScript_ReferenceValue(Value); + SpiderScript_DereferenceValue(var->Object); + var->Object = Value; + return 0; +} + +/** + * \brief Get the value of a variable + */ +tSpiderValue *Variable_GetValue(tAST_BlockState *Block, tAST_Node *VarNode) +{ + tAST_Variable *var = Variable_Lookup(Block, VarNode, 0); - fprintf(stderr, "ERROR: Variable '%s' used undefined\n", Name); + if( !var ) return ERRPTR; - return ERRPTR; + SpiderScript_ReferenceValue(var->Object); + return var->Object; } /** @@ -667,6 +1055,8 @@ tSpiderValue *Variable_GetValue(tAST_BlockState *Block, const char *Name) */ void Variable_Destroy(tAST_Variable *Variable) { - Object_Dereference(Variable->Object); +// printf("Variable_Destroy: (%p'%s')\n", Variable, Variable->Name); + SpiderScript_DereferenceValue(Variable->Object); free(Variable); } +