Fix tests

Author: fvictorio

solidity-parser-parser-0.10.0.tgz

@@ -471,7 +471,7 @@ const transformAST = {
       name: toText(ctx.identifier()),
       storageLocation,
       isStateVar: false,
-      isIndexed: ctx.IndexedKeyword(0),
+      isIndexed: !!ctx.IndexedKeyword(0),
     }
   },
 
@@ -550,7 +550,7 @@ const transformAST = {
 
     return {
       isReasonStringType:
-        ctx.identifier() && toText(ctx.identifier()) === 'Error',
+        !!ctx.identifier() && toText(ctx.identifier()) === 'Error',
       parameters,
       body: (this as any).visit(ctx.block()),
     }
@@ -716,6 +716,7 @@ const transformAST = {
             typeName: {
               type: 'ArrayTypeName',
               baseTypeName: (this as any).visit(ctx.getChild(0)),
+              length: null,
             },
           }
         }
@@ -1189,7 +1190,7 @@ const transformAST = {
     return {
       name: toText(ctx.identifier()),
       parameters: (this as any).visit(ctx.eventParameterList()),
-      isAnonymous: ctx.AnonymousKeyword(),
+      isAnonymous: !!ctx.AnonymousKeyword(),
     }
   },
 
@@ -1207,7 +1208,7 @@ const transformAST = {
           typeName: type,
           name,
           isStateVar: false,
-          isIndexed: paramCtx.IndexedKeyword(0),
+          isIndexed: !!paramCtx.IndexedKeyword(0),
         },
         paramCtx
       )
@@ -1471,8 +1472,8 @@ class ASTBuilder extends antlr4.tree.ParseTreeVisitor {
         column: ctx.start.column,
       },
       end: {
-        line: ctx.stop !== undefined ? ctx.stop.line : ctx.start.line,
-        column: ctx.stop !== undefined ? ctx.stop.column : ctx.start.column,
+        line: ctx.stop ? ctx.stop.line : ctx.start.line,
+        column: ctx.stop ? ctx.stop.column : ctx.start.column,
       },
     }
     return { loc: sourceLocation }

src/ASTBuilder.ts

@@ -202,7 +202,7 @@ export interface UserDefinedTypeName extends BaseASTNode {
 export interface ArrayTypeName extends BaseASTNode {
   type: 'ArrayTypeName'
   baseTypeName: TypeName
-  length?: Expression
+  length: Expression | null
 }
 export interface Mapping extends BaseASTNode {
   type: 'Mapping'

src/ast-types.ts

@@ -1,5 +1,5 @@
 const { assert } = require('chai')
-const parser = require('../dist/index')
+const parser = require('..')
 const {
   parseContract,
   parseNode,

test/ast.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const { assert } = require('chai')
-const parser = require('../dist/index')
+const parser = require('..')
 const { parseNode, parseStatement } = require('./utils')
 
 describe('#parse', function () {

test/index.js

@@ -1,5 +1,5 @@
 const { assert } = require('chai')
-const parser = require('../dist/index')
+const parser = require('..')
 
 function print(obj) {
   console.log(JSON.stringify(obj, null, 2))