Skip to content

Commit eedc3c3

Browse files
committed
if updateMetadata modifies directly comments and loc, there's no need to destructure twice
1 parent 0c4c021 commit eedc3c3

194 files changed

Lines changed: 428 additions & 496 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/slang-nodes/AdditiveExpression.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ export class AdditiveExpression implements SlangNode {
3939
rightOperand: Expression;
4040

4141
constructor(ast: ast.AdditiveExpression, options: ParserOptions<AstNode>) {
42-
const metadata = getNodeMetadata(ast);
42+
[this.loc, this.comments] = getNodeMetadata(ast);
4343

4444
this.leftOperand = new Expression(ast.leftOperand, options);
4545
this.operator = ast.operator.unparse();
4646
this.rightOperand = new Expression(ast.rightOperand, options);
4747

48-
[this.loc, this.comments] = updateMetadata(metadata, [
48+
updateMetadata(this.loc, this.comments, [
4949
this.leftOperand,
5050
this.rightOperand
5151
]);

src/slang-nodes/AndExpression.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ export class AndExpression implements SlangNode {
2222
rightOperand: Expression;
2323

2424
constructor(ast: ast.AndExpression, options: ParserOptions<AstNode>) {
25-
const metadata = getNodeMetadata(ast);
25+
[this.loc, this.comments] = getNodeMetadata(ast);
2626

2727
this.leftOperand = new Expression(ast.leftOperand, options);
2828
this.operator = ast.operator.unparse();
2929
this.rightOperand = new Expression(ast.rightOperand, options);
3030

31-
[this.loc, this.comments] = updateMetadata(metadata, [
31+
updateMetadata(this.loc, this.comments, [
3232
this.leftOperand,
3333
this.rightOperand
3434
]);

src/slang-nodes/ArgumentsDeclaration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class ArgumentsDeclaration implements SlangNode {
1818
variant: PositionalArgumentsDeclaration | NamedArgumentsDeclaration;
1919

2020
constructor(ast: ast.ArgumentsDeclaration, options: ParserOptions<AstNode>) {
21-
const metadata = getNodeMetadata(ast);
21+
[this.loc, this.comments] = getNodeMetadata(ast);
2222

2323
switch (ast.variant.cst.kind) {
2424
case NonterminalKind.PositionalArgumentsDeclaration:
@@ -37,7 +37,7 @@ export class ArgumentsDeclaration implements SlangNode {
3737
throw new Error(`Unexpected variant: ${ast.variant.cst.kind}`);
3838
}
3939

40-
[this.loc, this.comments] = updateMetadata(metadata, [this.variant]);
40+
updateMetadata(this.loc, this.comments, [this.variant]);
4141
}
4242

4343
print(path: AstPath<ArgumentsDeclaration>, print: PrintFunction): Doc {

src/slang-nodes/ArrayExpression.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ export class ArrayExpression implements SlangNode {
2020
items: ArrayValues;
2121

2222
constructor(ast: ast.ArrayExpression, options: ParserOptions<AstNode>) {
23-
const metadata = getNodeMetadata(ast);
23+
[this.loc, this.comments] = getNodeMetadata(ast);
2424

2525
this.items = new ArrayValues(ast.items, options);
2626

27-
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
27+
updateMetadata(this.loc, this.comments, [this.items]);
2828
}
2929

3030
print(path: AstPath<ArrayExpression>, print: PrintFunction): Doc {

src/slang-nodes/ArrayTypeName.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@ export class ArrayTypeName implements SlangNode {
2020
index?: Expression;
2121

2222
constructor(ast: ast.ArrayTypeName, options: ParserOptions<AstNode>) {
23-
const metadata = getNodeMetadata(ast);
23+
[this.loc, this.comments] = getNodeMetadata(ast);
2424

2525
this.operand = new TypeName(ast.operand, options);
2626
if (ast.index) {
2727
this.index = new Expression(ast.index, options);
2828
}
2929

30-
[this.loc, this.comments] = updateMetadata(metadata, [
31-
this.operand,
32-
this.index
33-
]);
30+
updateMetadata(this.loc, this.comments, [this.operand, this.index]);
3431
}
3532

3633
print(path: AstPath<ArrayTypeName>, print: PrintFunction): Doc {

src/slang-nodes/ArrayValues.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ export class ArrayValues implements SlangNode {
1818
items: Expression[];
1919

2020
constructor(ast: ast.ArrayValues, options: ParserOptions<AstNode>) {
21-
const metadata = getNodeMetadata(ast, true);
21+
[this.loc, this.comments] = getNodeMetadata(ast, true);
2222

2323
this.items = ast.items.map((item) => new Expression(item, options));
2424

25-
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
25+
updateMetadata(this.loc, this.comments, [this.items]);
2626
}
2727

2828
print(path: AstPath<ArrayValues>, print: PrintFunction): Doc {

src/slang-nodes/AssemblyFlags.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ export class AssemblyFlags implements SlangNode {
1818
items: StringLiteral[];
1919

2020
constructor(ast: ast.AssemblyFlags, options: ParserOptions<AstNode>) {
21-
const metadata = getNodeMetadata(ast, true);
21+
[this.loc, this.comments] = getNodeMetadata(ast, true);
2222

2323
this.items = ast.items.map((item) => new StringLiteral(item, options));
2424

25-
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
25+
updateMetadata(this.loc, this.comments, [this.items]);
2626
}
2727

2828
print(path: AstPath<AssemblyFlags>, print: PrintFunction): Doc {

src/slang-nodes/AssemblyFlagsDeclaration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ export class AssemblyFlagsDeclaration implements SlangNode {
2020
ast: ast.AssemblyFlagsDeclaration,
2121
options: ParserOptions<AstNode>
2222
) {
23-
const metadata = getNodeMetadata(ast);
23+
[this.loc, this.comments] = getNodeMetadata(ast);
2424

2525
this.flags = new AssemblyFlags(ast.flags, options);
2626

27-
[this.loc, this.comments] = updateMetadata(metadata, [this.flags]);
27+
updateMetadata(this.loc, this.comments, [this.flags]);
2828
}
2929

3030
print(path: AstPath<AssemblyFlagsDeclaration>, print: PrintFunction): Doc {

src/slang-nodes/AssemblyStatement.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class AssemblyStatement implements SlangNode {
2424
body: YulBlock;
2525

2626
constructor(ast: ast.AssemblyStatement, options: ParserOptions<AstNode>) {
27-
const metadata = getNodeMetadata(ast);
27+
[this.loc, this.comments] = getNodeMetadata(ast);
2828

2929
if (ast.label) {
3030
this.label = new StringLiteral(ast.label, options);
@@ -34,7 +34,7 @@ export class AssemblyStatement implements SlangNode {
3434
}
3535
this.body = new YulBlock(ast.body, options);
3636

37-
[this.loc, this.comments] = updateMetadata(metadata, [
37+
updateMetadata(this.loc, this.comments, [
3838
this.label,
3939
this.flags,
4040
this.body

src/slang-nodes/AssignmentExpression.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ export class AssignmentExpression implements SlangNode {
2525
rightOperand: Expression;
2626

2727
constructor(ast: ast.AssignmentExpression, options: ParserOptions<AstNode>) {
28-
const metadata = getNodeMetadata(ast);
28+
[this.loc, this.comments] = getNodeMetadata(ast);
2929

3030
this.leftOperand = new Expression(ast.leftOperand, options);
3131
this.operator = ast.operator.unparse();
3232
this.rightOperand = new Expression(ast.rightOperand, options);
3333

34-
[this.loc, this.comments] = updateMetadata(metadata, [
34+
updateMetadata(this.loc, this.comments, [
3535
this.leftOperand,
3636
this.rightOperand
3737
]);

0 commit comments

Comments
 (0)