Skip to content

stone_script + boulder: Move eval_to_string() to context - #867

Merged
ermo merged 1 commit into
mainfrom
stone-script-eval-to-str-ctx
Aug 22, 2026
Merged

stone_script + boulder: Move eval_to_string() to context#867
ermo merged 1 commit into
mainfrom
stone-script-eval-to-str-ctx

Conversation

@joebonrichie

Copy link
Copy Markdown
Contributor

This ensures any prefix actions coming from %scriptBase are picked up by the evaluator.

Previously, builddeps from macros specified in environment were not added for evaluation.

@joebonrichie

Copy link
Copy Markdown
Contributor Author

@lumi-me-not okay?

@hphilm

hphilm commented Aug 21, 2026

Copy link
Copy Markdown

llvm-build.log seems to fix the issue for me I see with llvm and macros in environment

@joebonrichie
joebonrichie force-pushed the stone-script-eval-to-str-ctx branch from 2ed5908 to 0e30a48 Compare August 21, 2026 20:43
This ensures any prefix actions coming from %scriptBase are picked up
by the evaluator.

Previously, builddeps from macros specified in `environment` were not
added for evaluation.
@joebonrichie
joebonrichie force-pushed the stone-script-eval-to-str-ctx branch from 0e30a48 to 2502296 Compare August 21, 2026 20:53
@lumi-me-not

Copy link
Copy Markdown
Member

I was wondering whether it would be better to have a method that returns both the output and the deps, so the deps can then be merged in. But this solution works as well, and might be better.

Maybe also worth thinking about whether we would want eval_to_string on both lib.rs and context.rs.

But anyways, LGTM. :)

@joebonrichie
joebonrichie marked this pull request as ready for review August 21, 2026 21:07
@ermo

ermo commented Aug 22, 2026

Copy link
Copy Markdown
Member

I was wondering whether it would be better to have a method that returns both the output and the deps, so the deps can then be merged in. But this solution works as well, and might be better.

Maybe also worth thinking about whether we would want eval_to_string on both lib.rs and context.rs.

But anyways, LGTM. :)

Keep us posted.

Will merge this as-is for now so the related llvm regression gets fixed.

Then we have more time/less pressure when considering your suggestion.

@ermo
ermo merged commit 1317f87 into main Aug 22, 2026
3 checks passed
@ermo
ermo deleted the stone-script-eval-to-str-ctx branch August 22, 2026 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants