Show/hide destructors

Author: easycoder

ecr/domain/core/core-keywords.h

@@ -263,6 +263,7 @@ class CoreKeywords {
             add("stack");
             add("stop");
             add("system");
+            add("take");
             add("variable");
             add("wait");
             add("while");

ecr/domain/core/variable.h

@@ -1,4 +1,5 @@
 int core_variable(Runtime* runtime) {
     print("variable handler\n");
-    return 0;
+
+    return runtime->getPC() + 1;
 };

ecr/ecr.cpp

@@ -1,4 +1,5 @@
-#define DEBUG 0    // set to 1 to debug, 0 for no debugging
+#define DEBUG 1    // set to 1 to debug, 0 for no debugging
+#define DESTROY 0  // set to 1 to show destructors
 
 #include <stdio.h>
 #include <stdlib.h>

ecr/keyword.h

@@ -170,6 +170,8 @@ class KeywordArray {
             delete array;
             delete list;
             delete choices;
+            #if DESTROY
             print("KeywordArray: Delete %s\n", name);
+            #endif
         }
 };

ecr/test.eco

@@ -1,19 +1,31 @@
-2,0,1,2:3,4:{,2:5,6:7,}
-3,0,1,2:3,4:{,2:8,6:9,}
-4,0,1,2:3,4:{,2:10,6:11,}
-5,0,12,2:3
+2,0,1,2:3,4:5,6:7,8:9,10:11,12:[,],13:14
+4,0,15,2:16,12:{,2:17,18:19,}
+5,0,15,2:16,12:{,2:20,18:21,}
+6,0,15,2:16,12:{,2:22,18:5,}
+7,0,23,2:16
 
 core
-print
+variable
 type
-None
+symbol
+valueHolder
+True
+name
+Var1
+elements
+1
+index
+0
 value
+used
+False
+print
+None
 text
 content
 Hello: world!
 int
 12345
 boolean
-True
 exit
 

ecr/test.ecs

@@ -1,5 +1,7 @@
 !   Test script
 
+    variable Var1
+
     print `Hello: world!`
     print 12345
     print true

ecr/test.json

@@ -1,9 +1,22 @@
 [
+  {
+    "debug": false,
+    "domain": "core",
+    "elements": 1,
+    "index": 0,
+    "keyword": "variable",
+    "lino": 2,
+    "name": "Var1",
+    "type": "symbol",
+    "used": false,
+    "value": [],
+    "valueHolder": true
+  },
   {
     "debug": true,
     "domain": "core",
     "keyword": "print",
-    "lino": 2,
+    "lino": 4,
     "type": null,
     "value": {
       "content": "Hello: world!",
@@ -14,7 +27,7 @@
     "debug": true,
     "domain": "core",
     "keyword": "print",
-    "lino": 3,
+    "lino": 5,
     "type": null,
     "value": {
       "content": 12345,
@@ -25,7 +38,7 @@
     "debug": true,
     "domain": "core",
     "keyword": "print",
-    "lino": 4,
+    "lino": 6,
     "type": null,
     "value": {
       "content": true,
@@ -36,7 +49,7 @@
     "debug": true,
     "domain": "core",
     "keyword": "exit",
-    "lino": 5,
+    "lino": 7,
     "type": null
   }
 ]

ecr/text.h

@@ -37,9 +37,11 @@ class Text {
         ///////////////////////////////////////////////////////////////////////
         // Destructor
         ~Text() {
+            #if DESTROY
             if (strcmp(name, "<noname>") != 0) {
                 print("Text: Delete %s\n", name);
             }
+            #endif
             delete text;
         }
 
@@ -325,6 +327,8 @@ class TextArray {
         ~TextArray() {
             delete array;
             delete list;
+            #if DESTROY
             print("TextArray: Delete %s\n", name);
+            #endif
          }
 };

ecr/value.h

@@ -168,6 +168,8 @@ class ValueArray {
             delete array;
             delete list;
             delete valueKeywords;
+            #if DESTROY
             print("ValueArray: Delete %s\n", name);
+            #endif
         }
 };