From 70ef71caf5398454dd17120f456998c1a3760c73 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 16 Oct 1996 04:29:02 +0000
Subject: (get_next): Rewrite to treat lower/upper mapping as a special case.
 (main): Write separate loops to initialize mapping for lower->upper and
 upper->lower conversion.

---
 src/tr.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/tr.c b/src/tr.c
index 159f98552..b3fb9fe36 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -1207,6 +1207,33 @@ get_next (struct Spec_list *s, enum Upper_Lower_class *class)
       break;
 
     case RE_CHAR_CLASS:
+      if (class)
+	{
+	  int upper_or_lower;
+	  switch (p->u.char_class)
+	    {
+	    case CC_LOWER:
+	      *class = UL_LOWER;
+	      upper_or_lower = 1;
+	      break;
+	    case CC_UPPER:
+	      *class = UL_UPPER;
+	      upper_or_lower = 1;
+	      break;
+	    default:
+	      upper_or_lower = 0;
+	      break;
+	    }
+
+	  if (upper_or_lower)
+	    {
+	      s->tail = p->next;
+	      s->state = NEW_ELEMENT;
+	      return_val = 0;
+	      break;
+	    }
+	}
+
       if (s->state == NEW_ELEMENT)
 	{
 	  for (i = 0; i < N_CHARS; i++)
@@ -1227,21 +1254,6 @@ get_next (struct Spec_list *s, enum Upper_Lower_class *class)
 	  s->tail = p->next;
 	  s->state = NEW_ELEMENT;
 	}
-      if (class)
-	{
-	  switch (p->u.char_class)
-	    {
-	    case CC_LOWER:
-	      *class = UL_LOWER;
-	      break;
-	    case CC_UPPER:
-	      *class = UL_UPPER;
-	      break;
-	    default:
-	      /* empty */
-	      break;
-	    }
-	}
       break;
 
     case RE_EQUIV_CLASS:
@@ -1982,10 +1994,26 @@ without squeezing repeats"));
 	      if (!class_ok[(int) class_s1][(int) class_s2])
 		error (EXIT_FAILURE, 0,
 		     _("misaligned or mismatched upper and/or lower classes"));
-	      /* The following should have been checked by validate...  */
-	      if (c2 == -1)
-		break;
-	      xlate[c1] = c2;
+
+	      if (class_s1 == UL_LOWER && class_s2 == UL_UPPER)
+		{
+		  for (i = 0; i < N_CHARS; i++)
+		    if (ISLOWER (i))
+		      xlate[i] = toupper (i);
+		}
+	      else if (class_s1 == UL_UPPER && class_s2 == UL_LOWER)
+		{
+		  for (i = 0; i < N_CHARS; i++)
+		    if (ISUPPER (i))
+		      xlate[i] = tolower (i);
+		}
+	      else
+		{
+		  /* The following should have been checked by validate...  */
+		  if (c2 == -1)
+		    break;
+		  xlate[c1] = c2;
+		}
 	    }
 	  assert (c1 == -1 || truncate_set1);
 	}
-- 
cgit v1.2.3-70-g09d2