From d70fa4ebbbabe540f5c2f083a497c4dec732d158 Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Sun, 10 May 2015 02:48:05 -0400 Subject: [PATCH] Removed/commented out some destructor stuff. It'll come back for defer --- src/CGenerator.cpp | 7 ++++-- tests/test_destructorTest.expected_results | 1 - tests/test_destructorTest.krak | 28 ---------------------- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 tests/test_destructorTest.expected_results delete mode 100644 tests/test_destructorTest.krak diff --git a/src/CGenerator.cpp b/src/CGenerator.cpp index 70f0164..817d012 100644 --- a/src/CGenerator.cpp +++ b/src/CGenerator.cpp @@ -321,8 +321,11 @@ std::string CGenerator::generate(NodeTree* from, NodeTree* enc continue; if (typeDefinition->getDataRef()->scope.find("destruct") == typeDefinition->getDataRef()->scope.end()) continue; - destructorString += tabs() + scopePrefix(from) + CifyName(typeDefinition->getDataRef()->symbol.getName()) - + "__" + "destruct" + "(&" + generate(identifier, enclosingObject) + ");\n";//Call the destructor + // *************************************************************************************** + // I've decided not to do the destructor thing. This will come back soon for defer though! + // *************************************************************************************** + //destructorString += tabs() + scopePrefix(from) + CifyName(typeDefinition->getDataRef()->symbol.getName()) + //+ "__" + "destruct" + "(&" + generate(identifier, enclosingObject) + ");\n";//Call the destructor } } output += destructorString; diff --git a/tests/test_destructorTest.expected_results b/tests/test_destructorTest.expected_results deleted file mode 100644 index b96d8a0..0000000 --- a/tests/test_destructorTest.expected_results +++ /dev/null @@ -1 +0,0 @@ -Hello Destructors! diff --git a/tests/test_destructorTest.krak b/tests/test_destructorTest.krak deleted file mode 100644 index e303d9b..0000000 --- a/tests/test_destructorTest.krak +++ /dev/null @@ -1,28 +0,0 @@ -import io:*; - -typedef DestructorPrint { - var myStr: char*; - fun construct(str: char*): DestructorPrint* { - myStr = str; - return this; - } - fun destruct(): void { - println(myStr); - } -}; - -typedef NoDistruction { - var a: int; - fun dummyFunc(): void {} -}; - -fun indirPrint(): void { - var testObj.construct("Hello Destructors!"): DestructorPrint; - var dummy: NoDistruction; -} - -fun main(): int { - indirPrint(); - return 0; -} -