X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fmain.c;h=d6cd722e2ea0773e7ac894d816db9095e2789a9a;hb=239f2374299c1471a40b1087725b32f3f163d9b3;hp=6ebd277973ad75e8618e004d9f3287b8ae8c6974;hpb=ec4d050568da0f3f18a20969bd118b5c67f03ee2;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/main.c b/Usermode/Libraries/libspiderscript.so_src/main.c
index 6ebd2779..d6cd722e 100644
--- a/Usermode/Libraries/libspiderscript.so_src/main.c
+++ b/Usermode/Libraries/libspiderscript.so_src/main.c
@@ -6,11 +6,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <spiderscript.h>
+#include "common.h"
 #include "ast.h"
+#include "bytecode_gen.h"
 
 // === IMPORTS ===
-extern tAST_Script	*Parse_Buffer(tSpiderVariant *Variant, char *Buffer);
-extern tSpiderFunction	*gpExports_First;
+extern  int	Parse_Buffer(tSpiderScript *Script, const char *Buffer, const char *Filename);
 extern tAST_Variable *Variable_Define(tAST_BlockState *Block, int Type, const char *Name);
 extern void	Variable_SetValue(tAST_BlockState *Block, const char *Name, tSpiderValue *Value);
 extern void	Variable_Destroy(tAST_Variable *Variable);
@@ -43,10 +44,6 @@ tSpiderScript *SpiderScript_ParseFile(tSpiderVariant *Variant, const char *Filen
 		return NULL;
 	}
 	
-	// Create the script
-	ret = malloc(sizeof(tSpiderScript));
-	ret->Variant = Variant;
-	
 	fseek(fp, 0, SEEK_END);
 	fLen = ftell(fp);
 	fseek(fp, 0, SEEK_SET);
@@ -54,14 +51,23 @@ tSpiderScript *SpiderScript_ParseFile(tSpiderVariant *Variant, const char *Filen
 	// Allocate and read data
 	data = malloc(fLen + 1);
 	if(!data)	return NULL;
-	fread(data, fLen, 1, fp);
+	fLen = fread(data, 1, fLen, fp);
+	fclose(fp);
+	if( fLen < 0 ) {
+		free(data);
+		return NULL;
+	}
 	data[fLen] = '\0';
 	
-	fclose(fp);
+	
+	// Create the script
+	ret = malloc(sizeof(tSpiderScript));
+	ret->Variant = Variant;
+	ret->Functions = NULL;
+	ret->LastFunction = NULL;
 	
 	ret->CurNamespace = NULL;
-	ret->Script = Parse_Buffer(Variant, data);
-	if( ret->Script == NULL ) {
+	if( Parse_Buffer(ret, data, Filename) ) {
 		free(data);
 		free(ret);
 		return NULL;
@@ -75,14 +81,14 @@ tSpiderScript *SpiderScript_ParseFile(tSpiderVariant *Variant, const char *Filen
 		size_t	size;
 		
 		printf("Total Size: ");	fflush(stdout);
-		size = AST_WriteScript(NULL, ret->Script);
+		size = AST_WriteScript(NULL, ret);
 		printf("0x%x bytes\n", (unsigned)size);
 		
 		fp = fopen(cacheFilename, "wb");
 		if(!fp)	return ret;
 		
 		data = malloc(size);
-		AST_WriteScript(data, ret->Script);
+		size = AST_WriteScript(data, ret);
 		fwrite(data, size, 1, fp);
 		free(data);
 		fclose(fp);
@@ -91,120 +97,9 @@ tSpiderScript *SpiderScript_ParseFile(tSpiderVariant *Variant, const char *Filen
 	return ret;
 }
 
-/**
- * \brief Execute a script function
- * \param Script	Script context to execute in
- * \param Function	Function name to execute
- * \param NArguments	Number of arguments to pass
- * \param Arguments	Arguments passed
- */
-tSpiderValue *SpiderScript_ExecuteMethod(tSpiderScript *Script,
-	const char *Function, int NArguments, tSpiderValue **Arguments)
+int SpiderScript_SaveBytecode(tSpiderScript *Script, const char *DestFile)
 {
-	char	*trueName = NULL;
-	 int	bFound = 0;	// Used to keep nesting levels down
-	tSpiderValue	*ret = ERRPTR;
-	
-	// Handle namespaces
-	if( Function[0] == '.' ) {
-		trueName = (char*)&Function[1];
-	}
-	else if( !Script->CurNamespace ) {
-		trueName = (char*)Function;
-	}
-	else {
-		 int	len = strlen(Script->CurNamespace) + 1 + strlen(Function);
-		trueName = malloc( len + 1 );
-		strcpy(trueName, Script->CurNamespace);
-		strcat(trueName, ".");
-		strcat(trueName, Function);
-	}
-	
-	// First: Find the function in the script
-	{
-		tAST_Function	*fcn = Script->Script->Functions;
-		for( ; fcn; fcn = fcn->Next ) {
-			if( strcmp(fcn->Name, trueName) == 0 )
-				break;
-		}
-		// Execute!
-		if(fcn) {
-			tAST_BlockState	bs;
-			bs.FirstVar = NULL;
-			bs.RetVal = NULL;
-			bs.Parent = NULL;
-			bs.Script = Script;
-			{
-				tAST_Node	*arg;
-				 int	i = 0;
-				for( arg = fcn->Arguments; arg; arg = arg->NextSibling, i++ )
-				{
-					// TODO: Type checks
-					Variable_Define(&bs, arg->DefVar.DataType, arg->DefVar.Name);
-					if( i >= NArguments )	break;	// TODO: Return gracefully
-					Variable_SetValue(&bs, arg->DefVar.Name, Arguments[i]);
-				}
-			}
-			ret = AST_ExecuteNode(&bs, fcn->Code);
-			Object_Dereference(ret);
-			ret = bs.RetVal;
-			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;
-		// Second: Search the variant's exports
-		for( fcn = Script->Variant->Functions; fcn; fcn = fcn->Next )
-		{
-			if( strcmp( fcn->Name, trueName ) == 0 )
-				break;
-		}
-		// Execute!
-		if(fcn) {
-			// TODO: Type Checking
-			ret = fcn->Handler( Script, NArguments, Arguments );
-			bFound = 1;
-		}
-	}
-	
-	// Not in variant exports? Search the language internal ones
-	if(!bFound)
-	{
-		tSpiderFunction	*fcn;
-		// Third: Search language exports
-		for( fcn = gpExports_First; fcn; fcn = fcn->Next )
-		{
-			if( strcmp( fcn->Name, trueName ) == 0 )
-				break;
-		}
-		// Execute!
-		if(fcn) {
-			ret = fcn->Handler( Script, NArguments, Arguments );
-			bFound = 1;
-		}
-	}
-	
-	// Not found?
-	if(!bFound)
-	{
-		fprintf(stderr, "Undefined reference to '%s'\n", trueName);
-	}
-	
-	if( trueName != Function && trueName != &Function[1] )
-		free(trueName);
-	
-	return ret;
-	
+	return Bytecode_ConvertScript(Script, DestFile);
 }
 
 /**
@@ -212,31 +107,19 @@ tSpiderValue *SpiderScript_ExecuteMethod(tSpiderScript *Script,
  */
 void SpiderScript_Free(tSpiderScript *Script)
 {
-	tAST_Function	*fcn = Script->Script->Functions;
-	tAST_Function	*nextFcn;
-	tAST_Node	*var, *nextVar;
+	tScript_Function	*fcn = Script->Functions;
+	tScript_Function	*nextFcn;
 	
 	// Free functions
 	while(fcn)
 	{
-		
-		AST_FreeNode( fcn->Code );
-		
-		var = fcn->Arguments;
-		while(var)
-		{
-			nextVar = var->NextSibling;
-			AST_FreeNode( var );
-			var = nextVar;
-		}
-		
+		if(fcn->ASTFcn)	AST_FreeNode( fcn->ASTFcn );
+		if(fcn->BCFcn)	Bytecode_DeleteFunction( fcn->BCFcn );
+
 		nextFcn = fcn->Next;
 		free( fcn );
 		fcn = nextFcn;
 	}
 	
-	// TODO: Pass this off to AST for a proper cleanup
-	free(Script->Script);
-	
 	free(Script);
 }