From 957b620703f6c14e788c8920509473518eaa3e3c Mon Sep 17 00:00:00 2001
From: "zik.saleeba" <zik.saleeba@21eae674-98b7-11dd-bd71-f92a316d2d60>
Date: Thu, 19 Feb 2009 23:55:40 +0000
Subject: [PATCH] Revised stack and parameter handling in intrinsic functions

git-svn-id: http://picoc.googlecode.com/svn/trunk@92 21eae674-98b7-11dd-bd71-f92a316d2d60
---
 intrinsic.c | 10 +++++-----
 parse.c     | 20 +++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/intrinsic.c b/intrinsic.c
index fbc7934..5613cd8 100644
--- a/intrinsic.c
+++ b/intrinsic.c
@@ -2,24 +2,24 @@
 #include <string.h>
 #include "picoc.h"
 
-void IntrinsicPrintInt(void)
+void IntrinsicPrintInt(struct Value *ReturnValue, struct Value **Param)
 {
-    printf("%d\n", TopStackFrame->Parameter[0]->Val->Integer);
+    printf("%d\n", Param[0]->Val->Integer);
 }
 
-void IntrinsicPrintf(void)
+void IntrinsicPrintf(struct Value *ReturnValue, struct Value **Param)
 {
     printf("IntrinsicPrintf\n");
 }
 
-void IntrinsicSayHello(void)
+void IntrinsicSayHello(struct Value *ReturnValue, struct Value **Param)
 {
     printf("Hello\n");
 }
 
 struct IntrinsicFunction
 {
-    void (*Func)(void);
+    void (*Func)(struct Value *, struct Value **);
     const char *Prototype;
 } Intrinsics[] =
 {
diff --git a/parse.c b/parse.c
index 51b2a79..bbba38f 100644
--- a/parse.c
+++ b/parse.c
@@ -20,6 +20,7 @@ void ParseFunctionCall(struct ParseState *Parser, struct Value **Result, const c
 {
     struct Value *FuncValue;
     struct Value *Param;
+    struct Value **IntrinsicParam;
     int ArgCount;
     enum LexToken Token = LexGetToken(Parser, NULL, TRUE);    /* open bracket */
     
@@ -30,8 +31,9 @@ void ParseFunctionCall(struct ParseState *Parser, struct Value **Result, const c
             ProgramFail(Parser, "not a function - can't call");
     
         *Result = VariableAllocValueFromType(Parser, FuncValue->Val->FuncDef.ReturnType, FALSE);
-        VariableStackFrameAdd(Parser, FuncValue->Val->FuncDef.Intrinsic ? FuncValue->Val->FuncDef.NumParams : 0);
-        TopStackFrame->ReturnValue = *Result;
+        HeapPushStackFrame();
+        if (FuncValue->Val->FuncDef.Intrinsic)
+            IntrinsicParam = HeapAllocStack(sizeof(struct Value *) * FuncValue->Val->FuncDef.NumParams);
     }
         
     /* parse arguments */
@@ -48,7 +50,7 @@ void ParseFunctionCall(struct ParseState *Parser, struct Value **Result, const c
                     ProgramFail(Parser, "parameter %d to %s() is the wrong type", ArgCount, FuncName);
 
                 if (FuncValue->Val->FuncDef.Intrinsic)
-                    TopStackFrame->Parameter[ArgCount] = Param;
+                    IntrinsicParam[ArgCount] = Param;
                 else
                     VariableDefine(Parser, FuncValue->Val->FuncDef.ParamName[ArgCount], Param);
             }
@@ -71,21 +73,25 @@ void ParseFunctionCall(struct ParseState *Parser, struct Value **Result, const c
         if (ArgCount < FuncValue->Val->FuncDef.NumParams)
             ProgramFail(Parser, "not enough arguments to '%s'", FuncName);
         
-        TopStackFrame->NumParams = ArgCount;
         if (FuncValue->Val->FuncDef.Intrinsic == NULL)
         { /* run a user-defined function */
             struct ParseState FuncParser = FuncValue->Val->FuncDef.Body;
-            
+            VariableStackFrameAdd(Parser, FuncValue->Val->FuncDef.Intrinsic ? FuncValue->Val->FuncDef.NumParams : 0);
+            TopStackFrame->NumParams = ArgCount;
+            TopStackFrame->ReturnValue = *Result;
+                
             if (!ParseStatement(&FuncParser))
                 ProgramFail(&FuncParser, "function body expected");
         
             if (FuncValue->Val->FuncDef.ReturnType != (*Result)->Typ)
                 ProgramFail(&FuncParser, "bad type of return value");
+
+            VariableStackFramePop(Parser);
         }
         else
-            FuncValue->Val->FuncDef.Intrinsic();
+            FuncValue->Val->FuncDef.Intrinsic(*Result, IntrinsicParam);
 
-        VariableStackFramePop(Parser);
+        HeapPopStackFrame();
     }
 }