From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 5 Feb 2025 12:44:01 +0000 (+0200)
Subject: Revert "Improve bidi_get_time runtime checking"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a3fcafcf5f21ee3f7f6eb0a316a9aa48a57ed89;p=emacs.git

Revert "Improve bidi_get_time runtime checking"

This reverts commit 782ec71053d8535511522f27f28c11682ca0f40b.
It makes the code less readable and less future-proof, so a
net loss.  (Bug#75964)

(cherry picked from commit a1f2f5995d69db646f58a7203ab6208556f0df4b)
---

diff --git a/src/bidi.c b/src/bidi.c
index fd0bebb85e0..d8754e2db73 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -282,6 +282,12 @@ bidi_get_type (int ch, bidi_dir_t override)
     emacs_abort ();
 
   default_type = (bidi_type_t) XFIXNUM (CHAR_TABLE_REF (bidi_type_table, ch));
+  /* Every valid character code, even those that are unassigned by the
+     UCD, have some bidi-class property, according to
+     DerivedBidiClass.txt file.  Therefore, if we ever get UNKNOWN_BT
+     (= zero) code from CHAR_TABLE_REF, that's a bug.  */
+  if (default_type == UNKNOWN_BT)
+    emacs_abort ();
 
   switch (default_type)
     {
@@ -297,26 +303,13 @@ bidi_get_type (int ch, bidi_dir_t override)
       case FSI:
       case PDI:
 	return default_type;
-
-      case STRONG_L: case STRONG_R:
-      case WEAK_EN: case WEAK_AN:
-      case STRONG_AL:
-      case WEAK_ES: case WEAK_ET: case WEAK_CS: case WEAK_NSM:
-      case NEUTRAL_S: case NEUTRAL_WS: case NEUTRAL_ON:
+      default:
 	if (override == L2R)
 	  return STRONG_L;
 	else if (override == R2L)
 	  return STRONG_R;
 	else
 	  return default_type;
-
-      case UNKNOWN_BT:
-      default:
-	/* Every valid character code, even those unassigned by the UCD,
-	   have some bidi-class property, according to DerivedBidiClass.txt.
-	   Therefore, if we ever get UNKNOWN_BT (= zero) or some unknown
-	   code from CHAR_TABLE_REF, that's a bug.  */
-	emacs_abort ();
     }
 }