diff --git a/lib/binary.tri b/lib/binary.tri index a5eea6b..bca4bd8 100644 --- a/lib/binary.tri +++ b/lib/binary.tri @@ -44,7 +44,7 @@ expectBytes = (expected bs : matchBool (ok unit rest) (err errUnexpectedBytes bs) - (bytesEq taken expected)) + (bytesEq? taken expected)) (readBytes (bytesLength expected) bs)) expectU8 = (expected bs : @@ -54,7 +54,7 @@ expectU8 = (expected bs : matchBool (ok unit rest) (err errUnexpectedByte bs) - (byteEq actual expected)) + (byteEq? actual expected)) (readU8 bs)) read2 = (bs : readBytes 2 bs) diff --git a/lib/bytes.tri b/lib/bytes.tri index 4e40fe9..ffa46b6 100644 --- a/lib/bytes.tri +++ b/lib/bytes.tri @@ -4,13 +4,13 @@ nothing = t just = x : t x -bytesIsNil = emptyList? +bytesNil? = emptyList? bytesHead = matchList nothing (h _ : just h) bytesTail = matchList nothing (_ r : just r) -byteEq = equal? +byteEq? = equal? bytesLength = length bytesAppend = append @@ -38,12 +38,12 @@ bytesDrop = n bytes : bytesDrop_ n 0 bytes bytesSplitAt = n bytes : pair (bytesTake n bytes) (bytesDrop n bytes) -bytesEq = y (self xs ys : +bytesEq? = y (self xs ys : matchList (matchList true (_ _ : false) ys) (xh xt : matchList false - (yh yt : and? (byteEq xh yh) (self xt yt)) + (yh yt : and? (byteEq? xh yh) (self xt yt)) ys) xs) diff --git a/test/Spec.hs b/test/Spec.hs index 861918e..a45cd4d 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1054,13 +1054,13 @@ bytesT = ofList . fmap byteT byteListUtilities :: TestTree byteListUtilities = testGroup "Byte List Utility Tests" [ testCase "isNil: empty list is nil" $ do - let input = "bytesIsNil []" + let input = "bytesNil? []" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= trueT , testCase "isNil: non-empty list is not nil" $ do - let input = "bytesIsNil [(1)]" + let input = "bytesNil? [(1)]" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT @@ -1180,49 +1180,49 @@ byteListUtilities = testGroup "Byte List Utility Tests" result env @?= pairT (bytesT [1,2]) (bytesT []) , testCase "byteEq: equal bytes are equal" $ do - let input = "byteEq 1 1" + let input = "byteEq? 1 1" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= trueT , testCase "byteEq: unequal bytes are not equal" $ do - let input = "byteEq 1 2" + let input = "byteEq? 1 2" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT , testCase "bytesEq: empty == empty" $ do - let input = "bytesEq [] []" + let input = "bytesEq? [] []" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= trueT , testCase "bytesEq: empty != [1]" $ do - let input = "bytesEq [] [(1)]" + let input = "bytesEq? [] [(1)]" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT , testCase "bytesEq: [1] != empty" $ do - let input = "bytesEq [(1)] []" + let input = "bytesEq? [(1)] []" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT , testCase "bytesEq: equal lists are equal" $ do - let input = "bytesEq [(1) (2) (3)] [(1) (2) (3)]" + let input = "bytesEq? [(1) (2) (3)] [(1) (2) (3)]" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= trueT , testCase "bytesEq: different last element" $ do - let input = "bytesEq [(1) (2) (3)] [(1) (2) (4)]" + let input = "bytesEq? [(1) (2) (3)] [(1) (2) (4)]" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT , testCase "bytesEq: different lengths" $ do - let input = "bytesEq [(1) (2)] [(1) (2) (3)]" + let input = "bytesEq? [(1) (2)] [(1) (2) (3)]" library <- evaluateFile "./lib/bytes.tri" let env = evalTricu library (parseTricu input) result env @?= falseT