/*
+ * SpiderScript Library
+ *
+ * AST Execution
*/
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
+#include "common.h"
#include "ast.h"
#define TRACE_VAR_LOOKUPS 0
extern tSpiderFunction *gpExports_First;
// === PROTOTYPES ===
-void Object_Dereference(tSpiderValue *Object);
-void Object_Reference(tSpiderValue *Object);
-tSpiderValue *SpiderScript_CreateInteger(uint64_t Value);
-tSpiderValue *SpiderScript_CreateReal(double Value);
-tSpiderValue *SpiderScript_CreateString(int Length, const char *Data);
-tSpiderValue *SpiderScript_CastValueTo(int Type, tSpiderValue *Source);
- int SpiderScript_IsValueTrue(tSpiderValue *Value);
-void SpiderScript_FreeValue(tSpiderValue *Value);
-char *SpiderScript_DumpValue(tSpiderValue *Value);
-
+// - Node Execution
tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node);
-tSpiderValue *AST_ExecuteNode_BinOp(tAST_BlockState *Block, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right);
-tSpiderValue *AST_ExecuteNode_UniOp(tAST_BlockState *Block, tAST_Node *Node, int Operation, tSpiderValue *Value);
-
+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, ...);
int giNextBlockIdent = 1;
// === CODE ===
-/**
- * \brief Dereference a created object
- */
-void Object_Dereference(tSpiderValue *Object)
+tSpiderValue *AST_ExecuteFunction(tSpiderScript *Script, tScript_Function *Fcn, int NArguments, tSpiderValue **Arguments)
{
- if(!Object) return ;
- if(Object == ERRPTR) return ;
- Object->ReferenceCount --;
-// printf("%p Dereferenced (%i)\n", Object, 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 ++;
-// printf("%p Referenced (%i)\n", Object, Object->ReferenceCount);
-}
-
-/**
- * \brief Allocate and initialise a SpiderScript object
- */
-tSpiderObject *SpiderScript_AllocateObject(tSpiderObjectDef *Class, int ExtraBytes)
-{
- int size = sizeof(tSpiderObject) + Class->NAttributes * sizeof(tSpiderValue*) + ExtraBytes;
- tSpiderObject *ret = malloc(size);
-
- ret->Type = Class;
- ret->ReferenceCount = 1;
- ret->OpaqueData = &ret->Attributes[ Class->NAttributes ];
- memset( ret->Attributes, 0, Class->NAttributes * sizeof(tSpiderValue*) );
-
- return ret;
-}
-
-/**
- * \brief Create an integer object
- */
-tSpiderValue *SpiderScript_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 *SpiderScript_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 *SpiderScript_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;
- if( Data )
- memcpy(ret->String.Data, Data, Length);
- else
- memset(ret->String.Data, 0, Length);
- ret->String.Data[Length] = '\0';
- return ret;
-}
-
-/**
- * \brief Concatenate two strings
- */
-tSpiderValue *Object_StringConcat(const tSpiderValue *Str1, const tSpiderValue *Str2)
-{
- 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 *SpiderScript_CastValueTo(int Type, tSpiderValue *Source)
-{
- tSpiderValue *ret = ERRPTR;
- int len = 0;
-
- if( !Source )
+ int i = 0;
+
+ // 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 ++;
+
+ // Parse arguments
+ for( i = 0; i < Fcn->ArgumentCount; i ++ )
{
- switch(Type)
- {
- case SS_DATATYPE_INTEGER: return SpiderScript_CreateInteger(0);
- case SS_DATATYPE_REAL: return SpiderScript_CreateReal(0);
- case SS_DATATYPE_STRING: return SpiderScript_CreateString(4, "null");
- }
- return NULL;
+ if( i >= NArguments ) break; // TODO: Return gracefully
+ // TODO: Type checks
+ Variable_Define(&bs,
+ Fcn->Arguments[i].Type, Fcn->Arguments[i].Name,
+ Arguments[i]);
}
-
- // Check if anything needs to be done
- if( Source->Type == Type ) {
- Object_Reference(Source);
- return Source;
- }
-
- #if 0
+
+ // Execute function
+ ret = AST_ExecuteNode(&bs, Fcn->ASTFcn);
+ if(ret != ERRPTR)
{
- printf("Casting %i ", Source->Type);
- switch(Source->Type)
- {
- case SS_DATATYPE_INTEGER: printf("0x%lx", Source->Integer); break;
- case SS_DATATYPE_STRING: printf("\"%s\"", Source->String.Data); break;
- case SS_DATATYPE_REAL: printf("%f", Source->Real); break;
- default: break;
- }
- printf(" to %i\n", Type);
+ SpiderScript_DereferenceValue(ret); // Dereference output of last block statement
+ ret = bs.RetVal; // Set to return value of block
}
- #endif
-
- #if 0
- if( Source->Type == SS_DATATYPE_OBJECT )
+
+ while(bs.FirstVar)
{
- const char *name = NULL;
- switch(Type)
- {
- case SS_DATATYPE_INTEGER: name = "cast Integer"; break;
- case SS_DATATYPE_REAL: name = "cast Real"; break;
- case SS_DATATYPE_STRING: name = "cast String"; break;
- case SS_DATATYPE_ARRAY: name = "cast Array"; break;
- default:
- AST_RuntimeError(NULL, "Invalid cast to %i from Object", Type);
- return ERRPTR;
- }
- if( fcnname )
- {
- ret = Object_ExecuteMethod(Left->Object, fcnname, Right);
- if( ret != ERRPTR )
- return ret;
- // Fall through and try casting (which will usually fail)
- }
+ tAST_Variable *nextVar = bs.FirstVar->Next;
+ Variable_Destroy( bs.FirstVar );
+ bs.FirstVar = nextVar;
}
- #endif
-
- switch( (enum eSpiderScript_DataTypes)Type )
- {
- case SS_DATATYPE_UNDEF:
- case SS_DATATYPE_ARRAY:
- case SS_DATATYPE_OPAQUE:
- case SS_DATATYPE_OBJECT:
- AST_RuntimeError(NULL, "Invalid cast to %i", Type);
- return ERRPTR;
-
- 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:
- AST_RuntimeError(NULL, "Invalid cast from %i to Integer", Source->Type);
- free(ret);
- ret = ERRPTR;
- break;
- }
- break;
-
- case SS_DATATYPE_REAL:
- ret = malloc(sizeof(tSpiderValue));
- ret->Type = SS_DATATYPE_REAL;
- ret->ReferenceCount = 1;
- switch(Source->Type)
- {
- case SS_DATATYPE_STRING: ret->Real = atof(Source->String.Data); break;
- case SS_DATATYPE_INTEGER: ret->Real = Source->Integer; break;
- default:
- AST_RuntimeError(NULL, "Invalid cast from %i to Real", Source->Type);
- free(ret);
- ret = ERRPTR;
- break;
- }
- break;
-
- case SS_DATATYPE_STRING:
- switch(Source->Type)
- {
- case SS_DATATYPE_INTEGER: len = snprintf(NULL, 0, "%li", Source->Integer); break;
- case SS_DATATYPE_REAL: len = snprintf(NULL, 0, "%g", Source->Real); break;
- default: break;
- }
- ret = malloc(sizeof(tSpiderValue) + len + 1);
- ret->Type = SS_DATATYPE_STRING;
- ret->ReferenceCount = 1;
- ret->String.Length = len;
- switch(Source->Type)
- {
- case SS_DATATYPE_INTEGER: sprintf(ret->String.Data, "%li", Source->Integer); break;
- case SS_DATATYPE_REAL:
- sprintf(ret->String.Data, "%g", Source->Real); break;
- default:
- AST_RuntimeError(NULL, "Invalid cast from %i to String", Source->Type);
- free(ret);
- ret = ERRPTR;
- break;
- }
- break;
-
- default:
- AST_RuntimeError(NULL, "BUG - BUG REPORT: Unimplemented cast target %i", Type);
- ret = ERRPTR;
- break;
- }
-
return ret;
}
-/**
- * \brief Condenses a value down to a boolean
- */
-int SpiderScript_IsValueTrue(tSpiderValue *Value)
-{
- if( Value == ERRPTR ) return 0;
- if( Value == NULL ) return 0;
-
- switch( (enum eSpiderScript_DataTypes)Value->Type )
- {
- case SS_DATATYPE_UNDEF:
- 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:
- AST_RuntimeError(NULL, "Unknown type %i in SpiderScript_IsValueTrue", Value->Type);
- return 0;
- }
- return 0;
-}
-
-/**
- * \brief Free a value
- * \note Just calls Object_Dereference
- */
-void SpiderScript_FreeValue(tSpiderValue *Value)
-{
- Object_Dereference(Value);
-}
-
-/**
- * \brief Dump a value into a string
- * \return Heap string
- */
-char *SpiderScript_DumpValue(tSpiderValue *Value)
-{
- char *ret;
- if( Value == ERRPTR )
- return strdup("ERRPTR");
- if( Value == NULL )
- return strdup("null");
-
- switch( (enum eSpiderScript_DataTypes)Value->Type )
- {
- case SS_DATATYPE_UNDEF: return strdup("undefined");
-
- case SS_DATATYPE_INTEGER:
- ret = malloc( sizeof(Value->Integer)*2 + 3 );
- sprintf(ret, "0x%lx", Value->Integer);
- return ret;
-
- case SS_DATATYPE_REAL:
- ret = malloc( sprintf(NULL, "%f", Value->Real) + 1 );
- sprintf(ret, "%f", Value->Real);
- return ret;
-
- case SS_DATATYPE_STRING:
- ret = malloc( Value->String.Length + 3 );
- ret[0] = '"';
- strcpy(ret+1, Value->String.Data);
- ret[Value->String.Length+1] = '"';
- ret[Value->String.Length+2] = '\0';
- return ret;
-
- case SS_DATATYPE_OBJECT:
- ret = malloc( sprintf(NULL, "{%s *%p}", Value->Object->Type->Name, Value->Object) + 1 );
- sprintf(ret, "{%s *%p}", Value->Object->Type->Name, Value->Object);
- return ret;
-
- case SS_DATATYPE_OPAQUE:
- ret = malloc( sprintf(NULL, "*%p", Value->Opaque.Data) + 1 );
- sprintf(ret, "*%p", Value->Opaque.Data);
- return ret;
-
- case SS_DATATYPE_ARRAY:
- return strdup("Array");
-
- default:
- AST_RuntimeError(NULL, "Unknown type %i in Object_Dump", Value->Type);
- return NULL;
- }
-
-}
-
/**
* \brief Execute a script function
* \param Script Script context to execute in
{
int bFound = 0; // Used to keep nesting levels down
tSpiderValue *ret = ERRPTR;
- tSpiderFunction *fcn;
// First: Find the function in the script
{
- tAST_Function *astFcn;
- for( astFcn = Script->Script->Functions; astFcn; astFcn = astFcn->Next )
+ tScript_Function *fcn;
+ for( fcn = Script->Functions; fcn; fcn = fcn->Next )
{
- if( strcmp(astFcn->Name, Function) == 0 )
+ if( strcmp(fcn->Name, Function) == 0 )
break;
}
// Execute!
- if(astFcn)
+ if(fcn)
{
- tAST_BlockState bs;
- tAST_Node *arg;
- int i = 0;
-
- // 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 ++;
-
- // Parse arguments
- for( arg = astFcn->Arguments; arg; arg = arg->NextSibling, i++ )
- {
- if( i >= NArguments ) break; // TODO: Return gracefully
- // TODO: Type checks
- Variable_Define(&bs,
- arg->DefVar.DataType, arg->DefVar.Name,
- Arguments[i]);
- }
-
- // Execute function
- ret = AST_ExecuteNode(&bs, astFcn->Code);
- if(ret != ERRPTR)
- {
- Object_Dereference(ret); // Dereference output of last block statement
- ret = bs.RetVal; // Set to return value of block
- }
+ ret = AST_ExecuteFunction(Script, fcn, NArguments, Arguments);
bFound = 1;
-
- while(bs.FirstVar)
- {
- tAST_Variable *nextVar = bs.FirstVar->Next;
- Variable_Destroy( bs.FirstVar );
- bs.FirstVar = nextVar;
- }
}
}
// Didn't find it in script?
if(!bFound)
{
+ tSpiderFunction *fcn;
fcn = NULL; // Just to allow the below code to be neat
// Second: Scan current namespace
ret = AST_ExecuteNode(&bs, astFcn->Code);
if( ret != ERRPTR )
{
- Object_Dereference(ret); // Dereference output of last block statement
+ SpiderScript_DereferenceValue(ret); // Dereference output of last block statement
ret = bs.RetVal; // Set to return value of block
}
bFound = 1;
{
ret = AST_ExecuteNode(&blockInfo, node);
if(ret == ERRPTR) break; // Error check
- if(ret != NULL) Object_Dereference(ret); // Free unused value
+ if(ret != NULL) SpiderScript_DereferenceValue(ret); // Free unused value
}
// Clean up variables
while(blockInfo.FirstVar)
// Perform assignment operation
if( Node->Assign.Operation != NODETYPE_NOP )
{
- tSpiderValue *varVal = Variable_GetValue(Block, Node->Assign.Dest);
- tSpiderValue *value;
- value = AST_ExecuteNode_BinOp(Block, Node, Node->Assign.Operation, varVal, ret);
+ 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) Object_Dereference(ret);
- if(varVal) Object_Dereference(varVal);
+
+ 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 ) ) {
- Object_Dereference( ret );
+ SpiderScript_DereferenceValue( ret );
return ERRPTR;
}
break;
varVal = Variable_GetValue(Block, Node->UniOp.Value);
if( Node->Type == NODETYPE_POSTDEC )
- value = AST_ExecuteNode_BinOp(Block, Node, NODETYPE_SUBTRACT, varVal, &one);
+ value = AST_ExecuteNode_BinOp(Block->Script, Node, NODETYPE_SUBTRACT, varVal, &one);
else
- value = AST_ExecuteNode_BinOp(Block, Node, NODETYPE_ADD, varVal, &one);
+ 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 ) ) {
- Object_Dereference( ret );
+ SpiderScript_DereferenceValue( ret );
return ERRPTR;
}
- Object_Dereference( value );
+ SpiderScript_DereferenceValue( value );
}
break;
{
params[i] = AST_ExecuteNode(Block, node);
if( params[i] == ERRPTR ) {
- while(i--) Object_Dereference(params[i]);
+ while(i--) SpiderScript_DereferenceValue(params[i]);
ret = ERRPTR;
goto _return;
}
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--) Object_Dereference(params[i]);
+ while(i--) SpiderScript_DereferenceValue(params[i]);
ret = ERRPTR;
break;
}
obj->Object, Node->FunctionCall.Name,
Node->FunctionCall.NumArgs, params
);
- Object_Dereference(obj);
+ SpiderScript_DereferenceValue(obj);
}
else
{
// Dereference parameters
- while(i--) Object_Dereference(params[i]);
+ while(i--) SpiderScript_DereferenceValue(params[i]);
// falls out
}
else {
tmpobj = AST_ExecuteNode(Block, Node->If.False);
}
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
if( tmpobj == ERRPTR ) return ERRPTR;
- Object_Dereference(tmpobj);
+ SpiderScript_DereferenceValue(tmpobj);
ret = NULL;
break;
// Check initial condition
if( !Node->For.bCheckAfter )
{
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
ret = AST_ExecuteNode(Block, Node->For.Condition);
if(ret == ERRPTR) return ERRPTR;
if(!SpiderScript_IsValueTrue(ret)) {
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
ret = NULL;
break;
}
// Perform loop
for( ;; )
{
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
// Code
ret = AST_ExecuteNode(Block, Node->For.Code);
if(ret == ERRPTR) return ERRPTR;
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
if(Block->BreakTarget)
{
// Increment
ret = AST_ExecuteNode(Block, Node->For.Increment);
if(ret == ERRPTR) return ERRPTR;
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
// Check condition
ret = AST_ExecuteNode(Block, Node->For.Condition);
if(ret == ERRPTR) return ERRPTR;
if(!SpiderScript_IsValueTrue(ret)) break;
}
- Object_Dereference(ret);
+ SpiderScript_DereferenceValue(ret);
ret = NULL;
break;
else {
tmpobj = NULL;
}
+ // TODO: Handle arrays
ret = NULL;
if( Variable_Define(Block, Node->DefVar.DataType, Node->DefVar.Name, tmpobj) == ERRPTR )
ret = ERRPTR;
- Object_Dereference(tmpobj);
+ SpiderScript_DereferenceValue(tmpobj);
break;
// Scope
if( strcmp(Node->Scope.Name, tmpobj->Object->Type->AttributeDefs[i].Name) == 0 )
{
ret = tmpobj->Object->Attributes[i];
- Object_Reference(ret);
+ SpiderScript_ReferenceValue(ret);
break;
}
}
tmpobj = AST_ExecuteNode(Block, Node->Cast.Value);
if(tmpobj == ERRPTR) return ERRPTR;
ret = SpiderScript_CastValueTo( Node->Cast.DataType, tmpobj );
- Object_Dereference(tmpobj);
+ SpiderScript_DereferenceValue(tmpobj);
}
break;
if(op1 == ERRPTR) return ERRPTR;
op2 = AST_ExecuteNode(Block, Node->BinOp.Right); // Offset
if(op2 == ERRPTR) {
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
return ERRPTR;
}
if( !op2 || op2->Type != SS_DATATYPE_INTEGER )
{
tmpobj = SpiderScript_CastValueTo(SS_DATATYPE_INTEGER, op2);
- Object_Dereference(op2);
+ SpiderScript_DereferenceValue(op2);
op2 = tmpobj;
}
}
ret = op1->Array.Items[ op2->Integer ];
- Object_Reference(ret);
+ SpiderScript_ReferenceValue(ret);
- Object_Dereference(op1);
- Object_Dereference(op2);
+ SpiderScript_DereferenceValue(op1);
+ SpiderScript_DereferenceValue(op2);
break;
// TODO: Implement runtime constants
case NODETYPE_CONSTANT:
- // TODO: Scan namespace for function
+ // TODO: Scan namespace for constant name
AST_RuntimeError(Node, "TODO - Runtime Constants");
ret = ERRPTR;
break;
case NODETYPE_INTEGER:
case NODETYPE_REAL:
ret = &Node->Constant;
- Object_Reference(ret);
+ SpiderScript_ReferenceValue(ret);
break;
// --- Operations ---
op1 = AST_ExecuteNode(Block, Node->UniOp.Value);
if(op1 == ERRPTR) return ERRPTR;
ret = SpiderScript_CreateInteger( !SpiderScript_IsValueTrue(op1) );
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
break;
case NODETYPE_LOGICALAND: // Logical AND (&&)
case NODETYPE_LOGICALOR: // Logical OR (||)
if(op1 == ERRPTR) return ERRPTR;
op2 = AST_ExecuteNode(Block, Node->BinOp.Right);
if(op2 == ERRPTR) {
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
return ERRPTR;
}
}
// Free intermediate objects
- Object_Dereference(op1);
- Object_Dereference(op2);
+ SpiderScript_DereferenceValue(op1);
+ SpiderScript_DereferenceValue(op2);
break;
// Comparisons
if(op1 == ERRPTR) return ERRPTR;
op2 = AST_ExecuteNode(Block, Node->BinOp.Right);
if(op2 == ERRPTR) {
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
ret = ERRPTR;
break;
}
if( !op1 || !op2 ) {
AST_RuntimeError(Node, "NULL Comparison (%p and %p)", op1, op2);
- if(op1) Object_Dereference(op1);
- if(op2) Object_Dereference(op2);
+ if(op1) SpiderScript_DereferenceValue(op1);
+ if(op2) SpiderScript_DereferenceValue(op2);
ret = SpiderScript_CreateInteger( !op1 && !op2 );
break;
}
{
tmpobj = op2;
op2 = SpiderScript_CastValueTo(op1->Type, op2);
- Object_Dereference(tmpobj);
+ SpiderScript_DereferenceValue(tmpobj);
if(op2 == ERRPTR) {
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
return ERRPTR;
}
}
}
// Free intermediate objects
- Object_Dereference(op1);
- Object_Dereference(op2);
+ SpiderScript_DereferenceValue(op1);
+ SpiderScript_DereferenceValue(op2);
// Error check
if( ret == ERRPTR )
case NODETYPE_NEGATE: // Negation (-)
op1 = AST_ExecuteNode(Block, Node->UniOp.Value);
if(op1 == ERRPTR) return ERRPTR;
- ret = AST_ExecuteNode_UniOp(Block, Node, Node->Type, op1);
- Object_Dereference(op1);
+ ret = AST_ExecuteNode_UniOp(Block->Script, Node, Node->Type, op1);
+ SpiderScript_DereferenceValue(op1);
break;
// General Binary Operations
if(op1 == ERRPTR) return ERRPTR;
op2 = AST_ExecuteNode(Block, Node->BinOp.Right);
if(op2 == ERRPTR) {
- Object_Dereference(op1);
+ SpiderScript_DereferenceValue(op1);
return ERRPTR;
}
- ret = AST_ExecuteNode_BinOp(Block, Node, Node->Type, op1, op2);
+ ret = AST_ExecuteNode_BinOp(Block->Script, Node, Node->Type, op1, op2);
// Free intermediate objects
- Object_Dereference(op1);
- Object_Dereference(op2);
+ SpiderScript_DereferenceValue(op1);
+ SpiderScript_DereferenceValue(op2);
break;
//default:
return ret;
}
-tSpiderValue *AST_ExecuteNode_UniOp(tAST_BlockState *Block, tAST_Node *Node, int Operation, tSpiderValue *Value)
+tSpiderValue *AST_ExecuteNode_UniOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Value)
{
tSpiderValue *ret;
#if 0
ret = Object_ExecuteMethod(Value->Object, fcnname, );
if( ret != ERRPTR )
return ret;
- // Fall through and try casting (which will usually fail)
}
}
#endif
{
// 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 = SpiderScript_CreateInteger( -Value->Integer ); break;
- case NODETYPE_BWNOT: ret = SpiderScript_CreateInteger( ~Value->Integer ); break;
+ 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;
}
return ret;
}
-tSpiderValue *AST_ExecuteNode_BinOp(tAST_BlockState *Block, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right)
+tSpiderValue *AST_ExecuteNode_BinOp(tSpiderScript *Script, tAST_Node *Node, int Operation, tSpiderValue *Left, tSpiderValue *Right)
{
tSpiderValue *preCastValue = Right;
tSpiderValue *ret;
#endif
// If implicit casts are allowed, convert Right to Left's type
- if(Block->Script->Variant->bImplicitCasts)
+ if(Script->Variant->bImplicitCasts)
{
Right = SpiderScript_CastValueTo(Left->Type, Right);
if(Right == ERRPTR)
switch(Operation)
{
case NODETYPE_ADD: // Concatenate
- ret = Object_StringConcat(Left, Right);
+ ret = SpiderScript_StringConcat(Left, Right);
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;
// 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 = SpiderScript_CreateInteger( Left->Integer + Right->Integer ); break;
- case NODETYPE_SUBTRACT: ret = SpiderScript_CreateInteger( Left->Integer - Right->Integer ); break;
- case NODETYPE_MULTIPLY: ret = SpiderScript_CreateInteger( Left->Integer * Right->Integer ); break;
- case NODETYPE_DIVIDE: ret = SpiderScript_CreateInteger( Left->Integer / Right->Integer ); break;
- case NODETYPE_MODULO: ret = SpiderScript_CreateInteger( Left->Integer % Right->Integer ); break;
- case NODETYPE_BWAND: ret = SpiderScript_CreateInteger( Left->Integer & Right->Integer ); break;
- case NODETYPE_BWOR: ret = SpiderScript_CreateInteger( Left->Integer | Right->Integer ); break;
- case NODETYPE_BWXOR: ret = SpiderScript_CreateInteger( Left->Integer ^ Right->Integer ); break;
- case NODETYPE_BITSHIFTLEFT: ret = SpiderScript_CreateInteger( Left->Integer << Right->Integer ); break;
- case NODETYPE_BITSHIFTRIGHT:ret = SpiderScript_CreateInteger( Left->Integer >> Right->Integer ); break;
+ 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 = SpiderScript_CreateInteger( (Left->Integer << Right->Integer) | (Left->Integer >> (64-Right->Integer)) );
+ ret->Integer = (Left->Integer << Right->Integer) | (Left->Integer >> (64-Right->Integer));
break;
default:
AST_RuntimeError(Node, "SpiderScript internal error: Exec,BinOP,Integer unknown op %i", Operation);
+ SpiderScript_DereferenceValue(ret);
ret = ERRPTR;
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 = SpiderScript_CreateReal( Left->Real + Right->Real ); break;
- case NODETYPE_SUBTRACT: ret = SpiderScript_CreateReal( Left->Real - Right->Real ); break;
- case NODETYPE_MULTIPLY: ret = SpiderScript_CreateReal( Left->Real * Right->Real ); break;
- case NODETYPE_DIVIDE: ret = SpiderScript_CreateReal( Left->Real / Right->Real ); break;
+ 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;
}
var->Next = NULL;
var->Type = Type;
var->Object = Value;
- if(Value) Object_Reference(Value);
+ if(Value) SpiderScript_ReferenceValue(Value);
strcpy(var->Name, Name);
if(prev) prev->Next = var;
}
// printf("Assign %p to '%s'\n", Value, var->Name);
- Object_Reference(Value);
- Object_Dereference(var->Object);
+ SpiderScript_ReferenceValue(Value);
+ SpiderScript_DereferenceValue(var->Object);
var->Object = Value;
return 0;
}
if( !var ) return ERRPTR;
- Object_Reference(var->Object);
+ SpiderScript_ReferenceValue(var->Object);
return var->Object;
}
void Variable_Destroy(tAST_Variable *Variable)
{
// printf("Variable_Destroy: (%p'%s')\n", Variable, Variable->Name);
- Object_Dereference(Variable->Object);
+ SpiderScript_DereferenceValue(Variable->Object);
free(Variable);
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au