update to src & tests to sol 0.8

Author: RyanRHall

.github/workflows/ci.yml

@@ -1,6 +1,5 @@
-name: "Test"
+name: "CI"
 on:
-  pull_request:
   push:
 jobs:
   tests:
@@ -10,5 +9,9 @@ jobs:
     - uses: cachix/install-nix-action@v13
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - run: nix-env -iA dapp -f $(curl -sS https://api.github.com/repos/dapphub/dapptools/releases/latest | jq -r .tarball_url)
-    - run: make test
+    - name: Install dapp
+      run: nix-env -iA dapp -f $(curl -sS https://api.github.com/repos/dapphub/dapptools/releases/latest | jq -r .tarball_url)
+    - name: Fetch submodules
+      run: git submodule update --init
+    - name: Run tests
+      run: make test

lib/ds-test

@@ -53,7 +53,10 @@ library strings {
         }
 
         // Copy remaining bytes
-        uint mask = 256 ** (32 - len) - 1;
+        uint mask = type(uint).max;
+        if (len > 0) {
+            mask = 256 ** (32 - len) - 1;
+        }
         assembly {
             let srcpart := and(mload(src), not(mask))
             let destpart := and(mload(dest), mask)
@@ -83,23 +86,23 @@ library strings {
         uint ret;
         if (self == 0)
             return 0;
-        if (uint(self) & 0xffffffffffffffffffffffffffffffff == 0) {
+        if (uint(self) & type(uint128).max == 0) {
             ret += 16;
             self = bytes32(uint(self) / 0x100000000000000000000000000000000);
         }
-        if (uint(self) & 0xffffffffffffffff == 0) {
+        if (uint(self) & type(uint64).max == 0) {
             ret += 8;
             self = bytes32(uint(self) / 0x10000000000000000);
         }
-        if (uint(self) & 0xffffffff == 0) {
+        if (uint(self) & type(uint32).max == 0) {
             ret += 4;
             self = bytes32(uint(self) / 0x100000000);
         }
-        if (uint(self) & 0xffff == 0) {
+        if (uint(self) & type(uint16).max == 0) {
             ret += 2;
             self = bytes32(uint(self) / 0x10000);
         }
-        if (uint(self) & 0xff == 0) {
+        if (uint(self) & type(uint8).max == 0) {
             ret += 1;
         }
         return 32 - ret;
@@ -211,12 +214,12 @@ library strings {
             }
             if (a != b) {
                 // Mask out irrelevant bytes and check again
-                uint256 mask = type(uint256).max; // 0xffff...
+                uint mask = type(uint).max; // 0xffff...
                 if(shortest < 32) {
                   mask = ~(2 ** (8 * (32 - shortest + idx)) - 1);
                 }
                 unchecked {
-                    uint256 diff = (a & mask) - (b & mask);
+                    uint diff = (a & mask) - (b & mask);
                     if (diff != 0)
                         return int(diff);
                 }
@@ -469,7 +472,10 @@ library strings {
 
         if (needlelen <= selflen) {
             if (needlelen <= 32) {
-                bytes32 mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
+                bytes32 mask;
+                if (needlelen > 0) {
+                    mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
+                }
 
                 bytes32 needledata;
                 assembly { needledata := and(mload(needleptr), mask) }
@@ -509,7 +515,10 @@ library strings {
 
         if (needlelen <= selflen) {
             if (needlelen <= 32) {
-                bytes32 mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
+                bytes32 mask;
+                if (needlelen > 0) {
+                    mask = bytes32(~(2 ** (8 * (32 - needlelen)) - 1));
+                }
 
                 bytes32 needledata;
                 assembly { needledata := and(mload(needleptr), mask) }

src/strings.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.8.0;
 
 import 'ds-test/test.sol';
 import './strings.sol';
@@ -17,15 +17,15 @@ contract StringsTest is DSTest {
         return x == 0 ? int(0) : (x < 0 ? -1 : int(1));
     }
 
-    function assertEq0(string a, string b) internal {
+    function assertEq0(string memory a, string memory b) internal {
         assertEq0(bytes(a), bytes(b));
     }
 
     function assertEq0(strings.slice memory a, strings.slice memory b) internal {
     	assertEq0(a.toString(), b.toString());
     }
 
-    function assertEq0(strings.slice memory a, string b) internal {
+    function assertEq0(strings.slice memory a, string memory b) internal {
         assertEq0(a.toString(), b);
     }
 
@@ -58,8 +58,8 @@ contract StringsTest is DSTest {
     function testLen() public {
         assertEq("".toSlice().len(), 0);
         assertEq("Hello, world!".toSlice().len(), 13);
-        assertEq("naïve".toSlice().len(), 5);
-        assertEq("こんにちは".toSlice().len(), 5);
+        assertEq(unicode"naïve".toSlice().len(), 5);
+        assertEq(unicode"こんにちは".toSlice().len(), 5);
     }
 
     function testEmpty() public {
@@ -74,23 +74,23 @@ contract StringsTest is DSTest {
     }
 
     function testNextRune() public {
-        strings.slice memory s = "a¡ࠀ𐀡".toSlice();
+        strings.slice memory s = unicode"a¡ࠀ𐀡".toSlice();
         assertEq0(s.nextRune(), "a");
-        assertEq0(s, "¡ࠀ𐀡");
-        assertEq0(s.nextRune(), "¡");
-        assertEq0(s, "ࠀ𐀡");
-        assertEq0(s.nextRune(), "ࠀ");
-        assertEq0(s, "𐀡");
-        assertEq0(s.nextRune(), "𐀡");
+        assertEq0(s, unicode"¡ࠀ𐀡");
+        assertEq0(s.nextRune(), unicode"¡");
+        assertEq0(s, unicode"ࠀ𐀡");
+        assertEq0(s.nextRune(), unicode"ࠀ");
+        assertEq0(s, unicode"𐀡");
+        assertEq0(s.nextRune(), unicode"𐀡");
         assertEq0(s, "");
         assertEq0(s.nextRune(), "");
     }
 
     function testOrd() public {
         assertEq("a".toSlice().ord(), 0x61);
-        assertEq("¡".toSlice().ord(), 0xA1);
-        assertEq("ࠀ".toSlice().ord(), 0x800);
-        assertEq("𐀡".toSlice().ord(), 0x10021);
+        assertEq(unicode"¡".toSlice().ord(), 0xA1);
+        assertEq(unicode"ࠀ".toSlice().ord(), 0x800);
+        assertEq(unicode"𐀡".toSlice().ord(), 0x10021);
     }
 
     function testCompare() public {