Skip to content

Start analyzing & evaluating meta #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shantanu-sardesai wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Start analyzing & evaluating meta #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f517cd9
Start analyzing & evaluating `meta`
shantanu-sardesai Nov 1, 2025
c73ef28
Add analysis tests
shantanu-sardesai Nov 1, 2025
f5cce12
Safe option unwraps
shantanu-sardesai Nov 2, 2025
87cc531
Start codegen for `meta`
shantanu-sardesai Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler+runtime/include/cpp/jank/analyze/expr/def.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ namespace jank::analyze::expr
local_frame_ptr frame,
bool needs_box,
runtime::obj::symbol_ref name,
jtl::option<expression_ref> const &meta,
jtl::option<expression_ref> const &value);

runtime::object_ref to_runtime_data() const override;
void walk(std::function<void(jtl::ref<expression>)> const &f) override;

runtime::obj::symbol_ref name{};
jtl::option<expression_ref> meta;
/* TODO: Rename to value_expr. */
jtl::option<expression_ref> value;
};
Expand Down
2 changes: 2 additions & 0 deletions compiler+runtime/src/cpp/jank/analyze/expr/def.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ namespace jank::analyze::expr
local_frame_ptr const frame,
bool const needs_box,
runtime::obj::symbol_ref const name,
jtl::option<expression_ref> const &meta,
jtl::option<expression_ref> const &value)
: expression{ expr_kind, position, frame, needs_box }
, name{ name }
, meta{ meta }
, value{ value }
{
}
Expand Down
16 changes: 15 additions & 1 deletion compiler+runtime/src/cpp/jank/analyze/processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,14 +1335,28 @@ namespace jank::analyze
qualified_sym = qualified_sym->with_meta(meta_with_doc);
}

jtl::option<expression_ref> meta{};

/* Lift this so it can be used during codegen. */
/* TODO: I don't think lifting meta is actually needed anymore. Verify. */
if(qualified_sym->meta.is_some())
{
current_frame->lift_constant(qualified_sym->meta.unwrap());
auto const meta_result{ analyze(qualified_sym->meta.unwrap(),
current_frame,
expression_position::value,
fn_ctx,
true) };

if(meta_result.is_err())
{
return meta_result;
}

meta = meta_result.expect_ok();
}

return jtl::make_ref<expr::def>(position, current_frame, true, qualified_sym, value_expr);
return jtl::make_ref<expr::def>(position, current_frame, true, qualified_sym, meta, value_expr);
}

processor::expression_result
Expand Down
6 changes: 2 additions & 4 deletions compiler+runtime/src/cpp/jank/codegen/llvm_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,16 +829,14 @@ namespace jank::codegen
}
}

if(expr->name->meta.is_some())
if(expr->meta.is_some())
{
auto const set_meta_fn_type(
llvm::FunctionType::get(ctx->builder->getVoidTy(),
{ ctx->builder->getPtrTy(), ctx->builder->getPtrTy() },
false));
auto const set_meta_fn(llvm_module->getOrInsertFunction("jank_set_meta", set_meta_fn_type));

auto const meta_val(
gen_global_from_read_string(strip_source_from_meta(expr->name->meta.unwrap())));
auto const meta_val(gen(expr->meta.unwrap(), arity));
ctx->builder->CreateCall(set_meta_fn, { ref, meta_val });
}

Expand Down
6 changes: 5 additions & 1 deletion compiler+runtime/src/cpp/jank/evaluate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,11 @@ namespace jank::evaluate
object_ref eval(expr::def_ref const expr)
{
auto var(__rt_ctx->intern_var(expr->name).expect_ok());
var->meta = expr->name->meta;

if(expr->meta.is_some())
{
var->meta = some(eval(expr->meta.unwrap()));
}

auto const meta(var->meta.unwrap_or(jank_nil));
auto const dynamic(get(meta, __rt_ctx->intern_keyword("dynamic").expect_ok()));
Expand Down
10 changes: 10 additions & 0 deletions compiler+runtime/test/jank/form/def/pass-meta.jank
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,14 @@
(assert (= one 'one))
(assert (= (:doc (meta #'one)) nil))

; Analysis with global variables
Copy link
Member

@jeaye jeaye Nov 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not how new tests should be added. Each test should have a dedicated test file, describing what it's testing. Also, we now have possibilities for extra errors, which come from analyzing meta. That needs to be tested.

(def foo 42)
(def ^{:pp #(println foo)} bar 0)
Copy link
Member

@jeaye jeaye Nov 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail if you wrap it in a function or let*, since IR gen has not been updated.

(assert (= ((-> #'bar meta :pp)) 42))

; Analysis with local variables.
(let* [foo 42]
(def ^{:pp #(println foo)} bar 0)
(assert (= ((-> #'bar meta :pp)) 42)))

:success
Loading