Changeset 4adbe45

Timestamp:

May 22, 2017, 8:45:05 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

18c55e1

Parents:

0ed8759

Message:

fix bug in converting string to number and update test

Location:

src

Files:

• libcfa/gmp (modified) (2 diffs)
• tests/.expect/64/gmp.txt (modified) (2 diffs)
• tests/gmp.c (modified) (3 diffs)

src/libcfa/gmp

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 23:47:36 2017
-// Update Count     : 9
+// Last Modified On : Mon May 22 08:32:39 2017
+// Update Count     : 13
 // 
 
@@ -35 +35 @@
 Int ?=?( Int * lhs, long int rhs ) { mpz_set_si( lhs->mpz, rhs ); return *lhs; }
 Int ?=?( Int * lhs, unsigned long int rhs ) { mpz_set_ui( lhs->mpz, rhs ); return *lhs; }
-//Int ?=?( Int * lhs, const char * rhs ) { if ( mpq_set_str( lhs->mpz, rhs, 0 ) ) abort(); return *lhs; }
+Int ?=?( Int * lhs, const char * rhs ) { if ( mpz_set_str( lhs->mpz, rhs, 0 ) ) { printf( "invalid string conversion\n" ); abort(); } return *lhs; }
 
 char ?=?( char * lhs, Int rhs ) { char val = mpz_get_si( rhs.mpz ); *lhs = val; return val; }

src/tests/.expect/64/gmp.txt

@@ -4 +4 @@
 conversions
 y:97
+y:12345678901234567890123456789
 y:3
 y:-3
@@ -24 +25 @@
 z:150000000000000000000
 z:16666666666666666666
+16666666666666666666, 2 16666666666666666666, 2
 x:16666666666666666666 y:2
 

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 14:46:50 2017
-// Update Count     : 530
+// Last Modified On : Mon May 22 08:37:26 2017
+// Update Count     : 533
 // 
 
@@ -25 +25 @@
         sout | "conversions" | endl;
         y = 'a';
+        sout | "y:" | y | endl;
+        y = "12345678901234567890123456789";
         sout | "y:" | y | endl;
         y = si;
@@ -62 +64 @@
         z = x / 3;
         sout | "z:" | z | endl;
+        sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
         [ x, y ] = div( x, 3 );
         sout | "x:" | x | "y:" | y | endl;
-//      sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
 
         sout | endl;