base32: don't '=' pad the zbase32

mrjbq7 · mrjbq7 · commit 5d1eb77d4548 · 2024-12-08T12:39:00.000-08:00
diff --git a/basis/base32/base32-docs.factor b/basis/base32/base32-docs.factor
@@ -34,7 +34,6 @@ HELP: zbase32>
 { $values { "zbase32" sequence } { "seq" sequence } }
 { $description "Decode from the \"human-oriented\" Base32 encoding." } ;
 
-
 ARTICLE: "base32" "Base32 conversions"
 "The " { $vocab-link "base32" } " vocabulary supports encoding and decoding of various Base32 encoding formats, including:"
 $nl
@@ -55,7 +54,7 @@ $nl
     >base32-crockford-checksum
     base32-crockford-checksum>
 }
-"Human-oriented Base32 encoding:"
+"Human-oriented Base32 encoding, described in " { $url "http://philzimmermann.com/docs/human-oriented-base-32-encoding.txt" } ":"
 { $subsections
     >zbase32
     zbase32>
diff --git a/basis/base32/base32-tests.factor b/basis/base32/base32-tests.factor
@@ -13,7 +13,6 @@ USING: base32 byte-arrays kernel sequences strings tools.test ;
 { "MFRGG===" } [ "abc" >base32 "" like ] unit-test
 { "MFRGGZA=" } [ "abcd" >base32 "" like ] unit-test
 { "MFRGGZDF" } [ "abcde" >base32 "" like ] unit-test
-
 { B{ } } [ f base32> ] unit-test
 { B{ } } [ B{ } base32> ] unit-test
 { "\0" } [ "AA======" base32> "" like ] unit-test
@@ -92,17 +91,17 @@ USING: base32 byte-arrays kernel sequences strings tools.test ;
 { 0 } [ "00" base32-crockford-checksum> ] unit-test
 
 { "" } [ "" >zbase32 >string ] unit-test
-{ "ca======" } [ "f" >zbase32 >string ] unit-test
-{ "c3zo====" } [ "fo" >zbase32 >string ] unit-test
-{ "c3zs6===" } [ "foo" >zbase32 >string ] unit-test
-{ "c3zs6ao=" } [ "foob" >zbase32 >string ] unit-test
+{ "ca" } [ "f" >zbase32 >string ] unit-test
+{ "c3zo" } [ "fo" >zbase32 >string ] unit-test
+{ "c3zs6" } [ "foo" >zbase32 >string ] unit-test
+{ "c3zs6ao" } [ "foob" >zbase32 >string ] unit-test
 { "c3zs6aub" } [ "fooba" >zbase32 >string ] unit-test
-{ "c3zs6aubqe======" } [ "foobar" >zbase32 >string ] unit-test
+{ "c3zs6aubqe" } [ "foobar" >zbase32 >string ] unit-test
 
 { "" } [ "" zbase32> >string ] unit-test
-{ "f" } [ "ca======" zbase32> >string ] unit-test
-{ "fo" } [ "c3zo====" zbase32> >string ] unit-test
-{ "foo" } [ "c3zs6===" zbase32> >string ] unit-test
-{ "foob" } [ "c3zs6ao=" zbase32> >string ] unit-test
+{ "f" } [ "ca" zbase32> >string ] unit-test
+{ "fo" } [ "c3zo" zbase32> >string ] unit-test
+{ "foo" } [ "c3zs6" zbase32> >string ] unit-test
+{ "foob" } [ "c3zs6ao" zbase32> >string ] unit-test
 { "fooba" } [ "c3zs6aub" zbase32> >string ] unit-test
-{ "foobar" } [ "c3zs6aubqe======" zbase32> >string ] unit-test
+{ "foobar" } [ "c3zs6aubqe" zbase32> >string ] unit-test
diff --git a/basis/base32/base32.factor b/basis/base32/base32.factor
@@ -207,8 +207,7 @@ CONSTANT: zbase32-alphabet $[ "ybndrfg8ejkmcpqxot1uwisza345h769" >byte-array ]
     ] with B{ } map-as ; inline
 
 : zencode-pad ( seq n -- byte-array )
-    [ 5 0 pad-tail zencode5 ] [ B{ 0 2 4 5 7 } nth ] bi* head-slice
-    8 CHAR: = pad-tail ; inline
+    [ 5 0 pad-tail zencode5 ] [ B{ 0 2 4 5 7 } nth ] bi* head ;
 
 : (encode-zbase32) ( stream column -- )
     5 pick stream-read dup length {
