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
3 changes: 2 additions & 1 deletion src/lint/rules/variable-use-def.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,10 @@ export function checkVariableUsage(
preceding.querySelector('emu-alg') == null &&
preceding.textContent != null
) {
const isParameter = preceding.nodeName === 'H1';
// `__` is for <del>_x_</del><ins>_y_</ins>, which has textContent `_x__y_`
for (const name of preceding.textContent.matchAll(/(?<=\b|_)_([a-zA-Z0-9]+)_(?=\b|_)/g)) {
scope.declare(name[1], null, undefined, true);
scope.declare(name[1], null, isParameter ? 'parameter' : undefined, !isParameter);
}
}
preceding = previousOrParent(preceding, parentClause);
Expand Down
48 changes: 48 additions & 0 deletions test/lint-variable-use-def.ts
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,54 @@ describe('variables cannot be redeclared', () => {
`,
);
});

it('parameters cannot be redeclared', async () => {
await assertLint(
positioned`
<emu-clause id="example" type="abstract operation">
<h1>
Example (
_x_: ~foo~,
): ~foo~ or ~bar~
</h1>
<dl class="header"></dl>
<emu-alg>
1. Let ${M}_x_ be ~bar~.
1. Return _x_.
</emu-alg>
</emu-clause>
`,
{
ruleId: 're-declaration',
nodeType: 'emu-alg',
message: '"x" is already declared',
},
);
});

it('optional parameters cannot be redeclared', async () => {
await assertLint(
positioned`
<emu-clause id="example" type="abstract operation">
<h1>
Example (
optional _x_: ~foo~,
): ~foo~ or ~bar~
</h1>
<dl class="header"></dl>
<emu-alg>
1. If _x_ is not present, let ${M}_x_ be ~bar~.
1. Return _x_.
</emu-alg>
</emu-clause>
`,
{
ruleId: 're-declaration',
nodeType: 'emu-alg',
message: '"x" is already declared',
},
);
});
});

describe('closures must not capture reassigned variables', () => {
Expand Down