knazarov/valeri
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow defining and redefining local variables with "def"

Browse source
This commit is contained in:
Konstantin Nazarov 2024-10-10 18:57:06 +01:00
parent 6b8651145e
commit 58af636293
Signed by: knazarov
GPG key ID: 4CFE0A42FA409C22
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/compiler.cpp
View file

@ -633,13 +633,32 @@ Result<Expression> Compiler::compile_def(Context& context, Symbol& op,
auto comp = TRY(compile_expr(context, var_expr));
ex.add_code(comp.code);
TRY(ex.add_opcode(Oc::GlobalStore, {1, (int64_t)gname},
{0, (int64_t)comp.reg}));
if (context.toplevel) {
TRY(ex.add_opcode(Oc::GlobalStore, {1, (int64_t)gname},
{0, (int64_t)comp.reg}));
ex.reg = comp.reg;
return std::move(ex);
} else {
auto maybe_binding = context.get_var(varname_unwrapped);
ex.reg = comp.reg;
context.maxreg = maxreg + 1;
if (maybe_binding.has_value()) {
auto reg = maybe_binding.value();
TRY(ex.add_opcode(Oc::Mov, {0, (int64_t)reg}, {0, (int64_t)comp.reg}));
ex.reg = comp.reg;
return std::move(ex);
context.maxreg = maxreg + 1;
return std::move(ex);
} else {
context.maxreg = maxreg + 1;
auto reg = TRY(context.add_var(varname_unwrapped));
TRY(ex.add_opcode(Oc::Mov, {0, (int64_t)reg}, {0, (int64_t)comp.reg}));
ex.reg = reg;
context.maxreg = reg + 1;
return std::move(ex);
}
}
}
Result<Expression> Compiler::compile_quote(Context& context, Symbol& op,
@ -868,7 +887,7 @@ Result<Expression> Compiler::compile_let(Context& context, Symbol& op,
}
Result<Expression> Compiler::compile_do(Context& context, Symbol& op,
const Value& expr) {
const Value& expr) {
auto rest = TRY(expr.rest());
return compile_body(context, rest);
@ -905,7 +924,7 @@ Result<Expression> Compiler::compile_body(Context& context, const Value& expr) {
if (cur.is<Nil>()) {
ex_res.reg = expr.reg;
} else {
context.maxreg = maxreg;
// context.maxreg = maxreg;
}
}

10
test/function.vli
View file

@ -55,3 +55,13 @@
;; "do" form returns the value of last expression
(assert (= (do 1 2 3) 3))
;; allow definition and redefinition of variables with "def"
(fn def-redef ()
(def x 1)
(def x (+ x 1))
(def y 4)
(+ x y))
(assert (= (def-redef) 6))