From efebf8b1d7c0fa97d43423b5aaebd0358608309c Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Thu, 25 Feb 2016 05:16:50 -0500 Subject: [PATCH] Port 2 tests, fix object bug when generating methods (would try to generate the &object as a function itself for some reason, which worked when it wasn't special as generate_function would just return the name) --- stdlib/c_generator.krak | 3 ++- tests/test_OperatorOverloadTest.krak | 2 +- tests/test_declarationsTest.krak | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stdlib/c_generator.krak b/stdlib/c_generator.krak index 56f1679..271830d 100644 --- a/stdlib/c_generator.krak +++ b/stdlib/c_generator.krak @@ -481,7 +481,8 @@ obj c_generator (Object) { // don't add & if it was -> if (node->function_call.func->function_call.func->function.name == ".") call_string += "&" - call_string += generate_function(node->function_call.func->function_call.parameters[0], false) + // call_string += generate_function(node->function_call.func->function_call.parameters[0], false) + call_string += generate_identifier(node->function_call.func->function_call.parameters[0], enclosing_object, enclosing_func) } else { // regular style function name or lambda func_name = generate_function(node->function_call.func, false).one_string() diff --git a/tests/test_OperatorOverloadTest.krak b/tests/test_OperatorOverloadTest.krak index d3c5e71..4317dd6 100644 --- a/tests/test_OperatorOverloadTest.krak +++ b/tests/test_OperatorOverloadTest.krak @@ -1,4 +1,4 @@ -import io:*; +import simple_print:*; obj Vec2 { var x: int; diff --git a/tests/test_declarationsTest.krak b/tests/test_declarationsTest.krak index 3e53b68..897b1fc 100644 --- a/tests/test_declarationsTest.krak +++ b/tests/test_declarationsTest.krak @@ -1,4 +1,4 @@ -import io:*; +import simple_print:*; import mem:*; obj ClassWithConstructor {