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

C_generator can call raw function pointers now

Browse Source
This commit is contained in:
Nathan Braswell
2017-01-28 00:09:13 -05:00
parent dad0f780bb
commit 754ff41226
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kraken.krak
View File

@@ -1,5 +1,6 @@
import io:* import io:*
import grammer:* import grammer:*
import lexer:*
import parser:* import parser:*
import string:* import string:*
import util:* import util:*
@@ -17,6 +18,8 @@ import ctce_lower:*
import c_line_control:* import c_line_control:*
import node_counter:* import node_counter:*
import c_generator:* import c_generator:*
import vector:*
import set:*
fun main(argc: int, argv: **char):int { fun main(argc: int, argv: **char):int {
// delay construction until we either load it or copy construct it // delay construction until we either load it or copy construct it
@@ -99,7 +102,8 @@ fun main(argc: int, argv: **char):int {
println("done writing") println("done writing")
} }
var parse1.construct(&gram): parser var lex = lexer(gram.terminals)
var parse1.construct(&gram, &lex): parser
/*var parse2.construct(&gram): parser*/ /*var parse2.construct(&gram): parser*/
/*var parse3.construct(&gram): parser*/ /*var parse3.construct(&gram): parser*/
/*var parse4.construct(&gram): parser*/ /*var parse4.construct(&gram): parser*/

32
stdlib/c_generator.krak
View File

@@ -645,8 +645,9 @@ obj c_generator (Object) {
ref_pre += "(*" ref_pre += "(*"
ref_post += ")" ref_post += ")"
} }
if (!is_function(node->function_call.func) || node->function_call.func->function.closed_variables.size()) { if (!func_type->is_raw && (!is_function(node->function_call.func) || node->function_call.func->function.closed_variables.size())) {
// not function, so we must be an identifier or function call return or something // not function, so we must be an identifier or function call return or something
// and also is closure style, so need special call
if (!dot_style_method_call) { if (!dot_style_method_call) {
// lambda // lambda
if (pre_call == "" && (!func_return_type->is_void() || func_return_type->indirection)) { if (pre_call == "" && (!func_return_type->is_void() || func_return_type->indirection)) {
@@ -661,23 +662,18 @@ obj c_generator (Object) {
call_string.post += name_temp.post call_string.post += name_temp.post
func_name = name_temp.value func_name = name_temp.value
// should not have return var because is void // should not have return var because is void
if (pre_call == "") { var pre_call_plus = pre_call
var func_type = get_ast_type(node->function_call.func) if (pre_call_plus != "")
call_string.pre += string("if (")+func_name+".data) ((" + type_to_c(func_type) + "_with_data) "+func_name+".func)("+func_name +".data" pre_call_plus += " = "
if (call_string.value != "")
call_string.pre += string(",") + call_string.value var func_type = get_ast_type(node->function_call.func)
call_string.pre += ");\n" call_string.pre += string("if (")+func_name+".data) " + pre_call_plus + " ((" + type_to_c(func_type) + "_with_data) "+func_name+".func)("+func_name +".data"
call_string.pre += string("else ((") + type_to_c(func_type) + "_without_data) " + func_name+".func)(" + call_string.value + ");\n" if (call_string.value != "")
call_string.value = "" call_string.pre += string(",") + call_string.value
} else { call_string.pre += ");\n"
var func_type = get_ast_type(node->function_call.func) call_string.pre += string("else ") + pre_call_plus + " ((" + type_to_c(func_type) + "_without_data) " + func_name+".func)(" + call_string.value + ");\n"
call_string.pre += string("if (")+func_name+".data) " + pre_call + " = ((" + type_to_c(func_type) + "_with_data) "+func_name+".func)("+func_name +".data" call_string.value = pre_call
if (call_string.value != "")
call_string.pre += string(",") + call_string.value
call_string.pre += ");\n"
call_string.pre += string("else ") + pre_call + " = ((" + type_to_c(func_type) + "_without_data) " + func_name+".func)(" + call_string.value + ");\n"
call_string.value = pre_call
}
call_string.value = ref_pre + call_string.value + ref_post call_string.value = ref_pre + call_string.value + ref_post
return call_string return call_string
} }

4
stdlib/lexer.krak
View File

@@ -60,7 +60,9 @@ obj lexer (Object) {
fun add_regex(newOne: *char) { fun add_regex(newOne: *char) {
regs.add(util::make_pair(string::string(newOne), regex::regex(newOne))) regs.add(util::make_pair(string::string(newOne), regex::regex(newOne)))
} }
fun set_input(in: string::string) { fun set_input(in: ref string::string) {
position = 0
line_number = 1
input = in input = in
} }
fun next(): symbol::symbol { fun next(): symbol::symbol {

13
stdlib/parser.krak
View File

@@ -14,6 +14,7 @@ import io:*
obj parser (Object) { obj parser (Object) {
var input: vector<symbol> var input: vector<symbol>
var gram: *grammer var gram: *grammer
var lex: *lexer
var gss: gss var gss: gss
var to_reduce: stack<reduction> var to_reduce: stack<reduction>
var to_shift: stack< pair<*tree<int>, int> > var to_shift: stack< pair<*tree<int>, int> >
@@ -21,9 +22,10 @@ obj parser (Object) {
var packed_map: map<*tree<symbol>, bool> var packed_map: map<*tree<symbol>, bool>
var reduces_to_null_map: map<vector<symbol>, bool> var reduces_to_null_map: map<vector<symbol>, bool>
fun construct(grammerIn: *grammer): *parser { fun construct(grammerIn: *grammer, lexIn: *lexer): *parser {
input.construct() input.construct()
gram = grammerIn gram = grammerIn
lex = lexIn
gss.construct() gss.construct()
to_reduce.construct() to_reduce.construct()
to_shift.construct() to_shift.construct()
@@ -32,12 +34,14 @@ obj parser (Object) {
reduces_to_null_map.construct() reduces_to_null_map.construct()
return this return this
} }
// for maybe_construct for containers
fun construct(): *parser { fun construct(): *parser {
return construct(null<grammer>()) return construct(null<grammer>(), null<lexer>())
} }
fun copy_construct(old: *parser) { fun copy_construct(old: *parser) {
input.copy_construct(&old->input) input.copy_construct(&old->input)
gram = old->gram gram = old->gram
lex = old->lex
gss.copy_construct(&old->gss) gss.copy_construct(&old->gss)
to_reduce.copy_construct(&old->to_reduce) to_reduce.copy_construct(&old->to_reduce)
to_shift.copy_construct(&old->to_shift) to_shift.copy_construct(&old->to_shift)
@@ -75,10 +79,9 @@ obj parser (Object) {
return new<tree<symbol>>()->construct(null_symbol()) return new<tree<symbol>>()->construct(null_symbol())
} }
var lex = lexer(gram->terminals) lex->set_input(inputStr)
lex.set_input(inputStr)
var current_symbol.construct(): symbol var current_symbol.construct(): symbol
for (current_symbol = lex.next(); current_symbol != eof_symbol() && current_symbol != invalid_symbol(); current_symbol = lex.next();) { for (current_symbol = lex->next(); current_symbol != eof_symbol() && current_symbol != invalid_symbol(); current_symbol = lex->next();) {
if (current_symbol != eof_symbol() && current_symbol != invalid_symbol()) if (current_symbol != eof_symbol() && current_symbol != invalid_symbol())
current_symbol.source = name current_symbol.source = name
input.addEnd(current_symbol) input.addEnd(current_symbol)

1
stdlib/regex.krak
View File

@@ -234,7 +234,6 @@ obj regex (Object, Serializable) {
return -1 return -1
return regexString.length(); return regexString.length();
} }
/*var next = set::set(begin)*/
for (var i = 1; i < flagsA.size; i++;) for (var i = 1; i < flagsA.size; i++;)
flagsA[i] = false; flagsA[i] = false;
flagsA[0] = true flagsA[0] = true