fix: handle adjacent @@ variable tokens in split_words()#15
Merged
mahaloz merged 2 commits intobinsync:mainfrom Feb 23, 2026
Merged
fix: handle adjacent @@ variable tokens in split_words()#15mahaloz merged 2 commits intobinsync:mainfrom
mahaloz merged 2 commits intobinsync:mainfrom
Conversation
When variables appear adjacent without spaces in decompiled code (e.g., func(a,b,c)), the @@ placeholder tokens merge into one word. re.search() only matched the first pattern, silently losing the rest and causing a holder/mask count mismatch that discards all predictions. Replace re.search() with re.finditer() to extract all @@ patterns.
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.
Fixes #14
Problem
When processing decompiled code where variables appear adjacent without spaces
(e.g.,
func(a,b,c)— common in Ghidra output), VarBERT silently returnszero predictions for the entire function.
Root Cause
_process_code_with_text()replaces variable names with@@varname@@id@@placeholders. When variables are adjacent without whitespace, multiple
placeholders merge into a single space-delimited word:
split_words()usesre.search()which only returns the first@@match per word — subsequent adjacent patterns are silently lost. This causes
generate_popular_names()to see a holder/mask count mismatch and discardall predictions.
Fix
Replace
re.search()withre.finditer()insplit_words()to extractall
@@patterns from each word.Testing
Tested with a minimal Ghidra-decompiled function containing adjacent variables:
Existing tests continue to pass.