Skip to content

Don't spawn subprocess if codegen spec uses flags but not the prelude #14904

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

Merged
straight-shoota merged 2 commits into from
Aug 16, 2024
Merged

Don't spawn subprocess if codegen spec uses flags but not the prelude #14904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2380b
Remove special behavior for codegen specs using flags
HertzDevil Aug 14, 2024
c4ed584
Merge branch 'master' into spec/codegen-specs-flag
HertzDevil Aug 15, 2024
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
5 changes: 5 additions & 0 deletions spec/compiler/codegen/macro_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,4 +1885,9 @@ describe "Code gen: macro" do
{% end %}
)).to_i.should eq(10)
end

it "accepts compile-time flags" do
run("{{ flag?(:foo) ? 1 : 0 }}", flags: %w(foo)).to_i.should eq(1)
run("{{ flag?(:foo) ? 1 : 0 }}", Int32, flags: %w(foo)).should eq(1)
end
end
12 changes: 8 additions & 4 deletions spec/spec_helper.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def run(code, filename = nil, inject_primitives = true, debug = Crystal::Debug::
# in the current executable!), so instead we compile
# the program and run it, printing the last
# expression and using that to compare the result.
if code.includes?(%(require "prelude")) || flags
if code.includes?(%(require "prelude"))
ast = Parser.parse(code).as(Expressions)
last = ast.expressions.last
assign = Assign.new(Var.new("__tempvar"), last)
Expand All @@ -315,7 +315,9 @@ def run(code, filename = nil, inject_primitives = true, debug = Crystal::Debug::
return SpecRunOutput.new(output)
end
else
new_program.run(code, filename: filename, debug: debug)
program = new_program
program.flags.concat(flags) if flags
program.run(code, filename: filename, debug: debug)
end
end

Expand All @@ -324,10 +326,12 @@ def run(code, return_type : T.class, filename : String? = nil, inject_primitives
code = %(require "primitives"\n#{code})
end

if code.includes?(%(require "prelude")) || flags
if code.includes?(%(require "prelude"))
fail "TODO: support the prelude in typed codegen specs", file: file
else
new_program.run(code, return_type: T, filename: filename, debug: debug)
program = new_program
program.flags.concat(flags) if flags
program.run(code, return_type: T, filename: filename, debug: debug)
end
end

Expand Down