FIXED: Issue#474 (Windows) several issues due to sizeof(wint_t) == 2

LamentConfiguration · Jun 18, 2019 · 2e5ab87 · 2e5ab87
1 parent adcfd20
commit 2e5ab87
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/src/os/pl-ctype.c b/src/os/pl-ctype.c
@@ -268,7 +268,7 @@ char_type_by_name(atom_t name, int arity)
 static int
 advanceGen(generator *gen)
 { if ( gen->do_enum & ENUM_CHAR )
-  { if ( ++gen->current > 0x10ffff )
+  { if ( ++gen->current > PLMAXWCHAR )
       fail;
   } else
   { gen->class++;

diff --git a/src/pl-arith.c b/src/pl-arith.c
@@ -934,7 +934,7 @@ arithChar(Word p ARG_LD)
   if ( isInteger(*p) )
   { intptr_t chr = valInt(*p);
 
-    if ( chr >= 0 && chr <= 0x10ffff )	/* UNICODE_MAX */
+    if ( chr >= 0 && chr <= PLMAXWCHAR )
       return (int)chr;
   } else if ( isAtom(*p) )
   { PL_chars_t txt;

diff --git a/src/pl-prims.c b/src/pl-prims.c
@@ -3719,12 +3719,6 @@ PRED_IMPL("number_string", 2, number_string, 0)
 }
 
 
-#if SIZEOF_WCHAR_T == 2
-#define CHARCODE_MAX 0xffff
-#else
-#define CHARCODE_MAX 0x10ffff
-#endif
-
 static
 PRED_IMPL("char_code", 2, char_code, PL_FA_ISO)
 { PRED_LD
@@ -3755,7 +3749,7 @@ PRED_IMPL("char_code", 2, char_code, PL_FA_ISO)
   { if ( !PL_get_integer_ex(chr, &n) )
       fail;
 
-    if ( n >= 0 && n <= CHARCODE_MAX )
+    if ( n >= 0 && n <= PLMAXWCHAR )
       cchr = n;
     else if ( n < 0 || n > 0x10ffff )
       return PL_type_error("character_code", chr);
@@ -3782,7 +3776,7 @@ is_code(word w)
 { if ( isTaggedInt(w) )
   { intptr_t code = valInt(w);
 
-    return code >= 0 && code <= CHARCODE_MAX;
+    return code >= 0 && code <= PLMAXWCHAR;
   }
 
   return FALSE;

diff --git a/src/pl-read.c b/src/pl-read.c
@@ -5250,7 +5250,7 @@ PRED_IMPL("$code_class", 2, code_class, 0)
        !PL_get_atom_ex(A2, &class) )
     return FALSE;
 
-  if ( code > 0x10ffff )
+  if ( code > PLMAXWCHAR )
     PL_error(NULL, 0, NULL, ERR_TYPE, ATOM_character, A1);
 
   c = PL_atom_chars(class);