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

Added correct compiling of top level vector values, including with meta

Browse Source
This commit is contained in:
Nathan Braswell
2020-05-10 00:50:46 -04:00
parent 4cd7b22c86
commit 3f501a5c2f
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bf.kp
View File

@@ -70,6 +70,8 @@
; (inner 7))) ; (inner 7)))
; 7))) ; 7)))
(def! to_be_saved (with-meta [1] [2]))
(def! to_be_saved_s "asdfasdf")
(def! main (fn* () (let* ( a 7 (def! main (fn* () (let* ( a 7
b [1] b [1]
@@ -83,6 +85,9 @@
(println c) (println c)
(println (meta c)) (println (meta c))
(println "world") (println "world")
(println to_be_saved)
(println (meta to_be_saved))
(println to_be_saved_s)
a))) a)))
))))) )))))
(do (do

14
k_prime.krak
View File

@@ -1728,7 +1728,8 @@ fun compile_value(top_decs: *str, top_defs: *str, main_init: *str, defs: *str, e
var v = e->get(s) var v = e->get(s)
e->remove(s) e->remove(s)
var x = str() var x = str()
var value = compile(top_decs, top_defs, main_init, &x, e, get_value(v)) /*var value = compile(top_decs, top_defs, main_init, &x, e, get_value(v))*/
var value = compile_value(top_decs, top_defs, main_init, &x, e, get_value(v), true)
*top_decs += "size_t " + s + ";\n" *top_decs += "size_t " + s + ";\n"
*main_init += x *main_init += x
*main_init += s + " = " + value + ";\n" *main_init += s + " = " + value + ";\n"
@@ -1755,7 +1756,16 @@ fun compile_value(top_decs: *str, top_defs: *str, main_init: *str, defs: *str, e
call_str += compile(top_decs, top_defs, main_init, defs, env, l.get()[i]) call_str += compile(top_decs, top_defs, main_init, defs, env, l.get()[i])
} }
} }
return call_str + "})" call_str += "})"
if ast.meta != null<MalValue>() {
var meta_value = compile_value(top_decs, top_defs, main_init, defs, env, *ast.meta, true)
var for_meta = "for_meta_" + new_tmp()
*defs += "size_t " + for_meta + " = " + call_str + ";\n"
*defs += "((size_t*)(" + for_meta + ">>3))[0] = " + meta_value + ";\n"
return for_meta
} else {
return call_str
}
} }
MalValue_int::Int(i) { MalValue_int::Int(i) {
return to_string(i<<3) return to_string(i<<3)