From d1441d79e7611f7a226a816b317bc005b217b048 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 16 Jun 2012 10:49:34 +0200
Subject: [PATCH] Issue #181: added code generation for member variable access

---
 components/compiler/generator.cpp | 112 +++++++++++++++++++++++++++++-
 components/compiler/generator.hpp |   6 ++
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/components/compiler/generator.cpp b/components/compiler/generator.cpp
index 26a80387b1..b619ad67a3 100644
--- a/components/compiler/generator.cpp
+++ b/components/compiler/generator.cpp
@@ -260,6 +260,36 @@ namespace
         code.push_back (Compiler::Generator::segment5 (44));
     }
 
+    void opStoreMemberShort (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (59));
+    }
+
+    void opStoreMemberLong (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (60));
+    }
+
+    void opStoreMemberFloat (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (61));
+    }
+
+    void opFetchMemberShort (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (62));
+    }
+
+    void opFetchMemberLong (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (63));
+    }
+
+    void opFetchMemberFloat (Compiler::Generator::CodeContainer& code)
+    {
+        code.push_back (Compiler::Generator::segment5 (64));
+    }
+
     void opRandom (Compiler::Generator::CodeContainer& code)
     {
         code.push_back (Compiler::Generator::segment5 (45));
@@ -644,7 +674,7 @@ namespace Compiler
 
             if (localType!=valueType)
             {
-                if (localType=='f' && valueType=='l')
+                if (localType=='f' && (valueType=='l' || valueType=='s'))
                 {
                     opIntToFloat (code);
                 }
@@ -707,6 +737,86 @@ namespace Compiler
             }
         }
 
+        void assignToMember (CodeContainer& code, Literals& literals, char localType,
+            const std::string& name, const std::string& id, const CodeContainer& value, char valueType)
+        {
+            int index = literals.addString (name);
+
+            opPushInt (code, index);
+
+            index = literals.addString (id);
+
+            opPushInt (code, index);
+
+            std::copy (value.begin(), value.end(), std::back_inserter (code));
+
+            if (localType!=valueType)
+            {
+                if (localType=='f' && (valueType=='l' || valueType=='s'))
+                {
+                    opIntToFloat (code);
+                }
+                else if ((localType=='l' || localType=='s') && valueType=='f')
+                {
+                    opFloatToInt (code);
+                }
+            }
+
+            switch (localType)
+            {
+                case 'f':
+
+                    opStoreMemberFloat (code);
+                    break;
+
+                case 's':
+
+                    opStoreMemberShort (code);
+                    break;
+
+                case 'l':
+
+                    opStoreMemberLong (code);
+                    break;
+
+                default:
+
+                    assert (0);
+            }
+        }
+
+        void fetchMember (CodeContainer& code, Literals& literals, char localType,
+            const std::string& name, const std::string& id)
+        {
+            int index = literals.addString (name);
+
+            opPushInt (code, index);
+
+            index = literals.addString (id);
+
+            switch (localType)
+            {
+                case 'f':
+
+                    opFetchMemberFloat (code);
+                    break;
+
+                case 's':
+
+                    opFetchMemberShort (code);
+                    break;
+
+                case 'l':
+
+                    opFetchMemberLong (code);
+                    break;
+
+                default:
+
+                    assert (0);
+            }
+        }
+
         void random (CodeContainer& code)
         {
             opRandom (code);
diff --git a/components/compiler/generator.hpp b/components/compiler/generator.hpp
index 89e1984314..feab26c93d 100644
--- a/components/compiler/generator.hpp
+++ b/components/compiler/generator.hpp
@@ -101,6 +101,12 @@ namespace Compiler
         void fetchGlobal (CodeContainer& code, Literals& literals, char localType,
             const std::string& name);
 
+        void assignToMember (CodeContainer& code, Literals& literals, char memberType,
+            const std::string& name, const std::string& id, const CodeContainer& value, char valueType);
+
+        void fetchMember (CodeContainer& code, Literals& literals, char memberType,
+            const std::string& name, const std::string& id);
+
         void random (CodeContainer& code);
 
         void scriptRunning (CodeContainer& code);