From ec1fb0e3228e2d7e6c74e1a9727e241cc726c75d Mon Sep 17 00:00:00 2001 From: Inanc Gumus Date: Thu, 14 Feb 2019 15:54:37 +0300 Subject: [PATCH] update: strings charset table --- .../03-solution-final/main.go | 2 +- x-tba/strings-revisited/charset-table/main.go | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/x-tba/slices/21-bouncing-ball-project/03-solution-final/main.go b/x-tba/slices/21-bouncing-ball-project/03-solution-final/main.go index c43b41c..9b5197e 100644 --- a/x-tba/slices/21-bouncing-ball-project/03-solution-final/main.go +++ b/x-tba/slices/21-bouncing-ball-project/03-solution-final/main.go @@ -75,7 +75,7 @@ func main() { for x := range board { ball = '🎱' if board[x][y] { - ball = '🎾' + ball = '🏈' } buf = append(buf, ball, ' ') } diff --git a/x-tba/strings-revisited/charset-table/main.go b/x-tba/strings-revisited/charset-table/main.go index eead3fb..ca231b2 100644 --- a/x-tba/strings-revisited/charset-table/main.go +++ b/x-tba/strings-revisited/charset-table/main.go @@ -15,8 +15,8 @@ import ( ) const ( - asciiStart = '\u0001' // 1 - asciiStop = '\u007f' // 127 + asciiStart = 0x41 // 65 + asciiStop = 0x5a // 90 cols = 1 ) @@ -36,14 +36,15 @@ func main() { // PRINT HEADER for i := 0; i < cols; i++ { - fmt.Printf("| %-6s %-8s %-8s %-14s", "rune", "dec", "code", "bytes") + fmt.Printf("%-10s %-12s %-12s %-14s", + "literal", "decimal", "codepoint", "bytes") } - fmt.Print("\n", strings.Repeat("-", 40*cols), "\n") + fmt.Print("\n", strings.Repeat("-", 50*cols), "\n") // PRINT TABLE for n, l := start, 0; n <= stop; n++ { // draw the line - fmt.Printf("| %-6q %-8d %-8U % -14x", n, n, n, string(n)) + fmt.Printf("%-10q %-12d %-12U % -14x", n, n, n, string(n)) // go to next line if columns are consumed if l++; l%cols == 0 { @@ -62,16 +63,25 @@ EXAMPLE BLOCKS asciiStart = '\u0001' -> 32 asciiStop = '\u007f' -> 127 +upperCaseStart = '\u0041' -> 65 +upperCaseStop = '\u005a' -> 90 + +lowerCaseStart = '\u0061' -> 97 +lowerCaseStop = '\u007a' -> 122 + + 2 bytes ------------------------------------------------------------ latin1Start = '\u0080' -> 128 latin1Stop = '\u00ff' -> 255 + 3 bytes ------------------------------------------------------------ dingbatStart = '\u2700' -> 9984 dingbatStop = '\u27bf' -> 10175 + 4 bytes ------------------------------------------------------------ emojiStart = '\U0001f600' -> 128512