access the variant directly in the for..of loops

Author: Janther

src/slang-nodes/ContractDefinition.ts

@@ -49,12 +49,12 @@ export class ContractDefinition implements SlangNode {
     // the same name as the contract.
     const compiler = coerce(options.compiler);
     if (compiler && !satisfies(compiler, '>=0.5.0')) {
-      for (const member of this.members.items) {
+      for (const { variant: member } of this.members.items) {
         if (
-          member.variant.kind === NonterminalKind.FunctionDefinition &&
-          member.variant.name.variant.value !== this.name.value
+          member.kind === NonterminalKind.FunctionDefinition &&
+          member.name.variant.value !== this.name.value
         ) {
-          member.variant.cleanModifierInvocationArguments();
+          member.cleanModifierInvocationArguments();
         }
       }
     }

src/slang-nodes/FallbackFunctionDefinition.ts

@@ -53,12 +53,12 @@ export class FallbackFunctionDefinition implements SlangNode {
   }
 
   cleanModifierInvocationArguments(): void {
-    for (const attribute of this.attributes.items) {
+    for (const { variant: attribute } of this.attributes.items) {
       if (
-        typeof attribute.variant !== 'string' &&
-        attribute.variant.kind === NonterminalKind.ModifierInvocation
+        typeof attribute !== 'string' &&
+        attribute.kind === NonterminalKind.ModifierInvocation
       ) {
-        attribute.variant.cleanModifierInvocationArguments();
+        attribute.cleanModifierInvocationArguments();
       }
     }
   }

src/slang-nodes/FunctionDefinition.ts

@@ -61,12 +61,12 @@ export class FunctionDefinition implements SlangNode {
   }
 
   cleanModifierInvocationArguments(): void {
-    for (const attribute of this.attributes.items) {
+    for (const { variant: attribute } of this.attributes.items) {
       if (
-        typeof attribute.variant !== 'string' &&
-        attribute.variant.kind === NonterminalKind.ModifierInvocation
+        typeof attribute !== 'string' &&
+        attribute.kind === NonterminalKind.ModifierInvocation
       ) {
-        attribute.variant.cleanModifierInvocationArguments();
+        attribute.cleanModifierInvocationArguments();
       }
     }
   }

src/slang-nodes/ReceiveFunctionDefinition.ts

@@ -46,12 +46,12 @@ export class ReceiveFunctionDefinition implements SlangNode {
   }
 
   cleanModifierInvocationArguments(): void {
-    for (const attribute of this.attributes.items) {
+    for (const { variant: attribute } of this.attributes.items) {
       if (
-        typeof attribute.variant !== 'string' &&
-        attribute.variant.kind === NonterminalKind.ModifierInvocation
+        typeof attribute !== 'string' &&
+        attribute.kind === NonterminalKind.ModifierInvocation
       ) {
-        attribute.variant.cleanModifierInvocationArguments();
+        attribute.cleanModifierInvocationArguments();
       }
     }
   }

src/slang-nodes/UnnamedFunctionDefinition.ts

@@ -46,9 +46,9 @@ export class UnnamedFunctionDefinition implements SlangNode {
   }
 
   cleanModifierInvocationArguments(): void {
-    for (const attribute of this.attributes.items) {
-      if (typeof attribute.variant !== 'string') {
-        attribute.variant.cleanModifierInvocationArguments();
+    for (const { variant: attribute } of this.attributes.items) {
+      if (typeof attribute !== 'string') {
+        attribute.cleanModifierInvocationArguments();
       }
     }
   }