mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
base38: reassign alphabet and numbers
It changes from " 0-9?a-z" to ".0-9a-z~". The default or placeholder changes from " " to "." so it's now always visible. The wildcard changes from "?" to "~" so it's now sorted last.
This commit is contained in:
1 parent
e12f10eef0
commit
bd42fa7af2
18 files changed
+235
-212
No files matched your search
+35
-32
@@ -10,7 +10,7 @@
|
||||
|
||||
// ----------------
|
||||
|
||||
// Package base38 converts a 4-byte string, each byte in [ 0-9?a-z], to a base
|
||||
// Package base38 converts a 4-byte string, each byte in [.0-9a-z~], to a base
|
||||
// 38 number.
|
||||
package base38
|
||||
|
||||
@@ -25,10 +25,13 @@ const (
|
||||
|
||||
// Encode encodes a 4-byte string as a uint32 in the range [0, Max].
|
||||
//
|
||||
// Each byte must be ' ', be in the range '0'-'9', be '?' or be in the range
|
||||
// 'a'-'z'.
|
||||
// Each byte must be one of:
|
||||
// - '.'
|
||||
// - in the range ['0', '9']
|
||||
// - in the range ['a', 'z']
|
||||
// - '~'
|
||||
//
|
||||
// The string " " is mapped to zero.
|
||||
// The string "...." is mapped to zero.
|
||||
func Encode(s string) (u uint32, ok bool) {
|
||||
if len(s) == 4 {
|
||||
for i := 0; i < 4; i++ {
|
||||
@@ -47,7 +50,7 @@ func Encode(s string) (u uint32, ok bool) {
|
||||
}
|
||||
|
||||
var table = [256]uint8{
|
||||
' ': 1,
|
||||
'.': 1,
|
||||
'0': 2,
|
||||
'1': 3,
|
||||
'2': 4,
|
||||
@@ -58,31 +61,31 @@ var table = [256]uint8{
|
||||
'7': 9,
|
||||
'8': 10,
|
||||
'9': 11,
|
||||
'?': 12,
|
||||
'a': 13,
|
||||
'b': 14,
|
||||
'c': 15,
|
||||
'd': 16,
|
||||
'e': 17,
|
||||
'f': 18,
|
||||
'g': 19,
|
||||
'h': 20,
|
||||
'i': 21,
|
||||
'j': 22,
|
||||
'k': 23,
|
||||
'l': 24,
|
||||
'm': 25,
|
||||
'n': 26,
|
||||
'o': 27,
|
||||
'p': 28,
|
||||
'q': 29,
|
||||
'r': 30,
|
||||
's': 31,
|
||||
't': 32,
|
||||
'u': 33,
|
||||
'v': 34,
|
||||
'w': 35,
|
||||
'x': 36,
|
||||
'y': 37,
|
||||
'z': 38,
|
||||
'a': 12,
|
||||
'b': 13,
|
||||
'c': 14,
|
||||
'd': 15,
|
||||
'e': 16,
|
||||
'f': 17,
|
||||
'g': 18,
|
||||
'h': 19,
|
||||
'i': 20,
|
||||
'j': 21,
|
||||
'k': 22,
|
||||
'l': 23,
|
||||
'm': 24,
|
||||
'n': 25,
|
||||
'o': 26,
|
||||
'p': 27,
|
||||
'q': 28,
|
||||
'r': 29,
|
||||
's': 30,
|
||||
't': 31,
|
||||
'u': 32,
|
||||
'v': 33,
|
||||
'w': 34,
|
||||
'x': 35,
|
||||
'y': 36,
|
||||
'z': 37,
|
||||
'~': 38,
|
||||
}
|
||||
+24
-22
@@ -37,23 +37,25 @@ func TestValid(tt *testing.T) {
|
||||
s string
|
||||
want uint32
|
||||
}{
|
||||
{" ", mk(0, 0, 0, 0)},
|
||||
{"0 ", mk(1, 0, 0, 0)},
|
||||
{" 0 ", mk(0, 1, 0, 0)},
|
||||
{" 0 ", mk(0, 0, 1, 0)},
|
||||
{" 0", mk(0, 0, 0, 1)},
|
||||
{"??12", mk(11, 11, 2, 3)},
|
||||
{"....", mk(0, 0, 0, 0)},
|
||||
{"0...", mk(1, 0, 0, 0)},
|
||||
{".0..", mk(0, 1, 0, 0)},
|
||||
{"..0.", mk(0, 0, 1, 0)},
|
||||
{"...0", mk(0, 0, 0, 1)},
|
||||
{"aa12", mk(11, 11, 2, 3)},
|
||||
{"6543", mk(7, 6, 5, 4)},
|
||||
{"789a", mk(8, 9, 10, 12)},
|
||||
{"bcde", mk(13, 14, 15, 16)},
|
||||
{"fghi", mk(17, 18, 19, 20)},
|
||||
{"jklm", mk(21, 22, 23, 24)},
|
||||
{" m0m", mk(0, 24, 1, 24)},
|
||||
{"nopq", mk(25, 26, 27, 28)},
|
||||
{"rstu", mk(29, 30, 31, 32)},
|
||||
{"vwxy", mk(33, 34, 35, 36)},
|
||||
{"z?z9", mk(37, 11, 37, 10)},
|
||||
{"zzzz", mk(37, 37, 37, 37)},
|
||||
{"789a", mk(8, 9, 10, 11)},
|
||||
{"bcde", mk(12, 13, 14, 15)},
|
||||
{"fghi", mk(16, 17, 18, 19)},
|
||||
{"jklm", mk(20, 21, 22, 23)},
|
||||
{".m0m", mk(0, 23, 1, 23)},
|
||||
{"nopq", mk(24, 25, 26, 27)},
|
||||
{"rstu", mk(28, 29, 30, 31)},
|
||||
{"vwxy", mk(32, 33, 34, 35)},
|
||||
{"zzzz", mk(36, 36, 36, 36)},
|
||||
{"z~z9", mk(36, 37, 36, 10)},
|
||||
{"~z~9", mk(37, 36, 37, 10)},
|
||||
{"~~~~", mk(37, 37, 37, 37)},
|
||||
}
|
||||
|
||||
maxSeen := false
|
||||
@@ -81,12 +83,12 @@ func TestValid(tt *testing.T) {
|
||||
func TestInvalid(tt *testing.T) {
|
||||
testCases := []string{
|
||||
"",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
"....",
|
||||
" ",
|
||||
" ",
|
||||
".",
|
||||
"..",
|
||||
"...",
|
||||
" ",
|
||||
".....",
|
||||
"......",
|
||||
"Abcd",
|
||||
"a\x00cd",
|
||||
"ab+d",
|
||||
|
||||
Reference in new issue
Block a user