clean up check_sexp_syntax and improve caching - #7735
Merged
Goober5000 merged 1 commit intoAug 30, 2026
Merged
Conversation
Goober5000
added
cleanup
Goober5000
force-pushed
the
cleanup/sexp_syntax_checking
branch
5 times, most recently
from
August 24, 2026 02:25
a81ba38 to
f759019
Compare
- Clean up `check_sexp_syntax` to use `eval_ship` (and incidentally `eval_wing` and `eval_prop`) rather than the old lookups. - Disable SEXP node caching while FRED is running. Also use smart pointers and fix a cache memory leak.
Goober5000
force-pushed
the
cleanup/sexp_syntax_checking
branch
from
August 27, 2026 18:21
f759019 to
8718952
Compare
Goober5000
marked this pull request as ready for review
August 27, 2026 18:21
wookieejedi
approved these changes
Aug 29, 2026
MjnMixael
added a commit
to ofp-fs2open/fs2open.github.com
that referenced
this pull request
Sep 8, 2026
Takes 16 upstream commits. One conflict, both hunks in check_sexp_syntax where SCP's cleanup (scp-fs2open#7735) rewrote the prop cases OFP had extended: - OPF_PROP: adopted upstream's cached eval_prop() in place of prop_name_lookup(), inverted to keep OFP's fall-through so the "parsed but not yet spawned" check still runs before returning invalid. - OPF_SHIP_PROP: kept OFP's arrival/spawn-list check, which upstream has no equivalent of. Notable upstream change absorbed without incident: MAX_SHIP_CLASSES is gone (scp-fs2open#7746). Nothing in OFP still referenced it -- last week's rewrite of TeamLoadoutDialogState off the fixed arrays had already removed the only uses, and team_data itself is unchanged this round. The loadout UI refactor (scp-fs2open#7739) stayed inside missionui/ and doesn't reach the editor. Upstream's flagset 64-bit round-trip fix (ba7aa70) lands here too; note ofp/checkpoint-system carries its own independent version of that same fix, which will need dropping on that branch's next rebase.
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
2 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.
check_sexp_syntaxto useeval_ship(and incidentallyeval_wingandeval_prop) rather than the old lookups.In draft as it depends on #7734