made tests with modifying lambdas on stack

Jakz · Oct 25, 2018 · f093776 · f093776
1 parent 462226d
commit f093776
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/src/defines.h b/src/defines.h
@@ -7,6 +7,19 @@
 
 #pragma once
 
+/**************************
+ * CONFIG
+ **************************/
+
+#define USE_PACKED_VALUES false
+
+
+
+
+
+
+/**************************/
+
 #include <stdlib.h>
 #include <algorithm>
 

diff --git a/src/instruction.cpp b/src/instruction.cpp
@@ -1121,6 +1121,11 @@ void Instruction::execute(VM *vm) const
           vv.push_back(v2);
           vm->push(v1);
         }
+        else if (v1.type == TYPE_LAMBDA)
+        {
+          Code* code = v1.lambda()->code();
+          vm->push(new Lambda(code->append(Instruction(v2))));
+        }
       }
       break;
     }

diff --git a/src/main.cpp b/src/main.cpp
@@ -85,7 +85,7 @@ int main (int argc, const char * argv[])
     else if (input == "info")
     {
       cout << "  arch: " << (sizeof(void*) == 4 ? "x86" : "x86-64") << endl;
-      cout << "  size of value        : " << sizeof(Value) << endl;
+      cout << "  size of value        : " << sizeof(Value) << (sizeof(Value) == sizeof(value_data) + sizeof(Type) ? "  (packed)" : "") << endl;
       cout << "  size of instruction  : " << sizeof(Instruction) << endl;
       cout << "  size of opcode       : " << sizeof(Opcode) << endl;
     }

diff --git a/src/value.h b/src/value.h
@@ -57,7 +57,11 @@ union value_data
   bool operator==(const value_data& o) const { return i == o.i; }
 };
 
+#if defined(USE_PACKED_VALUES) && USE_PACKED_VALUES
+class __attribute__((packed)) Value final
+#else
 class Value final
+#endif
 {
 public:
   value_data data;

diff --git a/src/vm.h b/src/vm.h
@@ -58,8 +58,6 @@ class VM
 
   void push(const Value& value)
   {
-    std::string str = value.svalue();
-    std::cout << "pushing " << str << std::endl << std::flush;
     valueStack->push_back(value);
   }