File 1081-Fix-printing-of-bignums.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1081-Fix-printing-of-bignums.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Currently displaying revision 6a6e740c0161086d7407fd293e77c355 , Show latest

From 160c24acad993b91243e12c748c322fa5016638b Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 5 Jan 2021 11:38:55 +0100
Subject: [PATCH 1/3] Fix printing of bignums

---
 lib/erl_interface/src/misc/ei_printterm.c     | 27 ++++--
 lib/erl_interface/test/ei_print_SUITE.erl     | 87 ++++++++++++++++++-
 .../test/ei_print_SUITE_data/ei_print_test.c  | 67 ++++++++++++++
 3 files changed, 170 insertions(+), 11 deletions(-)

diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index d7d3c0e3e3..7c2cd2d35f 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -87,24 +87,33 @@ static char *ei_big_to_str(erlang_big *b)
 {
     int buf_len;
     char *s,*buf;
+    unsigned int no_digits;
     unsigned short *sp;
     int i;
 
-    buf_len = 64+b->is_neg+10*b->arity;
-    if ( (buf=malloc(buf_len)) == NULL) return NULL;
+    no_digits = (b->arity + 1) / 2;
 
-    memset(buf,(char)0,buf_len);
+    buf_len = (!!b->is_neg /* "-" */
+               + 9 /* "#integer(" */
+               + 10 /* %d */
+               + 5 /* ") = {" */
+               + 6*no_digits /* 16-bit digits + ","s */
+               + 1 /* "}" */
+               + 1); /* \0 */
+    if ( (buf=malloc(buf_len)) == NULL) return NULL;
 
     s = buf;
     if ( b->is_neg ) 
         s += sprintf(s,"-");
-    s += sprintf(s,"#integer(%d) = {",b->arity);
-    for(sp=b->digits,i=0;i<b->arity;i++) {
-        s += sprintf(s,"%d",sp[i]);
-        if ( (i+1) != b->arity ) 
-            s += sprintf(s,",");
+
+    s += sprintf(s,"#integer(%d) = {", no_digits);
+    for(sp = b->digits, i = 0; i < no_digits; i++) {
+        s += sprintf(s, "%d", (int) sp[i]);
+        if (i + 1 != no_digits)
+            *(s++) = ',';
     }
-    s += sprintf(s,"}");
+    *(s++) = '}';
+    *s = '\0';
     return buf;
 }
 
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index 25dd95649d..c0c2b40891 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -25,7 +25,8 @@
 -include("ei_print_SUITE_data/ei_print_test_cases.hrl").
 
 -export([all/0, suite/0,
-         atoms/1, tuples/1, lists/1, strings/1]).
+         atoms/1, tuples/1, lists/1, strings/1,
+         integers/1]).
 
 -import(runner, [get_term/1]).
 
@@ -36,7 +37,7 @@ suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [atoms, tuples, lists, strings].
+    [atoms, tuples, lists, strings, integers].
 
 %% Tests formatting various atoms.
 
@@ -138,3 +139,86 @@ strings(Config) ->
 
     runner:recv_eot(P),
     ok.
+
+integers(Config) ->
+    Port = runner:start(Config, ?integers),
+
+    test_integers(Port, -1000, 1000),
+    test_integers(Port, (1 bsl 27) - 1000, (1 bsl 27) + 1000),
+    test_integers(Port, -(1 bsl 27) - 1000, -(1 bsl 27) + 1000),
+    test_integers(Port, (1 bsl 28) - 1000, (1 bsl 28) + 1000),
+    test_integers(Port, -(1 bsl 28) - 1000, -(1 bsl 28) + 1000),
+    test_integers(Port, (1 bsl 31) - 1000, (1 bsl 31) + 1000),
+    test_integers(Port, -(1 bsl 31) - 1000, -(1 bsl 31) + 1000),
+    test_integers(Port, (1 bsl 32) - 1000, (1 bsl 32) + 1000),
+    test_integers(Port, -(1 bsl 32) - 1000, -(1 bsl 32) + 1000),
+    test_integers(Port, (1 bsl 60) - 1000, (1 bsl 60) + 1000),
+    test_integers(Port, -(1 bsl 60) - 1000, -(1 bsl 60) + 1000),
+    test_integers(Port, 16#feeddeaddeadbeef - 1000, 16#feeddeaddeadbeef + 1000),
+    test_integers(Port, -16#feeddeaddeadbeef - 1000, -16#feeddeaddeadbeef + 1000),
+    test_integers(Port, (1 bsl 64) - 1000, (1 bsl 64) + 1000),
+    test_integers(Port, -(1 bsl 64) - 1000, -(1 bsl 64) + 1000),
+    test_integers(Port, (1 bsl 8192) - 1000, (1 bsl 8192) + 1000),
+    test_integers(Port, -(1 bsl 8192) - 1000, -(1 bsl 8192) + 1000),
+
+    "done" = send_term_get_printed(Port, done),
+
+    runner:recv_eot(Port),
+
+    ok.
+
+test_integer(Port, Int, Print) when is_integer(Int) ->
+    Res = send_term_get_printed(Port, Int),
+    Exp = try
+              _ = list_to_integer(Res),
+              integer_to_list(Int)
+          catch
+              _:_ ->
+                  bignum_string(Int)
+          end,
+    case Print of
+        true ->
+            io:format("Res: ~s~n", [Res]);
+        false ->
+            ok
+    end,
+    case Exp =:= Res of
+        true ->
+            ok;
+        false ->
+            io:format("Exp: ~s~nRes: ~s~n", [Exp, Res]),
+            ct:fail({Exp, Res})
+    end.
+
+bignum_string(Int) ->
+    {AbsInt, Sign} = case Int < 0 of
+                         true -> {-1*Int, "-"};
+                         false -> {Int, ""}
+                     end,
+    Digits = bignum_digits(AbsInt, []),
+    NoDigits = length(Digits),
+    lists:flatten([Sign, "#integer(",
+                   integer_to_list(NoDigits),
+                   ") = {",
+                   lists:foldl(fun (Digit, []) ->
+                                       [integer_to_list(Digit), $}];
+                                   (Digit, Acc) ->
+                                       [integer_to_list(Digit), $, | Acc]
+                               end,
+                               [],
+                               Digits)]).
+
+bignum_digits(0, Acc) ->
+    Acc;
+bignum_digits(Int, Acc) ->
+    bignum_digits(Int bsr 16, [Int band 16#ffff | Acc]).
+    
+test_integers(Port, FromInt, ToInt) ->
+    test_integers(Port, FromInt, ToInt, true).
+
+test_integers(Port, FromInt, ToInt, _Print) when FromInt > ToInt ->
+    ok;
+test_integers(Port, FromInt, ToInt, Print) ->
+    ok = test_integer(Port, FromInt, Print),
+    NewFromInt = FromInt + 1,
+    test_integers(Port, NewFromInt, ToInt, NewFromInt == ToInt).
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
index 4b23701e82..b840c4aca0 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
+++ b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
@@ -184,4 +184,69 @@ TESTCASE(strings)
     report(1);
 }
 
+TESTCASE(integers)
+{
+    char *buf;
+    long len;
+    int err, n, index, done;
+    ei_x_buff x;
 
+    ei_init();
+
+    done = 0;
+    do {
+        int type, type_len;
+        buf = read_packet(NULL);
+
+        index = 0;
+        err = ei_decode_version(buf, &index, NULL);
+        if (err != 0)
+            fail1("ei_decode_version returned %d", err);
+        err = ei_get_type(buf, &index, &type, &type_len);
+        if (err)
+            fail1("ei_get_type() returned %d", err);
+        switch (type) {
+        case ERL_SMALL_INTEGER_EXT:
+        case ERL_INTEGER_EXT: {
+            long val;
+            err = ei_decode_long(buf, &index, &val);
+            if (err)
+                fail1("ei_decode_long() returned %d", err);
+            break;
+        }
+        case ERL_SMALL_BIG_EXT:
+        case ERL_LARGE_BIG_EXT: {
+            erlang_big *big = ei_alloc_big(type_len);
+            if (!big)
+                fail1("ei_alloc_big() failed %d", ENOMEM);
+            err = ei_decode_big(buf, &index, big);
+            if (err)
+                fail1("ei_decode_big() failed %d", err);
+            ei_free_big(big);
+            break;
+        }
+        case ERL_ATOM_EXT: {
+            char abuf[MAXATOMLEN];
+            err = ei_decode_atom(buf, &index, &abuf[0]);
+            if (err)
+                fail1("ei_decode_atom() failed %d", err);
+            if (strcmp("done", &abuf[0]) == 0)
+                done = 1;
+            break;
+        }
+        default:
+            fail1("Unexpected type %d", type);
+            break;
+        }
+
+        ei_x_new(&x);
+        ei_x_append_buf(&x, buf, index);
+        send_printed_buf(&x);
+        ei_x_free(&x);
+
+        free_packet(buf);
+
+    } while (!done);
+    
+    report(1);
+}
-- 
2.26.2

Places

File 1081-Fix-printing-of-bignums.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Places