From aa3985a298d7770ef780324adea3ba0fe75b4e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sun, 23 Aug 2020 09:37:51 +0200
Subject: [PATCH] Don't use "case X ... Y:", if possible/where it makes sense

---
 osc.c   | 12 +++++++++---
 sixel.c | 20 ++++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/osc.c b/osc.c
index 20ceda8e..dcfaf524 100644
--- a/osc.c
+++ b/osc.c
@@ -339,9 +339,15 @@ static uint8_t
 nibble2hex(char c)
 {
     switch (c) {
-    case '0' ... '9': return c - '0';
-    case 'a' ... 'f': return c - 'a' + 10;
-    case 'A' ... 'F': return c - 'A' + 10;
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+        return c - '0';
+
+    case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+        return c - 'a' + 10;
+
+    case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+        return c - 'A' + 10;
     }
 
     assert(false);
diff --git a/sixel.c b/sixel.c
index 27441d8c..c6fe1a10 100644
--- a/sixel.c
+++ b/sixel.c
@@ -668,7 +668,16 @@ decsixel(struct terminal *term, uint8_t c)
         term->sixel.pos.col = 0;
         break;
 
-    case '?'...'~':
+    case '?': case '@': case 'A': case 'B': case 'C': case 'D': case 'E':
+    case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
+    case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S':
+    case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
+    case '[': case '\\': case ']': case '^': case '_': case '`': case 'a':
+    case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h':
+    case 'i': case 'j': case 'k': case 'l': case 'm': case 'n': case 'o':
+    case 'p': case 'q': case 'r': case 's': case 't': case 'u': case 'v':
+    case 'w': case 'x': case 'y': case 'z': case '{': case '|': case '}':
+    case '~':
         sixel_add(term, term->sixel.palette[term->sixel.color_idx], c - 63);
         break;
 
@@ -687,7 +696,8 @@ static void
 decgra(struct terminal *term, uint8_t c)
 {
     switch (c) {
-    case '0'...'9':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
         term->sixel.param *= 10;
         term->sixel.param += c - '0';
         break;
@@ -732,7 +742,8 @@ static void
 decgri(struct terminal *term, uint8_t c)
 {
     switch (c) {
-    case '0'...'9':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
         term->sixel.param *= 10;
         term->sixel.param += c - '0';
         break;
@@ -750,7 +761,8 @@ static void
 decgci(struct terminal *term, uint8_t c)
 {
     switch (c) {
-    case '0'...'9':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
         term->sixel.param *= 10;
         term->sixel.param += c - '0';
         break;