From 5a4d139d18e8a4fd945995654bc9721848868daa Mon Sep 17 00:00:00 2001
From: Nathan Braswell <miloignis@gmail.com>
Date: Tue, 16 Feb 2016 13:43:47 -0500
Subject: [PATCH] Just decided not to support defs in Kalypso (or Cephelapod,
 but it's already kinda implemented there) and ported some more tests over

---
 stdlib/c_generator.krak                  | 3 ++-
 tests/test_moreComplexObjectTest.krak    | 4 +---
 tests/test_moreObjectTemplateTest.krak   | 5 ++---
 tests/test_templateTest.krak             | 3 +--
 {stdlib => tests}/trivial_container.krak | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename {stdlib => tests}/trivial_container.krak (55%)

diff --git a/stdlib/c_generator.krak b/stdlib/c_generator.krak
index c97554a..43a15ab 100644
--- a/stdlib/c_generator.krak
+++ b/stdlib/c_generator.krak
@@ -360,7 +360,8 @@ obj c_generator (Object) {
             func_name = generate(node->function_call.func, enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>()).one_string()
         }
         // handle method call from inside method of same object
-        if (!dot_style_method_call && enclosing_object && get_ast_scope(enclosing_object)->contains_key(func_name))
+        /*if (!dot_style_method_call && enclosing_object && get_ast_scope(enclosing_object)->contains_key(func_name))*/
+        if (!dot_style_method_call && enclosing_object && enclosing_object->type_def.methods.contains(node->function_call.func))
             call_string += "this"
 
         var parameters = node->function_call.parameters
diff --git a/tests/test_moreComplexObjectTest.krak b/tests/test_moreComplexObjectTest.krak
index 038c0ac..bdf4dcf 100644
--- a/tests/test_moreComplexObjectTest.krak
+++ b/tests/test_moreComplexObjectTest.krak
@@ -11,9 +11,7 @@ obj firstObject {
 	}
 };
 
-def Int int;
-
-var aliasNum: Int;
+var aliasNum: int;
 
 fun main(): int {
 	var wooObject: firstObject;
diff --git a/tests/test_moreObjectTemplateTest.krak b/tests/test_moreObjectTemplateTest.krak
index 13faa61..e348ca2 100644
--- a/tests/test_moreObjectTemplateTest.krak
+++ b/tests/test_moreObjectTemplateTest.krak
@@ -1,4 +1,4 @@
-import io:*;
+import simple_print:*;
 import trivial_container:*;
 
 obj RegularObject {
@@ -17,8 +17,7 @@ obj RegularObject {
 	}
 };
 
-def MyIntContainer trivialContainer<int>;
-var roundabout: MyIntContainer;
+var roundabout: trivialContainer<int>;
 var outsideDec: RegularObject;
 
 fun print(toPrint: trivialContainer<*char>): void {
diff --git a/tests/test_templateTest.krak b/tests/test_templateTest.krak
index 3059333..8f950e3 100644
--- a/tests/test_templateTest.krak
+++ b/tests/test_templateTest.krak
@@ -17,9 +17,8 @@ obj TemplateTest<T> {
 	}
 };
 
-def MyInt int;
 
-var c: MyInt;
+var c: int;
 
 
 fun addAndPrint<T>(a: T, b: T): T {
diff --git a/stdlib/trivial_container.krak b/tests/trivial_container.krak
similarity index 55%
rename from stdlib/trivial_container.krak
rename to tests/trivial_container.krak
index c2be90c..1ae6538 100644
--- a/stdlib/trivial_container.krak
+++ b/tests/trivial_container.krak
@@ -1,9 +1,9 @@
-import io;
+import simple_print;
 
 obj trivialContainer<T> {
 	var data: T;
 	fun print(): void {
-        io::print(data);
+        simple_print::print(data);
 	}
 };