Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ private static SyntaxSymbol[] checkIds(Evaluator eval, SyntaxChecker formChecker
int size = argSexp.size(eval);
for (int i = 0; i < size; i++)
{
// Prepare the identifiers so they resolve to their own binding.
subformChecker.requiredIdentifier(i).resolve();
// Syntax-check the binders
subformChecker.requiredIdentifier(i);
}

// Check for duplicate identifiers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ SyntaxValue<?> expand(Expander expander, Environment env, SyntaxSexp stx)
// Prepare the bound names so they resolve to their own binding.
for (int i = 0; i < args.length; i++)
{
SyntaxSymbol arg = args[i];
arg = (SyntaxSymbol) arg.addWrap(localEnv.getWrap());
arg.resolve(); // Caches the binding in the identifier
args[i] = arg;
args[i] = (SyntaxSymbol) args[i].addWrap(localEnv.getWrap());
}

if (formals instanceof SyntaxSymbol)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ SyntaxValue expand(Expander expander, Environment env, SyntaxSexp stx)
SyntaxSymbol name = boundNames[bindingPos];
assert name == wrappedNames[j];

name = (SyntaxSymbol) name.addWrap(localWrap);
name.resolve();
wrappedNames[j] = name;
wrappedNames[j] = name.addWrap(localWrap);
bindingPos++;
}
names = names.copyReplacingChildren(eval, wrappedNames);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ SyntaxValue expand(Expander expander, Environment env, SyntaxSexp stx)
{
// Wrap the bound names so they resolve to their own binding.
SyntaxSymbol name = (SyntaxSymbol) boundNames[i].addWrap(localWrap);
name.resolve();

// Already type- and arity-checked this above
SyntaxSexp binding = (SyntaxSexp) bindingForms.get(eval, i);
Expand Down
Loading