Merge pull request #945 from pmoura/fix_char_code_error_checking

Fix char_code/2 predicate failure instead of exception on non-integer second argument
2021-05-10 11:08:58 -06:00
parent 59f08cd651 63db194140
commit 5d0c60bd24
1 changed files with 6 additions and 1 deletions
--- a/src/lib/builtins.pl
+++ b/src/lib/builtins.pl
@@ -1293,7 +1293,12 @@ char_code(Char, Code) :-
       ;  throw(error(type_error(integer, Code), char_code/2))
       )
    ;  atom_length(Char, 1) ->
-       '$char_code'(Char, Code)
+       (  var(Code) ->
+          '$char_code'(Char, Code)
+       ;  integer(Code) ->
+          '$char_code'(Char, Code)
+       ;  throw(error(type_error(integer, Code), char_code/2))
+       )
    ;  throw(error(type_error(character, Char), char_code/2))
    ).