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

Fix character value handling. String stuff appears to work correctly in bytecode now

Browse Source
This commit is contained in:
Nathan Braswell
2018-03-22 00:51:57 -04:00
parent c056af6e56
commit b8213dfc9f
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stdlib/ast_transformation.krak
View File

@@ -549,9 +549,10 @@ obj ast_transformation (Object) {
} }
value_str = new_str value_str = new_str
} }
} 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 if (value_str == "true" || value_str == "false") value_str = value_str.slice(1,-2)
} else if (value_str == "true" || value_str == "false")
value_type = type_ptr(base_type::boolean()) value_type = type_ptr(base_type::boolean())
else { else {
// should differentiate between float and double... // should differentiate between float and double...

2
stdlib/bytecode_generator.krak
View File

@@ -617,6 +617,8 @@ obj bytecode_generator (Object) {
return emit_imm((node->value.string_value == "true") cast long) return emit_imm((node->value.string_value == "true") cast long)
else if (node->value.value_type->base == base_type::character() && node->value.value_type->indirection == 1) else if (node->value.value_type->base == base_type::character() && node->value.value_type->indirection == 1)
return emit_imm((node->value.string_value.toCharArray()) cast long) return emit_imm((node->value.string_value.toCharArray()) cast long)
else if (node->value.value_type->base == base_type::character() && node->value.value_type->indirection == 0)
return emit_imm((node->value.string_value[0]) cast long)
else else
return emit_imm(string_to_num<int>(node->value.string_value)) return emit_imm(string_to_num<int>(node->value.string_value))
} }

2
stdlib/c_generator.krak
View File

@@ -291,6 +291,8 @@ obj c_generator (Object) {
} }
fun generate_value(node: *ast_node): string { fun generate_value(node: *ast_node): string {
var value = node->value.string_value var value = node->value.string_value
if (node->value.value_type->base == base_type::character() && node->value.value_type->indirection == 0)
return "'" + value + "'"
if (node->value.value_type->base != base_type::character() || node->value.value_type->indirection != 1) if (node->value.value_type->base != base_type::character() || node->value.value_type->indirection != 1)
return value return value

5
stdlib/string.krak
View File

@@ -191,6 +191,11 @@ obj string (Object, Serializable, Hashable) {
return *this == str return *this == str
} }
fun operator+(c: char): string {
var to_ret = *this
to_ret += c
return to_ret
}
fun operator+(integer: int): string return *this + to_string(integer); fun operator+(integer: int): string return *this + to_string(integer);
fun operator+(integer: long): string return *this + to_string(integer); fun operator+(integer: long): string return *this + to_string(integer);
fun operator+(integer: ulong): string return *this + to_string(integer); fun operator+(integer: ulong): string return *this + to_string(integer);