SpiderScript - A day of debugging and improvements
[tpg/acess2.git] / Usermode / Libraries / libspiderscript.so_src / exec_ast.c
index cf7416a..b6b569f 100644 (file)
@@ -2,48 +2,70 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
 #include "ast.h"
 
 // === PROTOTYPES ===
-void   Object_Dereference(tSpiderObject *Object);
-void   Object_Reference(tSpiderObject *Object);
-tSpiderObject  *Object_CreateInteger(uint64_t Value);
-tSpiderObject  *Object_CreateReal(double Value);
-tSpiderObject  *Object_CreateString(int Length, const char *Data);
-tSpiderObject  *Object_CastTo(int Type, tSpiderObject *Source);
- int   Object_IsTrue(tSpiderObject *Value);
+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);
 
-tSpiderObject  *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node);
+tSpiderValue   *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node);
+tSpiderValue   *AST_ExecuteNode_BinOp(tAST_BlockState *Block, int Operation, tSpiderValue *Left, tSpiderValue *Right);
 
 tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name);
-void   Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderObject *Value);
-tSpiderObject  *Variable_GetValue(tAST_BlockState *Block, const char *Name);
+ int   Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderValue *Value);
+tSpiderValue   *Variable_GetValue(tAST_BlockState *Block, const char *Name);
 void   Variable_Destroy(tAST_Variable *Variable);
 
+void   AST_RuntimeError(tAST_Node *Node, const char *Format, ...);
+
 // === CODE ===
 /**
  * \brief Dereference a created object
  */
-void Object_Dereference(tSpiderObject *Object)
+void Object_Dereference(tSpiderValue *Object)
 {
        if(!Object)     return ;
+       if(Object == ERRPTR)    return ;
        Object->ReferenceCount --;
-       if( Object->ReferenceCount == 0 )       free(Object);
+//     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(tSpiderObject *Object)
+void Object_Reference(tSpiderValue *Object)
 {
        if(!Object)     return ;
        Object->ReferenceCount ++;
+//     printf("%p Referenced (%i)\n", Object, Object->ReferenceCount);
 }
 
 /**
  * \brief Create an integer object
  */
-tSpiderObject *Object_CreateInteger(uint64_t Value)
+tSpiderValue *SpiderScript_CreateInteger(uint64_t Value)
 {
-       tSpiderObject   *ret = malloc( sizeof(tSpiderObject) );
+       tSpiderValue    *ret = malloc( sizeof(tSpiderValue) );
        ret->Type = SS_DATATYPE_INTEGER;
        ret->ReferenceCount = 1;
        ret->Integer = Value;
@@ -53,9 +75,9 @@ tSpiderObject *Object_CreateInteger(uint64_t Value)
 /**
  * \brief Create an real number object
  */
-tSpiderObject *Object_CreateReal(double Value)
+tSpiderValue *SpiderScript_CreateReal(double Value)
 {
-       tSpiderObject   *ret = malloc( sizeof(tSpiderObject) );
+       tSpiderValue    *ret = malloc( sizeof(tSpiderValue) );
        ret->Type = SS_DATATYPE_REAL;
        ret->ReferenceCount = 1;
        ret->Real = Value;
@@ -65,9 +87,9 @@ tSpiderObject *Object_CreateReal(double Value)
 /**
  * \brief Create an string object
  */
-tSpiderObject *Object_CreateString(int Length, const char *Data)
+tSpiderValue *SpiderScript_CreateString(int Length, const char *Data)
 {
-       tSpiderObject   *ret = malloc( sizeof(tSpiderObject) + Length + 1 );
+       tSpiderValue    *ret = malloc( sizeof(tSpiderValue) + Length + 1 );
        ret->Type = SS_DATATYPE_STRING;
        ret->ReferenceCount = 1;
        ret->String.Length = Length;
@@ -79,13 +101,13 @@ tSpiderObject *Object_CreateString(int Length, const char *Data)
 /**
  * \brief Concatenate two strings
  */
-tSpiderObject *Object_StringConcat(tSpiderObject *Str1, tSpiderObject *Str2)
+tSpiderValue *Object_StringConcat(tSpiderValue *Str1, tSpiderValue *Str2)
 {
         int    newLen = 0;
-       tSpiderObject   *ret;
+       tSpiderValue    *ret;
        if(Str1)        newLen += Str1->String.Length;
        if(Str2)        newLen += Str2->String.Length;
-       ret = malloc( sizeof(tSpiderObject) + newLen + 1 );
+       ret = malloc( sizeof(tSpiderValue) + newLen + 1 );
        ret->Type = SS_DATATYPE_STRING;
        ret->ReferenceCount = 1;
        ret->String.Length = newLen;
@@ -103,26 +125,32 @@ tSpiderObject *Object_StringConcat(tSpiderObject *Str1, tSpiderObject *Str2)
 
 /**
  * \brief Cast one object to another
+ * \brief Type Destination type
+ * \brief Source       Input data
  */
-tSpiderObject *Object_CastTo(int Type, tSpiderObject *Source)
+tSpiderValue *SpiderScript_CastValueTo(int Type, tSpiderValue *Source)
 {
-       tSpiderObject   *ret = ERRPTR;
+       tSpiderValue    *ret = ERRPTR;
+        int    len = 0;
+
+       if( !Source )   return NULL;
+       
        // Check if anything needs to be done
        if( Source->Type == Type ) {
                Object_Reference(Source);
                return Source;
        }
        
-       switch(Type)
+       switch( (enum eSpiderScript_DataTypes)Type )
        {
        case SS_DATATYPE_UNDEF:
-       case SS_DATATYPE_NULL:
        case SS_DATATYPE_ARRAY:
-               fprintf(stderr, "Object_CastTo - Invalid cast to %i\n", Type);
+       case SS_DATATYPE_OPAQUE:
+               AST_RuntimeError(NULL, "Invalid cast to %i", Type);
                return ERRPTR;
        
        case SS_DATATYPE_INTEGER:
-               ret = malloc(sizeof(tSpiderObject));
+               ret = malloc(sizeof(tSpiderValue));
                ret->Type = SS_DATATYPE_INTEGER;
                ret->ReferenceCount = 1;
                switch(Source->Type)
@@ -131,14 +159,38 @@ tSpiderObject *Object_CastTo(int Type, tSpiderObject *Source)
                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);
+                       AST_RuntimeError(NULL, "Invalid cast from %i to Integer", 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:  snprintf(NULL, 0, "%f", 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, "%f", Source->Real);  break;
+               default:
+                       AST_RuntimeError(NULL, "Invalid cast from %i to String", Source->Type);
                        free(ret);
                        ret = ERRPTR;
                        break;
                }
                break;
+       
        default:
-               fprintf(stderr, "BUG REPORT: Unimplemented cast target\n");
+               AST_RuntimeError(NULL, "BUG - BUG REPORT: Unimplemented cast target");
                break;
        }
        
@@ -148,12 +200,14 @@ tSpiderObject *Object_CastTo(int Type, tSpiderObject *Source)
 /**
  * \brief Condenses a value down to a boolean
  */
-int Object_IsTrue(tSpiderObject *Value)
+int SpiderScript_IsValueTrue(tSpiderValue *Value)
 {
-       switch(Value->Type)
+       if( Value == ERRPTR )   return 0;
+       if( Value == NULL )     return 0;
+       
+       switch( (enum eSpiderScript_DataTypes)Value->Type )
        {
        case SS_DATATYPE_UNDEF:
-       case SS_DATATYPE_NULL:
                return 0;
        
        case SS_DATATYPE_INTEGER:
@@ -168,20 +222,89 @@ int Object_IsTrue(tSpiderObject *Value)
        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 an AST node and return its value
  */
-tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
+tSpiderValue *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
 {
        tAST_Node       *node;
-       tSpiderObject   *ret, *tmpobj;
-       tSpiderObject   *op1, *op2;     // Binary operations
+       tSpiderValue    *ret = NULL, *tmpobj;
+       tSpiderValue    *op1, *op2;     // Binary operations
         int    cmp;    // Used in comparisons
        
        switch(Node->Type)
@@ -194,23 +317,19 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                {
                        tAST_BlockState blockInfo;
                        blockInfo.FirstVar = NULL;
+                       blockInfo.RetVal = NULL;
                        blockInfo.Parent = Block;
                        blockInfo.Script = Block->Script;
                        ret = NULL;
-                       for(node = Node->Block.FirstChild; node; node = node->NextSibling )
+                       for(node = Node->Block.FirstChild; node && !blockInfo.RetVal; node = node->NextSibling )
                        {
-                               if(node->Type == NODETYPE_RETURN) {
-                                       ret = AST_ExecuteNode(&blockInfo, node);
+                               tmpobj = AST_ExecuteNode(&blockInfo, node);
+                               if(tmpobj == ERRPTR) {  // Error check
+                                       ret = ERRPTR;
                                        break ;
                                }
-                               else {
-                                       tmpobj = AST_ExecuteNode(&blockInfo, node);
-                                       if(tmpobj == ERRPTR) {  // Error check
-                                               ret = ERRPTR;
-                                               break ;
-                                       }
-                                       if(tmpobj)      Object_Dereference(tmpobj);     // Free unused value
-                               }
+                               if(tmpobj)      Object_Dereference(tmpobj);     // Free unused value
+                               tmpobj = NULL;
                        }
                        // Clean up variables
                        while(blockInfo.FirstVar)
@@ -219,6 +338,9 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                                Variable_Destroy( blockInfo.FirstVar );
                                blockInfo.FirstVar = nextVar;
                        }
+                       
+                       if( blockInfo.RetVal )
+                               Block->RetVal = blockInfo.RetVal;
                }
                
                break;
@@ -226,12 +348,29 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
        // Assignment
        case NODETYPE_ASSIGN:
                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;
+               
+               if( Node->Assign.Operation != NODETYPE_NOP )
+               {
+                       tSpiderValue    *varVal = Variable_GetValue(Block, Node->Assign.Dest->Variable.Name);
+                       tSpiderValue    *value;
+                       value = AST_ExecuteNode_BinOp(Block, Node->Assign.Operation, varVal, ret);
+                       if( value == ERRPTR )
+                               return ERRPTR;
+                       if(ret) Object_Dereference(ret);
+                       Object_Dereference(varVal);
+                       ret = value;
+               }
+               
+               if( Variable_SetValue( Block, Node->Assign.Dest->Variable.Name, ret ) ) {
+                       Object_Dereference( ret );
+                       return ERRPTR;
+               }
                break;
        
        // Function Call
@@ -243,7 +382,7 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                        }
                        // Logical block (used to allocate `params`)
                        {
-                               tSpiderObject   *params[nParams];
+                               tSpiderValue    *params[nParams];
                                 int    i=0;
                                for(node = Node->FunctionCall.FirstArg; node; node = node->NextSibling) {
                                        params[i] = AST_ExecuteNode(Block, node);
@@ -267,9 +406,56 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                }
                break;
        
-       // Return's special handling happens elsewhere
+       // Conditional
+       case NODETYPE_IF:
+               ret = AST_ExecuteNode(Block, Node->If.Condition);
+               if( SpiderScript_IsValueTrue(ret) ) {
+                       Object_Dereference(AST_ExecuteNode(Block, Node->If.True));
+               }
+               else {
+                       Object_Dereference(AST_ExecuteNode(Block, Node->If.False));
+               }
+               Object_Dereference(ret);
+               ret = NULL;
+               break;
+       
+       // Loop
+       case NODETYPE_LOOP:
+               ret = AST_ExecuteNode(Block, Node->For.Init);
+               if( Node->For.bCheckAfter )
+               {
+                       do {
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Code);
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Increment);
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Condition);
+                       } while( SpiderScript_IsValueTrue(ret) );
+               }
+               else
+               {
+                       Object_Dereference(ret);
+                       ret = AST_ExecuteNode(Block, Node->For.Condition);
+                       while( SpiderScript_IsValueTrue(ret) ) {
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Code);
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Increment);
+                               Object_Dereference(ret);
+                               ret = AST_ExecuteNode(Block, Node->For.Condition);
+                       }
+               }
+               Object_Dereference(ret);
+               ret = NULL;
+               break;
+       
+       // Return
        case NODETYPE_RETURN:
                ret = AST_ExecuteNode(Block, Node->UniOp.Value);
+               Block->RetVal = ret;    // Return value set
+               //Object_Reference(ret);        // Make sure it exists after return
+               ret = NULL;     // the `return` statement does not return a value
                break;
        
        // Define a variable
@@ -286,27 +472,28 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
 
        // Cast a value to another
        case NODETYPE_CAST:
-               ret = Object_CastTo(
-                       Node->Cast.DataType,
-                       AST_ExecuteNode(Block, Node->Cast.Value)
-                       );
+               {
+               tSpiderValue    *tmp = AST_ExecuteNode(Block, Node->Cast.Value);
+               ret = SpiderScript_CastValueTo( Node->Cast.DataType, tmp );
+               Object_Dereference(tmp);
+               }
                break;
 
        // Index into an array
        case NODETYPE_INDEX:
-               fprintf(stderr, "TODO: Array indexing\n");
+               AST_RuntimeError(Node, "TODO - Array Indexing");
                ret = ERRPTR;
                break;
 
        // TODO: Implement runtime constants
        case NODETYPE_CONSTANT:
-               fprintf(stderr, "TODO: Runtime Constants\n");
+               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:   ret = SpiderScript_CreateString( Node->String.Length, Node->String.Data );      break;
+       case NODETYPE_INTEGER:  ret = SpiderScript_CreateInteger( Node->Integer );      break;
+       case NODETYPE_REAL:     ret = SpiderScript_CreateReal( Node->Real );    break;
        
        // --- Operations ---
        // Boolean Operations
@@ -324,13 +511,13 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                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;
                }
@@ -352,22 +539,13 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                        return ERRPTR;
                }
                
-               // No conversion done for NULL
-               // TODO: Determine if this will ever be needed
-               if( op1->Type == SS_DATATYPE_NULL )
-               {
-                       // NULLs always typecheck
-                       ret = Object_CreateInteger(op2->Type == SS_DATATYPE_NULL);
-                       break;
-               }
-               
                // Convert types
                if( 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);
+                               op2 = SpiderScript_CastValueTo(op1->Type, op2);
                                Object_Dereference(tmpobj);
                                if(op2 == ERRPTR) {
                                        Object_Dereference(op1);
@@ -376,7 +554,7 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                        }
                        // If statically typed, this should never happen, but catch it anyway
                        else {
-                               fprintf(stderr, "PARSER ERROR: Statically typed implicit cast\n");
+                               AST_RuntimeError(Node, "Statically typed implicit cast");
                                ret = ERRPTR;
                                break;
                        }
@@ -384,8 +562,6 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                // Do operation
                switch(op1->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
@@ -403,20 +579,38 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                                        cmp = -1;
                        }
                        break;
+               
+               // - Integer Comparisons
+               case SS_DATATYPE_INTEGER:
+                       if( op1->Integer == op2->Integer )
+                               cmp = 0;
+                       else if( op1->Integer < op2->Integer )
+                               cmp = -1;
+                       else
+                               cmp = 1;
+                       break;
+               default:
+                       AST_RuntimeError(Node, "TODO - Comparison of type %i", op1->Type);
+                       ret = ERRPTR;
+                       break;
                }
                
                // Free intermediate objects
                Object_Dereference(op1);
                Object_Dereference(op2);
                
+               // Error check
+               if( ret == ERRPTR )
+                       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;
+               case NODETYPE_EQUALS:   ret = SpiderScript_CreateInteger(cmp == 0);     break;
+               case NODETYPE_LESSTHAN: ret = SpiderScript_CreateInteger(cmp < 0);      break;
+               case NODETYPE_GREATERTHAN:      ret = SpiderScript_CreateInteger(cmp > 0);      break;
                default:
-                       fprintf(stderr, "SpiderScript internal error: Exec,CmpOp unknown op %i", Node->Type);
+                       AST_RuntimeError(Node, "Exec,CmpOp unknown op %i", Node->Type);
                        ret = ERRPTR;
                        break;
                }
@@ -443,79 +637,141 @@ tSpiderObject *AST_ExecuteNode(tAST_BlockState *Block, tAST_Node *Node)
                        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)
+               ret = AST_ExecuteNode_BinOp(Block, Node->Type, op1, op2);
+               
+               // Free intermediate objects
+               Object_Dereference(op1);
+               Object_Dereference(op2);
+               break;
+       
+       //default:
+       //      ret = NULL;
+       //      AST_RuntimeError(Node, "BUG - SpiderScript AST_ExecuteNode Unimplemented %i\n", Node->Type);
+       //      break;
+       }
+_return:
+       return ret;
+}
+
+tSpiderValue *AST_ExecuteNode_BinOp(tAST_BlockState *Block, 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
                
-               // Do operation
-               switch(op1->Type)
+               // If implicit casts are allowed, convert Right to Left's type
+               if(Block->Script->Variant->bImplicitCasts)
                {
-               case SS_DATATYPE_NULL:  break;
-               // String Concatenation
-               case SS_DATATYPE_STRING:
-                       switch(Node->Type)
-                       {
-                       case NODETYPE_ADD:      // Concatenate
-                               ret = Object_StringConcat(op1, op2);
-                               break;
-                       default:
-                               fprintf(stderr, "SpiderScript internal error: Exec,BinOP,String unknown op %i\n", Node->Type);
-                               ret = ERRPTR;
-                               break;
-                       }
+                       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(NULL, "Implicit cast not allowed (from %i to %i)\n", Right->Type, Left->Type);
+                       return ERRPTR;
+               }
+       }
+       
+       // NULL Check
+       if( Left == NULL || Right == NULL ) {
+               if(Right && Right != preCastValue)      free(Right);
+               return NULL;
+       }
+       
+       // Do operation
+       switch(Left->Type)
+       {
+       // String Concatenation
+       case SS_DATATYPE_STRING:
+               switch(Operation)
+               {
+               case NODETYPE_ADD:      // Concatenate
+                       ret = Object_StringConcat(Left, Right);
                        break;
-               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", Node->Type);
-                               ret = ERRPTR;
-                               break;
-                       }
+               default:
+                       AST_RuntimeError(NULL, "SpiderScript internal error: Exec,BinOP,String unknown op %i", Operation);
+                       ret = ERRPTR;
+                       break;
+               }
+               break;
+       // Integer Operations
+       case SS_DATATYPE_INTEGER:
+               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_BITROTATELEFT:
+                       ret = SpiderScript_CreateInteger( (Left->Integer << Right->Integer) | (Left->Integer >> (64-Right->Integer)) );
+                       break;
+               default:
+                       AST_RuntimeError(NULL, "SpiderScript internal error: Exec,BinOP,Integer unknown op %i\n", Operation);
+                       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:
+               switch(Operation)
+               {
+               default:
+                       AST_RuntimeError(NULL, "SpiderScript internal error: Exec,BinOP,Real unknown op %i", Operation);
+                       ret = ERRPTR;
+                       break;
+               }
+               break;
+       
+       default:
+               AST_RuntimeError(NULL, "BUG - Invalid operation (%i) on type (%i)", Operation, Left->Type);
+               ret = ERRPTR;
+               break;
        }
-_return:
+       
+       if(Right && Right != preCastValue)      free(Right);
+       
        return ret;
 }
 
@@ -533,7 +789,7 @@ tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Nam
        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;
                }
        }
@@ -554,8 +810,9 @@ tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Nam
 
 /**
  * \brief Set the value of a variable
+ * \return Boolean Failure
  */
-void Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderObject *Value)
+int Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderValue *Value)
 {
        tAST_Variable   *var;
        tAST_BlockState *bs;
@@ -564,16 +821,19 @@ void Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderObject *
        {
                for( var = bs->FirstVar; var; var = var->Next )
                {
-                       if( strcmp(var->Name, Name) == 0 ) {
+                       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 ;
+                                && (Value && var->Type != Value->Type) )
+                               {
+                                       AST_RuntimeError(NULL, "Type mismatch assigning to '%s'", Name);
+                                       return -2;
                                }
+//                             printf("Assign %p to '%s'\n", Value, var->Name);
                                Object_Reference(Value);
                                Object_Dereference(var->Object);
                                var->Object = Value;
-                               return ;
+                               return 0;
                        }
                }
        }
@@ -584,17 +844,19 @@ void Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderObject *
                var = Variable_Define(Block, Value->Type, Name);
                Object_Reference(Value);
                var->Object = Value;
+               return 0;
        }
        else
        {
-               fprintf(stderr, "ERROR: Variable '%s' set while undefined\n", Name);
+               AST_RuntimeError(NULL, "Variable '%s' set while undefined", Name);
+               return -1;
        }
 }
 
 /**
  * \brief Get the value of a variable
  */
-tSpiderObject *Variable_GetValue(tAST_BlockState *Block, const char *Name)
+tSpiderValue *Variable_GetValue(tAST_BlockState *Block, const char *Name)
 {
        tAST_Variable   *var;
        tAST_BlockState *bs;
@@ -610,7 +872,8 @@ tSpiderObject *Variable_GetValue(tAST_BlockState *Block, const char *Name)
                }
        }
        
-       fprintf(stderr, "ERROR: Variable '%s' used undefined\n", Name);
+       
+       AST_RuntimeError(NULL, "Variable '%s' used undefined", Name);
        
        return ERRPTR;
 }
@@ -620,6 +883,23 @@ tSpiderObject *Variable_GetValue(tAST_BlockState *Block, const char *Name)
  */
 void Variable_Destroy(tAST_Variable *Variable)
 {
+//     printf("Variable_Destroy: (%p'%s')\n", Variable, Variable->Name);
        Object_Dereference(Variable->Object);
        free(Variable);
 }
+
+void AST_RuntimeError(tAST_Node *Node, const char *Format, ...)
+{
+       va_list args;
+       
+       fprintf(stderr, "ERROR: ");
+       va_start(args, Format);
+       vfprintf(stderr, Format, args);
+       va_end(args);
+       fprintf(stderr, "\n");
+       
+       if(Node)
+       {
+               fprintf(stderr, "   at %s:%i\n", Node->File, Node->Line);
+       }
+}

UCC git Repository :: git.ucc.asn.au