Skip to content

Commit e5fa3ed

Browse files
committed
avoid using the temporary variable metadata since it can be destructured directly
1 parent fa46253 commit e5fa3ed

225 files changed

Lines changed: 550 additions & 865 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/AbicoderPragma.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ export class AbicoderPragma implements SlangNode {
1616
version: Identifier;
1717

1818
constructor(ast: ast.AbicoderPragma) {
19-
const metadata = getNodeMetadata(ast);
19+
[this.loc, this.comments] = getNodeMetadata(ast);
2020

2121
this.version = new Identifier(ast.version);
22-
23-
[this.loc, this.comments] = metadata;
2422
}
2523

2624
print(path: AstPath<AbicoderPragma>, print: PrintFunction): Doc {

src/slang-nodes/AdditiveExpression.ts

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

4141
constructor(ast: ast.AdditiveExpression, options: ParserOptions<AstNode>) {
42-
let metadata = getNodeMetadata(ast);
42+
const metadata = 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-
metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
49-
50-
[this.loc, this.comments] = metadata;
48+
[this.loc, this.comments] = updateMetadata(metadata, [
49+
this.leftOperand,
50+
this.rightOperand
51+
]);
5152

5253
this.leftOperand = tryToHug(this.leftOperand);
5354
this.rightOperand = tryToHug(this.rightOperand);

src/slang-nodes/AddressType.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ export class AddressType implements SlangNode {
1616
payableKeyword?: string;
1717

1818
constructor(ast: ast.AddressType) {
19-
const metadata = getNodeMetadata(ast);
19+
[this.loc, this.comments] = getNodeMetadata(ast);
2020

2121
this.payableKeyword = ast.payableKeyword?.unparse();
22-
23-
[this.loc, this.comments] = metadata;
2422
}
2523

2624
print(): Doc {

src/slang-nodes/AndExpression.ts

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

2424
constructor(ast: ast.AndExpression, options: ParserOptions<AstNode>) {
25-
let metadata = getNodeMetadata(ast);
25+
const metadata = 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-
metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
32-
33-
[this.loc, this.comments] = metadata;
31+
[this.loc, this.comments] = updateMetadata(metadata, [
32+
this.leftOperand,
33+
this.rightOperand
34+
]);
3435
}
3536

3637
print(

src/slang-nodes/ArgumentsDeclaration.ts

Lines changed: 2 additions & 4 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-
let metadata = getNodeMetadata(ast);
21+
const metadata = getNodeMetadata(ast);
2222

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

40-
metadata = updateMetadata(metadata, [this.variant]);
41-
42-
[this.loc, this.comments] = metadata;
40+
[this.loc, this.comments] = updateMetadata(metadata, [this.variant]);
4341
}
4442

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

src/slang-nodes/ArrayExpression.ts

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

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

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

27-
metadata = updateMetadata(metadata, [this.items]);
28-
29-
[this.loc, this.comments] = metadata;
27+
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
3028
}
3129

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

src/slang-nodes/ArrayTypeName.ts

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

2222
constructor(ast: ast.ArrayTypeName, options: ParserOptions<AstNode>) {
23-
let metadata = getNodeMetadata(ast);
23+
const metadata = 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-
metadata = updateMetadata(metadata, [this.operand, this.index]);
31-
32-
[this.loc, this.comments] = metadata;
30+
[this.loc, this.comments] = updateMetadata(metadata, [
31+
this.operand,
32+
this.index
33+
]);
3334
}
3435

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

src/slang-nodes/ArrayValues.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ export class ArrayValues implements SlangNode {
2020
separators: string[];
2121

2222
constructor(ast: ast.ArrayValues, options: ParserOptions<AstNode>) {
23-
let metadata = getNodeMetadata(ast, true);
23+
const metadata = getNodeMetadata(ast, true);
2424

2525
this.items = ast.items.map((item) => new Expression(item, options));
2626
this.separators = ast.separators.map((separator) => separator.unparse());
2727

28-
metadata = updateMetadata(metadata, [this.items]);
29-
30-
[this.loc, this.comments] = metadata;
28+
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
3129
}
3230

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

src/slang-nodes/AssemblyFlags.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ export class AssemblyFlags implements SlangNode {
2020
separators: string[];
2121

2222
constructor(ast: ast.AssemblyFlags, options: ParserOptions<AstNode>) {
23-
let metadata = getNodeMetadata(ast, true);
23+
const metadata = getNodeMetadata(ast, true);
2424

2525
this.items = ast.items.map((item) => new StringLiteral(item, options));
2626
this.separators = ast.separators.map((separator) => separator.unparse());
2727

28-
metadata = updateMetadata(metadata, [this.items]);
29-
30-
[this.loc, this.comments] = metadata;
28+
[this.loc, this.comments] = updateMetadata(metadata, [this.items]);
3129
}
3230

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

src/slang-nodes/AssemblyFlagsDeclaration.ts

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

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

27-
metadata = updateMetadata(metadata, [this.flags]);
28-
29-
[this.loc, this.comments] = metadata;
27+
[this.loc, this.comments] = updateMetadata(metadata, [this.flags]);
3028
}
3129

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

0 commit comments

Comments
 (0)