"uni p U+2042-U+2044" works like "uni p U+2042..U+2044"

arp242 · Feb 5, 2020 · bf15098 · bf15098
1 parent fd05e6a
commit bf15098
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/TODO b/TODO
@@ -1,5 +1,4 @@
 - uni p < a        →  doesn't split on spaces (should it? 🤔)
-- uni p 2000-2002  →  should just work
 - Add -output option to control output format.
 - Add -format option to configure columns.
 - Add option to search and/or print by "other keywords" from CLDR. Maybe also

diff --git a/uni.go b/uni.go
@@ -476,9 +476,14 @@ func print(args []string, quiet, raw bool) error {
 		}
 
 		// U2042, U+2042, U+2042..U+2050, 2042..2050, 0x2041, etc.
-		s := strings.Split(canon, "..")
-		if len(s) == 1 {
-			s = append(s, s[0])
+		var s []string
+		switch {
+		case strings.Contains(canon, ".."):
+			s = strings.SplitN(canon, "..", 2)
+		case strings.Contains(canon, "-"):
+			s = strings.SplitN(canon, "-", 2)
+		default:
+			s = []string{canon, canon}
 		}
 		start, err1 := unidata.ToCodepoint(s[0])
 		end, err2 := unidata.ToCodepoint(s[1])

diff --git a/uni_test.go b/uni_test.go
@@ -115,6 +115,7 @@ func TestPrint(t *testing.T) {
 		{[]string{"-q", "p", "2042..U+2044"}, "ASTERISM", 3, -1},
 		{[]string{"-q", "p", "0x2042..0o20104"}, "ASTERISM", 3, -1},
 		{[]string{"-q", "p", "0b10000001000010..0o20104"}, "ASTERISM", 3, -1},
+		{[]string{"-q", "p", "0b10000001000010-0o20104"}, "ASTERISM", 3, -1},
 		{[]string{"p", "9999999999"}, `CODEPOINT NOT IN UNICODE`, 2, -1},
 
 		{[]string{"p", ""}, `unknown identifier: ""`, 1, 1},