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

Just decided not to support defs in Kalypso (or Cephelapod, but it's already kinda implemented there) and ported some more tests over

Browse Source
This commit is contained in:
Nathan Braswell
2016-02-16 13:43:47 -05:00
parent a898104f8a
commit 5a4d139d18
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdlib/c_generator.krak
View File

@@ -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() 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 // 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" call_string += "this"
var parameters = node->function_call.parameters var parameters = node->function_call.parameters

4
tests/test_moreComplexObjectTest.krak
View File

@@ -11,9 +11,7 @@ obj firstObject {
} }
}; };
def Int int; var aliasNum: int;
var aliasNum: Int;
fun main(): int { fun main(): int {
var wooObject: firstObject; var wooObject: firstObject;

5
tests/test_moreObjectTemplateTest.krak
View File

@@ -1,4 +1,4 @@
import io:*; import simple_print:*;
import trivial_container:*; import trivial_container:*;
obj RegularObject { obj RegularObject {
@@ -17,8 +17,7 @@ obj RegularObject {
} }
}; };
def MyIntContainer trivialContainer<int>; var roundabout: trivialContainer<int>;
var roundabout: MyIntContainer;
var outsideDec: RegularObject; var outsideDec: RegularObject;
fun print(toPrint: trivialContainer<*char>): void { fun print(toPrint: trivialContainer<*char>): void {

3
tests/test_templateTest.krak
View File

@@ -17,9 +17,8 @@ obj TemplateTest<T> {
} }
}; };
def MyInt int;
var c: MyInt; var c: int;
fun addAndPrint<T>(a: T, b: T): T { fun addAndPrint<T>(a: T, b: T): T {

4
stdlib/trivial_container.krak → tests/trivial_container.krak
View File

@@ -1,9 +1,9 @@
import io; import simple_print;
obj trivialContainer<T> { obj trivialContainer<T> {
var data: T; var data: T;
fun print(): void { fun print(): void {
io::print(data); simple_print::print(data);
} }
}; };