miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Method calls from within method from same object

Browse Source
This commit is contained in:
Nathan Braswell
2016-01-24 01:49:14 -05:00
parent c022758b9c
commit 105a969a00
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdlib/ast_transformation.krak
View File

@@ -269,7 +269,7 @@ obj ast_transformation (Object) {
var value_type = null<type>() var value_type = null<type>()
if (value_str[0] == '"') if (value_str[0] == '"')
value_type = type_ptr(base_type::character(), 1) value_type = type_ptr(base_type::character(), 1)
else if (value_str[0] == '\'') //' lol, comment hack for vim syntax highlighting (my fault, of course) else if (value_str[0] == '\'') //'// lol, comment hack for vim syntax highlighting (my fault, of course)
value_type = type_ptr(base_type::character()) value_type = type_ptr(base_type::character())
else { else {
// should differentiate between float and double... // should differentiate between float and double...

15
stdlib/c_generator.krak
View File

@@ -151,20 +151,27 @@ obj c_generator (Object) {
fun generate_function_call(node: *ast_node, enclosing_object: *ast_node): string { fun generate_function_call(node: *ast_node, enclosing_object: *ast_node): string {
var func_name = string() var func_name = string()
var call_string = string() var call_string = string()
if (is_function_call(node->function_call.func) &&
// handle the obj.method() style of method call
var dot_style_method_call = is_function_call(node->function_call.func) &&
is_function(node->function_call.func->function_call.func) && is_function(node->function_call.func->function_call.func) &&
(node->function_call.func->function_call.func->function.name == "->" || node->function_call.func->function_call.func->function.name == ".") && (node->function_call.func->function_call.func->function.name == "->" || node->function_call.func->function_call.func->function.name == ".") &&
is_function(node->function_call.func->function_call.parameters[1]) && is_function(node->function_call.func->function_call.parameters[1]) &&
is_type_def(get_ast_scope(node->function_call.func->function_call.parameters[1])->get(string("~enclosing_scope"))[0]) is_type_def(get_ast_scope(node->function_call.func->function_call.parameters[1])->get(string("~enclosing_scope"))[0])
) {
if (dot_style_method_call) {
func_name = generate(node->function_call.func->function_call.parameters[1], enclosing_object) func_name = generate(node->function_call.func->function_call.parameters[1], enclosing_object)
// don't add & if it was -> // don't add & if it was ->
if (node->function_call.func->function_call.func->function.name == ".") if (node->function_call.func->function_call.func->function.name == ".")
call_string += string("&") call_string += string("&")
call_string += generate(node->function_call.func->function_call.parameters[0], enclosing_object) call_string += generate(node->function_call.func->function_call.parameters[0], enclosing_object)
} else { } else { // regular style function name
func_name = generate(node->function_call.func, enclosing_object) func_name = generate(node->function_call.func, enclosing_object)
} }
// 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))
call_string += string("this")
var parameters = node->function_call.parameters var parameters = node->function_call.parameters
if (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" || func_name == "||" if (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" || func_name == "||"
@@ -178,6 +185,8 @@ obj c_generator (Object) {
// the post ones need to be post-ed specifically, and take the p off // the post ones need to be post-ed specifically, and take the p off
if (func_name == "++p" || func_name == "--p") if (func_name == "++p" || func_name == "--p")
return string("(") + generate(parameters[0], enclosing_object) + ")" + func_name.slice(0,-2) return string("(") + generate(parameters[0], enclosing_object) + ")" + func_name.slice(0,-2)
// regular parameter generation
parameters.for_each(fun(param: *ast_node) { parameters.for_each(fun(param: *ast_node) {
if (call_string != "") if (call_string != "")
call_string += ", " call_string += ", "

3
tests/to_parse.krak
View File

@@ -3,8 +3,9 @@ import to_import: simple_print, a, b, string_id
obj Something (ObjectTrait) { obj Something (ObjectTrait) {
var member: int var member: int
fun method(a: int):int { fun method(a: int):int {
return 5+a+member return 5+a+member + other_method()
} }
fun other_method(): int return 7;
fun return_this(): *Something { fun return_this(): *Something {
return this; return this;
} }