zstr: add new parameter, n: the known limit out the length of the output

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 71 insertions, 71 deletions

diff --git a/test-generate.py b/test-generate.py
index 24c5b8a..f384000 100755
--- a/test-generate.py
+++ b/test-generate.py
@@ -56,7 +56,7 @@ def zabs():
     print('zabs(b, a);')
     print('zabs(a, a);')
     print('assert(zcmp(a, b), == 0);')
-    print('assert_s(zstr(a, buf), "%i");' % abs(a))
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % abs(a))
 
 def zadd():
     bits = random.randint(0, LIMIT)
@@ -70,9 +70,9 @@ def zadd():
     print('zset(d, b);')
     print('zadd(d, a, d);')
     print('zadd(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
 
 def zadd_unsigned():
     bits = random.randint(0, LIMIT)
@@ -86,13 +86,13 @@ def zadd_unsigned():
     print('zset(d, b);')
     print('zadd_unsigned(d, a, d);')
     print('zadd_unsigned(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
     c = abs(b) * 2
     print('zadd_unsigned(c, b, b);')
     print('zadd_unsigned(b, b, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
     print('assert(zcmp(b, c), == 0);')
 
 def zand():
@@ -109,14 +109,14 @@ def zand():
     print('zset(d, b);')
     print('zand(d, a, d);')
     print('zand(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
     print('zsets(a, "%i");' % a)
     print('zand(d, a, a);')
     print('zand(a, a, a);')
-    print('assert_s(zstr(d, buf), "%i");' % a)
-    print('assert_s(zstr(a, buf), "%i");' % a)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % a)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % a)
 
 def zbits():
     bits = random.randint(0, LIMIT)
@@ -142,20 +142,20 @@ def zbset():
     print('zsets(a, "%i");' % a)
     print('zset(d, a);')
     print('zbset(b, a, %i, 1);' % b)
-    print('assert_s(zstr(b, buf), "%i");' % cs)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % cs)
     print('zbset(b, a, %i, 0);' % b)
-    print('assert_s(zstr(b, buf), "%i");' % cc)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % cc)
     print('zbset(b, a, %i, -1);' % b)
-    print('assert_s(zstr(b, buf), "%i");' % cf)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % cf)
     print('zset(a, d);')
     print('zbset(a, a, %i, 1);' % b)
-    print('assert_s(zstr(a, buf), "%i");' % cs)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % cs)
     print('zset(a, d);')
     print('zbset(a, a, %i, 0);' % b)
-    print('assert_s(zstr(a, buf), "%i");' % cc)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % cc)
     print('zset(a, d);')
     print('zbset(a, a, %i, -1);' % b)
-    print('assert_s(zstr(a, buf), "%i");' % cf)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % cf)
 
 def zbtest():
     bits = random.randint(0, LIMIT)
@@ -211,7 +211,7 @@ def zlsh():
     print('zlsh(b, a, %i);' % bits)
     print('zlsh(a, a, %i);' % bits)
     print('assert(zcmp(a, b), == 0);')
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
 
 def zneg():
     bits = random.randint(0, LIMIT)
@@ -220,7 +220,7 @@ def zneg():
     print('zneg(b, a);')
     print('zneg(a, a);')
     print('assert(zcmp(a, b), == 0);')
-    print('assert_s(zstr(a, buf), "%i");' % -a)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % -a)
 
 def zor():
     bits = random.randint(0, LIMIT)
@@ -236,14 +236,14 @@ def zor():
     print('zset(d, b);')
     print('zor(d, a, d);')
     print('zor(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
     print('zsets(a, "%i");' % a)
     print('zor(d, a, a);')
     print('zor(a, a, a);')
-    print('assert_s(zstr(d, buf), "%i");' % a)
-    print('assert_s(zstr(a, buf), "%i");' % a)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % a)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % a)
 
 def zrsh():
     bits = random.randint(0, LIMIT)
@@ -254,7 +254,7 @@ def zrsh():
     print('zrsh(b, a, %i);' % bits)
     print('zrsh(a, a, %i);' % bits)
     print('assert(zcmp(a, b), == 0);')
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
 
 def zsplit():
     bits = random.randint(0, LIMIT)
@@ -266,11 +266,11 @@ def zsplit():
     print('zsets(a, "%i");' % a)
     print('zset(b, a);')
     print('zsplit(b, d, b, %i);' % bits)
-    print('assert_s(zstr(b, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('zsplit(c, d, a, %i);' % bits)
     print('assert(zcmp(b, c), == 0);')
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('zsplit(c, a, a, %i);' % bits)
     print('assert(zcmp(a, d), == 0);')
     print('assert(zcmp(b, c), == 0);')
@@ -279,7 +279,7 @@ def zstr():
     bits = random.randint(0, LIMIT)
     a = random.randint(-(1 << bits), 1 << bits)
     print('zsets(a, "%i");' % a)
-    print('assert_s(zstr(a, buf), "%i");' % a)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % a)
 
 def zstr_length():
     bits = random.randint(0, LIMIT)
@@ -299,9 +299,9 @@ def zsub():
     print('zset(d, b);')
     print('zsub(d, a, d);')
     print('zsub(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
 
 def zsub_unsigned():
     bits = random.randint(0, LIMIT)
@@ -315,9 +315,9 @@ def zsub_unsigned():
     print('zset(d, b);')
     print('zsub_unsigned(d, a, d);')
     print('zsub_unsigned(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
     print('zsub_unsigned(a, b, b);')
     print('assert(zzero(a), == 1);')
     print('zsub_unsigned(b, b, b);')
@@ -332,7 +332,7 @@ def ztrunc():
     print('ztrunc(b, a, %i);' % bits)
     print('ztrunc(a, a, %i);' % bits)
     print('assert(zcmp(a, b), == 0);')
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
 
 def zxor():
     bits = random.randint(0, LIMIT)
@@ -348,9 +348,9 @@ def zxor():
     print('zset(d, b);')
     print('zxor(d, a, d);')
     print('zxor(a, a, b);')
-    print('assert_s(zstr(c, buf), "%i");' % c)
-    print('assert_s(zstr(d, buf), "%i");' % c)
-    print('assert_s(zstr(a, buf), "%i");' % c)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % c)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
     print('zsets(a, "%i");' % a)
     print('zxor(d, a, a);')
     print('zxor(a, a, a);')
@@ -455,8 +455,8 @@ def zdivmod():
         print('zsets(a, "%i");' % a)
         print('zsets(b, "%i");' % b)
         print('zdivmod(c, d, a, b);')
-        print('assert_s(zstr(c, buf), "%i");' % c)
-        print('assert_s(zstr(d, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
         print('zdivmod(a, b, a, b);')
         print('assert(zcmp(a, c), == 0);')
         print('assert(zcmp(b, d), == 0);')
@@ -476,20 +476,20 @@ def zdivmod():
         print('zsets(a, "%i");' % a)
         print('zsets(b, "%i");' % b)
         print('zdivmod(a, d, a, b);')
-        print('assert_s(zstr(a, buf), "%i");' % c)
-        print('assert_s(zstr(d, buf), "%i");' % d)
+        print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
         print('zsets(a, "%i");' % a)
         print('zdivmod(c, b, a, b);')
-        print('assert_s(zstr(c, buf), "%i");' % c)
-        print('assert_s(zstr(b, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
         a = bp * a_sign
         b = bp * b_sign
         (c, d) = (div(a, b), mod(a, b))
         print('zsets(a, "%i");' % a)
         print('zsets(b, "%i");' % b)
         print('zdivmod(c, d, a, b);')
-        print('assert_s(zstr(c, buf), "%i");' % c)
-        print('assert_s(zstr(d, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
         print('zdivmod(a, b, a, b);')
         print('assert(zcmp(a, c), == 0);')
         print('assert(zcmp(b, d), == 0);')
@@ -509,12 +509,12 @@ def zdivmod():
         print('zsets(a, "%i");' % a)
         print('zsets(b, "%i");' % b)
         print('zdivmod(a, d, a, b);')
-        print('assert_s(zstr(a, buf), "%i");' % c)
-        print('assert_s(zstr(d, buf), "%i");' % d)
+        print('assert_s(zstr(a, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
         print('zsets(a, "%i");' % a)
         print('zdivmod(c, b, a, b);')
-        print('assert_s(zstr(c, buf), "%i");' % c)
-        print('assert_s(zstr(b, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % c)
+        print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
 
 def zmul():
     bits = random.randint(0, LIMIT)
@@ -566,53 +566,53 @@ def zmodmul():
     print('zsets(b, "%i");' % b)
     print('zsets(c, "%i");' % c)
     print('zmodmul(d, a, b, c);')
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('zmodmul(a, a, b, c);')
-    print('assert_s(zstr(a, buf), "%i");' % d)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % d)
     print('zsets(a, "%i");' % a)
     print('zmodmul(b, a, b, c);')
-    print('assert_s(zstr(b, buf), "%i");' % d)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
     print('zsets(b, "%i");' % b)
     print('zmodmul(c, a, b, c);')
-    print('assert_s(zstr(c, buf), "%i");' % d)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % d)
     print('zsets(c, "%i");' % c)
     print('zmodmul(d, b, a, c);')
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('zmodmul(a, b, a, c);')
-    print('assert_s(zstr(a, buf), "%i");' % d)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % d)
     print('zsets(a, "%i");' % a)
     print('zmodmul(b, b, a, c);')
-    print('assert_s(zstr(b, buf), "%i");' % d)
+    print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
     print('zsets(b, "%i");' % b)
     print('zmodmul(c, b, a, c);')
-    print('assert_s(zstr(c, buf), "%i");' % d)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % d)
     print('zsets(c, "%i");' % c)
     d = mod(a * a, c)
     print('zmodmul(d, a, a, c);')
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('zmodmul(a, a, a, c);')
-    print('assert_s(zstr(a, buf), "%i");' % d)
+    print('assert_s(zstr(a, buf, BUF_N), "%i");' % d)
     print('zsets(a, "%i");' % a)
     print('zmodmul(c, a, a, c);')
-    print('assert_s(zstr(c, buf), "%i");' % d)
+    print('assert_s(zstr(c, buf, BUF_N), "%i");' % d)
     if a != 0:
         d = mod(a * b, a)
         print('zsets(d, "%i");' % d)
         print('zmodmul(c, a, b, a);')
-        print('assert_s(zstr(c, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % d)
         print('zmodmul(a, a, b, a);')
-        print('assert_s(zstr(a, buf), "%i");' % d)
+        print('assert_s(zstr(a, buf, BUF_N), "%i");' % d)
         print('zsets(a, "%i");' % a)
         print('zmodmul(b, a, b, a);')
-        print('assert_s(zstr(b, buf), "%i");' % d)
+        print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
         print('zsets(b, "%i");' % b)
         print('zmodmul(c, b, a, a);')
-        print('assert_s(zstr(c, buf), "%i");' % d)
+        print('assert_s(zstr(c, buf, BUF_N), "%i");' % d)
         print('zmodmul(a, b, a, a);')
-        print('assert_s(zstr(a, buf), "%i");' % d)
+        print('assert_s(zstr(a, buf, BUF_N), "%i");' % d)
         print('zsets(a, "%i");' % a)
         print('zmodmul(b, b, a, a);')
-        print('assert_s(zstr(b, buf), "%i");' % d)
+        print('assert_s(zstr(b, buf, BUF_N), "%i");' % d)
         print('zmodmul(b, a, a, a);')
         print('assert(zzero(b), == 1);')
         print('zmodmul(a, a, a, a);')
@@ -739,7 +739,7 @@ def zmodpow():
     print('zsets(d, "%i");' % d)
     print('zmodpow(d, a, b, c);')
     print('zmodpow(a, a, b, c);')
-    print('assert_s(zstr(d, buf), "%i");' % d)
+    print('assert_s(zstr(d, buf, BUF_N), "%i");' % d)
     print('assert(zcmp(a, d), == 0);')
     print('zsets(a, "%i");' % a)
     print('zmodpow(b, a, b, c);')