Idiomatic naming in libs

This commit is contained in:
2026-05-07 08:15:32 -05:00
parent 44ab13c889
commit 37d57044e2
3 changed files with 16 additions and 16 deletions

View File

@@ -44,7 +44,7 @@ expectBytes = (expected bs :
matchBool matchBool
(ok unit rest) (ok unit rest)
(err errUnexpectedBytes bs) (err errUnexpectedBytes bs)
(bytesEq taken expected)) (bytesEq? taken expected))
(readBytes (bytesLength expected) bs)) (readBytes (bytesLength expected) bs))
expectU8 = (expected bs : expectU8 = (expected bs :
@@ -54,7 +54,7 @@ expectU8 = (expected bs :
matchBool matchBool
(ok unit rest) (ok unit rest)
(err errUnexpectedByte bs) (err errUnexpectedByte bs)
(byteEq actual expected)) (byteEq? actual expected))
(readU8 bs)) (readU8 bs))
read2 = (bs : readBytes 2 bs) read2 = (bs : readBytes 2 bs)

View File

@@ -4,13 +4,13 @@
nothing = t nothing = t
just = x : t x just = x : t x
bytesIsNil = emptyList? bytesNil? = emptyList?
bytesHead = matchList nothing (h _ : just h) bytesHead = matchList nothing (h _ : just h)
bytesTail = matchList nothing (_ r : just r) bytesTail = matchList nothing (_ r : just r)
byteEq = equal? byteEq? = equal?
bytesLength = length bytesLength = length
bytesAppend = append bytesAppend = append
@@ -38,12 +38,12 @@ bytesDrop = n bytes : bytesDrop_ n 0 bytes
bytesSplitAt = n bytes : pair (bytesTake n bytes) (bytesDrop n bytes) bytesSplitAt = n bytes : pair (bytesTake n bytes) (bytesDrop n bytes)
bytesEq = y (self xs ys : bytesEq? = y (self xs ys :
matchList matchList
(matchList true (_ _ : false) ys) (matchList true (_ _ : false) ys)
(xh xt : (xh xt :
matchList matchList
false false
(yh yt : and? (byteEq xh yh) (self xt yt)) (yh yt : and? (byteEq? xh yh) (self xt yt))
ys) ys)
xs) xs)

View File

@@ -1054,13 +1054,13 @@ bytesT = ofList . fmap byteT
byteListUtilities :: TestTree byteListUtilities :: TestTree
byteListUtilities = testGroup "Byte List Utility Tests" byteListUtilities = testGroup "Byte List Utility Tests"
[ testCase "isNil: empty list is nil" $ do [ testCase "isNil: empty list is nil" $ do
let input = "bytesIsNil []" let input = "bytesNil? []"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= trueT result env @?= trueT
, testCase "isNil: non-empty list is not nil" $ do , testCase "isNil: non-empty list is not nil" $ do
let input = "bytesIsNil [(1)]" let input = "bytesNil? [(1)]"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT
@@ -1180,49 +1180,49 @@ byteListUtilities = testGroup "Byte List Utility Tests"
result env @?= pairT (bytesT [1,2]) (bytesT []) result env @?= pairT (bytesT [1,2]) (bytesT [])
, testCase "byteEq: equal bytes are equal" $ do , testCase "byteEq: equal bytes are equal" $ do
let input = "byteEq 1 1" let input = "byteEq? 1 1"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= trueT result env @?= trueT
, testCase "byteEq: unequal bytes are not equal" $ do , testCase "byteEq: unequal bytes are not equal" $ do
let input = "byteEq 1 2" let input = "byteEq? 1 2"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT
, testCase "bytesEq: empty == empty" $ do , testCase "bytesEq: empty == empty" $ do
let input = "bytesEq [] []" let input = "bytesEq? [] []"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= trueT result env @?= trueT
, testCase "bytesEq: empty != [1]" $ do , testCase "bytesEq: empty != [1]" $ do
let input = "bytesEq [] [(1)]" let input = "bytesEq? [] [(1)]"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT
, testCase "bytesEq: [1] != empty" $ do , testCase "bytesEq: [1] != empty" $ do
let input = "bytesEq [(1)] []" let input = "bytesEq? [(1)] []"
library <- evaluateFile "./lib/bytes.tri" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT
, testCase "bytesEq: equal lists are equal" $ do , 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" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= trueT result env @?= trueT
, testCase "bytesEq: different last element" $ do , 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" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT
, testCase "bytesEq: different lengths" $ do , 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" library <- evaluateFile "./lib/bytes.tri"
let env = evalTricu library (parseTricu input) let env = evalTricu library (parseTricu input)
result env @?= falseT result env @?= falseT