Sync main with tv-labs upstream (through v1.0.2) - #4
Open
smn wants to merge 14 commits into
Open
Conversation
…s#407) Co-authored-by: Dave Lucia <davelucianyc@gmail.com>
…rity opcodes, call_self fusion (tv-labs#405)
…-labs#406) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Dave Lucia <davelucianyc@gmail.com>
…v-labs#418) Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
# Conflicts: # lib/lua/vm/display/table.ex # lib/lua/vm/stdlib/pattern.ex # test/lua/vm/cyclic_table_test.exs # test/lua/vm/stdlib/pattern_anchor_test.exs
Author
|
@santiagocardo this just catches us up with upstream Lua |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Catches the fork's
mainup withtv-labs/luaupstream (13 commits, through the1.0.2release and the post-release perf/compiler work).What's in it
Straight merge of
upstream/mainintomain. Notable upstream changes: the 1.0.2 release, dispatcher/call-convention and compiler peephole perf work, lexer token slicing, one-shot stdlib table build, and the cyclic-table eval-boundary fix.Conflicts resolved
Four files conflicted — all of them the fork's own fixes that upstream had already merged and refined. Resolved by taking upstream's canonical version in each case:
lib/lua/vm/display/table.ex— upstream aliases%Table{}(cosmetic)lib/lua/vm/stdlib/pattern.ex— reworded§6.4comment (cosmetic)test/lua/vm/cyclic_table_test.exs— upstream has the superset of teststest/lua/vm/stdlib/pattern_anchor_test.exs— upstream has the superset of testsThe fork's
dialyzer: track the ancestor set as a plain mapchange is already how upstream'sdecode/3works, so nothing was lost.Verification
mix test— 2870 passed, 0 failuresmix format --check-formatted— cleanmix dialyzer— 0 errorsmix test --only lua53— 20 passed🤖 Generated with Claude Code