From 46c1eefc40382d294273113f6b46a20ca4d52ee9 Mon Sep 17 00:00:00 2001 From: cgewecke Date: Tue, 23 Jul 2019 20:20:11 -0700 Subject: [PATCH] Rebase fixes --- package.json | 2 +- .../contracts}/statements/type-keyword.sol | 0 yarn.lock | 7 +------ 3 files changed, 2 insertions(+), 7 deletions(-) rename test/{sources => soliditySources/contracts}/statements/type-keyword.sol (100%) diff --git a/package.json b/package.json index 35d9932..04cf979 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "req-cwd": "^1.0.1", "sha1": "^1.1.1", "shelljs": "^0.8.3", - "solidity-parser-antlr": "0.4.5", + "solidity-parser-antlr": "^0.4.7", "web3-utils": "^1.0.0" }, "devDependencies": { diff --git a/test/sources/statements/type-keyword.sol b/test/soliditySources/contracts/statements/type-keyword.sol similarity index 100% rename from test/sources/statements/type-keyword.sol rename to test/soliditySources/contracts/statements/type-keyword.sol diff --git a/yarn.lock b/yarn.lock index 56f14b2..8d02ad7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4221,12 +4221,7 @@ solc@^0.5.10: tmp "0.0.33" yargs "^11.0.0" -solidity-parser-antlr@0.4.5: - version "0.4.5" - resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.4.5.tgz#4de1867f1a12df4553886209225bc80328aeb0c1" - integrity sha512-5GzhIs4hpY3XnGwMndgrOksD567O5WdUQPbpy2n2WA1m3algzUKYMf+Ne/QHd36TTUNvVV+iTWD5tKaCZfaOjg== - -solidity-parser-antlr@^0.4.2: +solidity-parser-antlr@^0.4.2, solidity-parser-antlr@^0.4.7: version "0.4.8" resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.4.8.tgz#69f77a56ed5596458ee42f7240e80f23b8eb75b9" integrity sha512-HkAAvzLfw2OPmkuGLcy8M5yVaO4PWagmV4t7DSKYi3pXQZG7TPQ2dWl1c0QTp56snX08FeKsBAsPhXY43yjZUQ==