Upgrade solidity parser

StillFantastic · Dec 24, 2020 · c908175 · c908175
1 parent 97c5ee3
commit c908175
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/packages/hardhat-core/package.json b/packages/hardhat-core/package.json
@@ -77,7 +77,7 @@
   "dependencies": {
     "@nomiclabs/ethereumjs-vm": "^4.1.1",
     "@sentry/node": "^5.18.1",
-    "@solidity-parser/parser": "^0.10.1",
+    "@solidity-parser/parser": "^0.10.2",
     "@types/bn.js": "^4.11.5",
     "@types/lru-cache": "^5.1.0",
     "abort-controller": "^3.0.0",

diff --git a/packages/hardhat-core/test/internal/solidity/parse.ts b/packages/hardhat-core/test/internal/solidity/parse.ts
@@ -163,5 +163,27 @@ contract Qux {}
 
       assert.deepEqual(versionPragmas, ["^0.5.0", "^0.5.1"]);
     });
+
+    it("should work with one ||", () => {
+      const parser = new Parser();
+      const { versionPragmas } = parser.parse(
+        `pragma solidity ^0.5.0 || ^0.6.0;`,
+        "",
+        ""
+      );
+
+      assert.deepEqual(versionPragmas, ["^0.5.0 || ^0.6.0"]);
+    });
+
+    it("should work with two ||", () => {
+      const parser = new Parser();
+      const { versionPragmas } = parser.parse(
+        `pragma solidity ^0.5.0 || ^0.6.0 || ^0.7.0;`,
+        "",
+        ""
+      );
+
+      assert.deepEqual(versionPragmas, ["^0.5.0 || ^0.6.0 || ^0.7.0"]);
+    });
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -728,10 +728,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@solidity-parser/parser@^0.10.1":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.10.1.tgz#d3680d1ebebed21eee67f58a41eb92175204f0c7"
-  integrity sha512-tHDPCRMEBFDxBz5rioQRoKgOQGa/K2digdfR68cd5vO6IufAqoNt1sfjssQDf2KPqHPftICBQOqlcu0w5/Jisg==
+"@solidity-parser/parser@^0.10.2":
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.10.2.tgz#404018b2824dc26ee61368f96d8d176a2028f9a3"
+  integrity sha512-SFO5xlpR5rnqIds++4JDcXMG9b6KfslcxKoX+y19rizB0sNkv9mRs/TA5PhD4MrRbyaS60FkQ4updZtjPa4LjQ==
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"