Print and Put

Author: easycoder

ecr/debug.h

@@ -4,4 +4,4 @@
 #define print(...) printf(__VA_ARGS__)
 #else
 #define print(...)
-#endif
+#endif

ecr/domain/core/core-values.h

@@ -36,9 +36,9 @@ class CoreValues {
 
         void init(ValueArray* values) {
             this->values = values;
-            add("text", _CORE_TEXT_);
-            add("int", _CORE_INT_);
-            add("bool", _CORE_BOOL_);
+            add("text", TEXT_VALUE);
+            add("int", INT_VALUE);
+            add("bool", BOOL_VALUE);
         };
 
         ///////////////////////////////////////////////////////////////////////

ecr/domain/core/exit.h

@@ -1,4 +1,7 @@
 int core_exit(Runtime* runtime) {
-    print("exit handler\n");
+    #if KEYWORDS
+    printf("Line %s: exit\n", runtime->getCommand()->get(0)->getText());
+    #endif
+    
     return -1;
 };

ecr/domain/core/print.h

@@ -1,17 +1,11 @@
 int core_print(Runtime* runtime) {
-    print("print handler\n");
-    RuntimeValue* value = runtime->getRuntimeValue("value");
-    switch (value->getType()) {
-        case TEXT_VALUE:
-            printf("->%s\n", value->getTextValue());
-            break;
-        case INT_VALUE:
-            printf("->%d\n", value->getIntValue());
-            break;
-        case BOOL_VALUE:
-            printf("->%s\n", value->getBoolValue() ? "true" : "false");
-            break;
-    };
+    #if KEYWORDS
+    printf("Line %s: print\n", runtime->getCommand()->get(0)->getText());
+    #endif
+
+    const char* buf = runtime->getTextValue("value");
+    printf("->%s\n", buf);
+    delete buf;
 
     return runtime->getPC() + 1;
 };

ecr/domain/core/put.h

@@ -1,4 +1,10 @@
 int core_put(Runtime* runtime) {
-    print("put handler\n");
-    return 0;
+    #if KEYWORDS
+    printf("Line %s: put\n", runtime->getCommand()->get(0)->getText());
+    #endif
+
+    RuntimeValue* runtimeValue = runtime->getRuntimeValue("value");
+    runtime->setSymbolValue("target", runtimeValue->copy());
+
+    return runtime->getPC() + 1;
 };

ecr/domain/core/variable.h

@@ -1,5 +1,11 @@
 int core_variable(Runtime* runtime) {
-    print("variable handler\n");
+    #if KEYWORDS
+    printf("Line %s: variable\n", runtime->getCommand()->get(0)->getText());
+    #endif
+
+    int pc = runtime->getPC();
+    Symbol* symbol = new Symbol(runtime->getCommandProperty(0, "name"));
+    runtime->getSymbols()->add(symbol);
 
     return runtime->getPC() + 1;
 };

ecr/ecr.cpp

@@ -1,5 +1,6 @@
-#define DEBUG 1    // set to 1 to debug, 0 for no debugging
+#define DEBUG 0    // set to 1 to debug, 0 for no debugging
 #define DESTROY 0  // set to 1 to show destructors
+#define KEYWORDS 0 // set to 1 to show keywords as they execute
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,11 +9,11 @@
 #include "debug.h"
 #include "definitions.h"
 #include "linkedlist.h"
+#include "runtimevalue.h"
 #include "text.h"
 #include "keyword.h"
 #include "value.h"
-#include "valuecodes.h"
-#include "runtimevalue.h"
+#include "symbol.h"
 #include "runtime.h"
 #include "domain/core/core-keywords.h"
 #include "domain/core/core-values.h"
@@ -76,6 +77,7 @@ int main(int argc, char* argv[])
     script[n] = '\0';
     Text* keys = new Text(keyStart, "keys");
     delete script;
+    script = nullptr;
 
     // print("codes: %s", codes->getText());
     // print("keys: %s", keys->getText());

ecr/keyword.h

@@ -52,7 +52,6 @@ class KeywordArray {
         int size = 0;                              // the number of keywords
         Keyword** array = nullptr;                 // the array of keywords
         LinkedList* list = new LinkedList();       // A list to hold new keywords as they are added
-        TextArray* choices;
 
     public:
 
@@ -168,8 +167,10 @@ class KeywordArray {
         // Destructor
         ~KeywordArray() {
             delete array;
+            array = nullptr;
             delete list;
-            delete choices;
+            list = nullptr;
+
             #if DESTROY
             print("KeywordArray: Delete %s\n", name);
             #endif

ecr/run.h

@@ -9,6 +9,7 @@ class Run {
         CoreKeywords* coreKeywords;
         CoreValues* coreValues;
         int* scriptKeywordCodes;
+        SymbolArray* symbols;
 
         ///////////////////////////////////////////////////////////////////////
         // Set up the runtime
@@ -17,6 +18,7 @@ class Run {
             runtime->setCodeArray(codeArray);
             runtime->setKeyArray(keyArray);
             runtime->setCommands(commands);
+            runtime->setSymbols(symbols);
         }
 
     public:
@@ -25,7 +27,7 @@ class Run {
         // Run a sequence of commands from the current program counter
         int runFrom(Runtime* runtime, int pc) {
             do {
-                print("Run command %d\n", pc);
+                // print("Command %d\n", pc);
                 TextArray* command = commands[pc];
                 runtime->setCommand(command);
                 runtime->setPC(pc);
@@ -110,7 +112,8 @@ class Run {
                     print("No handler found for keyword '%s'\n", tt->getText());
                     return;
                 }
-
+                // Create an array of symbols
+                symbols = new SymbolArray();
             }
             setupRuntime();
             if (runFrom(runtime, 0) < 0) {