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

Prepping for introducing automatic copy_construct and destruct and tests for them, fixed using - to negate numbers

Browse Source
This commit is contained in:
Nathan Braswell
2016-01-28 12:55:51 -05:00
parent faeb1be315
commit 42b942737b
3 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdlib/c_generator.krak
View File

@@ -179,7 +179,7 @@ obj c_generator (Object) {
return to_ret
}
fun generate_assignment_statement(node: *ast_node, enclosing_object: *ast_node): code_triple {
return generate(node->assignment_statement.to, null<ast_node>(), null<stack<pair<bool,stack<*ast_node>>>>()) + " = " + generate(node->assignment_statement.from, enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>())
return generate(node->assignment_statement.to, enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>()) + " = " + generate(node->assignment_statement.from, enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>())
}
fun generate_if_statement(node: *ast_node, enclosing_object: *ast_node, defer_stack: *stack<pair<bool,stack<*ast_node>>>): code_triple {
var if_str = code_triple("if (") + generate(node->if_statement.condition, enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>()) + ") {\n" + generate(node->if_statement.then_part, enclosing_object, defer_stack) + "}"
@@ -289,10 +289,10 @@ obj c_generator (Object) {
var parameters = node->function_call.parameters
if (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" || func_name == "||"
if ( parameters.size == 2 && (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" || func_name == "||"
|| func_name == "&&" || func_name == "<" || func_name == ">" || func_name == "<=" || func_name == ">="
|| func_name == "==" || func_name == "%"
)
))
return code_triple("(") + generate(parameters[0], enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>()) + func_name + generate(parameters[1], enclosing_object, null<stack<pair<bool,stack<*ast_node>>>>()) + string(")")
// don't propegate enclosing function down right of access
if (func_name == "." || func_name == "->")

1
tests/test_compiler.krak
View File

@@ -66,6 +66,7 @@ fun main():int {
var ast_pass.construct(): ast_transformation
var importer.construct(parse, ast_pass): importer
importer.import(kraken_file_name)
println("NOW DOING C_GENERATOR")
var c_generator.construct(): c_generator
var c_output_pair = c_generator.generate_c(importer.name_ast_map)
var kraken_c_output_name = kraken_file_name + ".c"

61
tests/to_parse.krak
View File

@@ -2,6 +2,19 @@ import to_import: simple_print, simple_println, a, b, string_id
obj Something (ObjectTrait) {
var member: int
fun construct(): *Something {
simple_println("Constructing a Something")
member = 1337
return this
}
fun copy_construct(old: *Something) {
simple_println("Copy Constructing a Something")
member = old->member
}
fun destruct() {
simple_println("Destructing a Something")
member = -800
}
fun method(a: int):int {
return 5+a+member + other_method()
}
@@ -10,26 +23,28 @@ obj Something (ObjectTrait) {
return this;
}
}
/*fun some_function(): int return 0;*/
/*fun some_other_function(in: bool): float {*/
/*return 0.0*/
/*}*/
/*
fun some_function(): int return 0;
fun some_other_function(in: bool): float {
return 0.0
}
*/
fun main(): int {
/*var a_declaration:int*/
/*simple_print(1 + 2)*/
/*var again = 2 + 4 - 1 * 400*/
/*simple_print(again)*/
/*again = 2 + (4 - 1) * 400*/
/*simple_print(again)*/
/*var another_declaration: int = 8.0*/
/*simple_print(another_declaration)*/
/*var yet_another_declaration = "Hello Marcus\n"*/
/*simple_print(yet_another_declaration)*/
/*simple_print("Hello World!\n")*/
/*simple_print(1337)*/
/*if (1 + 2 && false) simple_print("its true!")*/
/*else simple_print("its false!")*/
/*
var a_declaration:int
simple_print(1 + 2)
var again = 2 + 4 - 1 * 400
simple_print(again)
again = 2 + (4 - 1) * 400
simple_print(again)
var another_declaration: int = 8.0
simple_print(another_declaration)
var yet_another_declaration = "Hello Marcus\n"
simple_print(yet_another_declaration)
simple_print("Hello World!\n")
simple_print(1337)
if (1 + 2 && false) simple_print("its true!")
else simple_print("its false!")
var counter = 10
counter--
--counter
@@ -78,6 +93,14 @@ fun main(): int {
defer simple_println("Here is a return defer inner")
return 0
}
*/
/*var test_methods.construct(): Something*/
var test_methods: Something
test_methods.member = 10
simple_println("Constructing an object and printint its member, copy-constructing it, and printing that out, then letting both be destructed")
simple_println(test_methods.member)
var second_obj = test_methods
simple_println(second_obj.member)
return 0
}