update

ethereum · Jan 23, 2022 · d6c053a · d6c053a
1 parent 69ee26d
commit d6c053a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/test/translate.js b/test/translate.js
@@ -18,6 +18,7 @@ tape('Version string to Semver translator', function (t) {
     st.end();
   });
   t.test('Broken nightly with leading zeroes', function (st) {
+    st.equal(versionToSemver('0.3.6-nightly.2016.08.27+commit.91d4fa47.Emscripten.clang'), '0.3.6-nightly.2016.8.27+commit.91d4fa47.Emscripten.clang');
     st.equal(versionToSemver('0.4.1-nightly.2016.09.09+commit.79867f49.Emscripten.clang'), '0.4.1-nightly.2016.9.9+commit.79867f49.Emscripten.clang');
     st.end();
   });
@@ -40,6 +41,10 @@ tape('Version string to Semver translator', function (t) {
     );
     st.end();
   });
+  t.test('Broken 0.3.4 nightly', function (st) {
+    st.equal(versionToSemver('0.3.4-0/Release-Emscripten/clang/Interpreter'), '0.3.4');
+    st.end();
+  });
   t.test('Old style 0.3.5', function (st) {
     // The one in the solc-bin list
     st.equal(versionToSemver('0.3.5-371690f0/Release-Emscripten/clang/Interpreter'), '0.3.5+commit.371690f0');

diff --git a/translate.js b/translate.js
@@ -5,6 +5,7 @@ const linker = require('./linker.js');
 ///            0.3.6-3fc68da5/Release-Emscripten/clang
 ///            0.3.5-371690f0/Release-Emscripten/clang/Interpreter
 ///            0.3.5-0/Release-Emscripten/clang/Interpreter
+///            0.3.4-0/Release-Emscripten/clang/Interpreter
 ///            0.2.0-e7098958/.-Emscripten/clang/int linked to libethereum-1.1.1-bbb80ab0/.-Emscripten/clang/int
 ///            0.1.3-0/.-/clang/int linked to libethereum-0.9.92-0/.-/clang/int
 ///            0.1.2-5c3bfd4b*/.-/clang/int
@@ -21,11 +22,14 @@ function versionToSemver (version) {
   if (version.indexOf('0.1.3-0') !== -1) {
     return '0.1.3';
   }
+  if (version.indexOf('0.3.4-0') !== -1) {
+    return '0.3.4';
+  }
   if (version.indexOf('0.3.5-0') !== -1) {
     return '0.3.5';
   }
   // This parses the obsolete nightly style where the date can have leading zeroes.
-  var nightlyParsed = version.match(/^([0-9]+\.[0-9]+\.[0-9]+)-nightly\.([0-9]+)\.0([1-9])\.0([1-9])(.*)$/);
+  var nightlyParsed = version.match(/^([0-9]+\.[0-9]+\.[0-9]+)-nightly\.([0-9]+)\.0?([1-9])\.0?([1-9])(.*)$/);
   if (nightlyParsed) {
     return nightlyParsed[1] + '-nightly.' + nightlyParsed[2] + '.' + nightlyParsed[3] + '.' + nightlyParsed[4] + nightlyParsed[5];
   }