diff --git a/package-lock.json b/package-lock.json index d2464d823..dfeb65934 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.2.1", "license": "MIT", "dependencies": { - "@nomicfoundation/slang": "1.3.2", + "@nomicfoundation/slang": "1.3.4", "@solidity-parser/parser": "^0.20.2", "semver": "^7.7.4" }, @@ -1448,9 +1448,9 @@ } }, "node_modules/@nomicfoundation/slang": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-1.3.2.tgz", - "integrity": "sha512-jkwB5BnIGLEgCSDVb2ysf+fEKhkc3g7pyZOZ9+Q9Yz6PX2ahwj6D5esKV0q1lf61QJyyxIAj2ysoPWTqZivteQ==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-1.3.4.tgz", + "integrity": "sha512-ghzrPSYH1sZO65id6+Bq2Ood87HT54QP3RGC8EkmpcrJ6tT9Ky0RtaJfrzV5G4jpDsnNua6+YEDpzOMori04hQ==", "license": "MIT", "dependencies": { "@bytecodealliance/preview2-shim": "^0.17.2" @@ -2221,9 +2221,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", - "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -7094,9 +7094,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz", - "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 06fe804cf..bb2c79981 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "webpack-cli": "^6.0.1" }, "dependencies": { - "@nomicfoundation/slang": "1.3.2", + "@nomicfoundation/slang": "1.3.4", "@solidity-parser/parser": "^0.20.2", "semver": "^7.7.4" }, diff --git a/src/slang-nodes/RevertStatement.ts b/src/slang-nodes/RevertStatement.ts index f423bba70..611889dab 100644 --- a/src/slang-nodes/RevertStatement.ts +++ b/src/slang-nodes/RevertStatement.ts @@ -1,5 +1,4 @@ import { NonterminalKind } from '@nomicfoundation/slang/cst'; -import { joinExisting } from '../slang-utils/join-existing.js'; import { extractVariant } from '../slang-utils/extract-variant.js'; import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; @@ -13,7 +12,7 @@ import type { AstNode } from './types.d.ts'; export class RevertStatement extends SlangNode { readonly kind = NonterminalKind.RevertStatement; - error?: IdentifierPath; + error: IdentifierPath; arguments: ArgumentsDeclaration['variant']; @@ -24,9 +23,7 @@ export class RevertStatement extends SlangNode { ) { super(ast, collected); - if (ast.error) { - this.error = new IdentifierPath(ast.error, collected); - } + this.error = new IdentifierPath(ast.error, collected); this.arguments = extractVariant( new ArgumentsDeclaration(ast.arguments, collected, options) ); @@ -36,7 +33,8 @@ export class RevertStatement extends SlangNode { print(path: AstPath, print: PrintFunction): Doc { return [ - joinExisting(' ', ['revert', path.call(print, 'error')]), + 'revert ', + path.call(print, 'error'), path.call(print, 'arguments'), ';' ];