Rename handful of BigInteger functions and deprecate get_str

test/deprecated/BigInteger/addSubMul.chpl

@@ -0,0 +1,20 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var a: bigint = 3;
+var b: bigint = 4;
+var res: bigint = 11;
+
+addmul(res, a, b);
+writeln(res);
+addmul(res, a, 7:int);
+writeln(res);
+addmul(res, a, 8:uint);
+writeln(res);
+
+submul(res, a, b);
+writeln(res);
+submul(res, a, 7:int);
+writeln(res);
+submul(res, a, 8:uint);
+writeln(res);

test/deprecated/BigInteger/addSubMul.good

@@ -0,0 +1,12 @@
+addSubMul.chpl:8: warning: addmul is deprecated - please use addMul instead
+addSubMul.chpl:10: warning: addmul is deprecated - please use addMul instead
+addSubMul.chpl:12: warning: addmul is deprecated - please use addMul instead
+addSubMul.chpl:15: warning: submul is deprecated - please use subMul instead
+addSubMul.chpl:17: warning: submul is deprecated - please use subMul instead
+addSubMul.chpl:19: warning: submul is deprecated - please use subMul instead
+23
+44
+68
+56
+35
+11

test/deprecated/BigInteger/deprecateGet_str.chpl

@@ -0,0 +1,6 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var x: bigint = 1;
+var s = x.get_str();
+writeln(s);

test/deprecated/BigInteger/deprecateGet_str.good

@@ -0,0 +1,2 @@
+deprecateGet_str.chpl:5: warning: get_str is deprecated - please use a cast to a string or IO methods to get the string representation
+1

test/deprecated/BigInteger/deprecateOverwritingMethods.good

@@ -8,9 +8,9 @@ deprecateOverwritingMethods.chpl:n: warning: bigint.pow method is deprecated - p
 deprecateOverwritingMethods.chpl:n: warning: bigint.pow method is deprecated - please use the standalone function pow
 deprecateOverwritingMethods.chpl:n: warning: bigint.pow method is deprecated - please use the standalone function pow
 deprecateOverwritingMethods.chpl:n: warning: bigint.root method is deprecated - please use the standalone function root
-deprecateOverwritingMethods.chpl:n: warning: bigint.rootrem method is deprecated - please use the standalone function rootrem
+deprecateOverwritingMethods.chpl:n: warning: bigint.rootrem method is deprecated - please use the standalone function rootRem instead
 deprecateOverwritingMethods.chpl:n: warning: bigint.sqrt method is deprecated - please use the standalone function sqrt
-deprecateOverwritingMethods.chpl:n: warning: bigint.sqrtrem method is deprecated - please use the standalone function sqrtrem
+deprecateOverwritingMethods.chpl:n: warning: bigint.sqrtrem method is deprecated - please use the standalone function sqrtRem instead
 deprecateOverwritingMethods.chpl:n: warning: bigint.nextprime method is deprecated - please use the standalone function nextPrime
 deprecateOverwritingMethods.chpl:n: warning: bigint.gcd method is deprecated - please use the standalone function gcd
 deprecateOverwritingMethods.chpl:n: warning: bigint.gcd method is deprecated - please use the standalone function gcd
@@ -39,12 +39,12 @@ deprecateOverwritingMethods.chpl:n: warning: bigint.sub method is deprecated - p
 deprecateOverwritingMethods.chpl:n: warning: bigint.mul method is deprecated - please use the standalone function mul
 deprecateOverwritingMethods.chpl:n: warning: bigint.mul method is deprecated - please use the standalone function mul
 deprecateOverwritingMethods.chpl:n: warning: bigint.mul method is deprecated - please use the standalone function mul
-deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addmul
-deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addmul
-deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addmul
-deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function submul
-deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function submul
-deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function submul
+deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addMul instead
+deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addMul instead
+deprecateOverwritingMethods.chpl:n: warning: bigint.addmul method is deprecated - please use the standalone function addMul instead
+deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function subMul instead
+deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function subMul instead
+deprecateOverwritingMethods.chpl:n: warning: bigint.submul method is deprecated - please use the standalone function subMul instead
 deprecateOverwritingMethods.chpl:n: warning: bigint.mul_2exp method is deprecated - please use the standalone function mul2Exp
 deprecateOverwritingMethods.chpl:n: warning: bigint.neg method is deprecated - please use the standalone function neg
 deprecateOverwritingMethods.chpl:n: warning: bigint.abs method is deprecated - please use the standalone function abs
@@ -59,7 +59,7 @@ deprecateOverwritingMethods.chpl:n: warning: bigint.divR2Exp method is deprecate
 deprecateOverwritingMethods.chpl:n: warning: bigint.mod method is deprecated - please use the standalone function mod
 deprecateOverwritingMethods.chpl:n: warning: bigint.mod method is deprecated - please use the standalone function mod
 deprecateOverwritingMethods.chpl:n: warning: bigint.and method is deprecated - please use the standalone function and
-deprecateOverwritingMethods.chpl:n: warning: bigint.ior method is deprecated - please use the standalone function ior
+deprecateOverwritingMethods.chpl:n: warning: bigint.ior method is deprecated - please use the standalone function or instead
 deprecateOverwritingMethods.chpl:n: warning: bigint.xor method is deprecated - please use the standalone function xor
 deprecateOverwritingMethods.chpl:n: warning: bigint.com method is deprecated - please use the standalone function com
 

test/deprecated/BigInteger/ior.chpl

@@ -0,0 +1,9 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var a: bigint = 0xF0;
+var b: bigint = 0x0F;
+var res: bigint;
+
+ior(res, a, b);
+writeln(res);

test/deprecated/BigInteger/ior.good

@@ -0,0 +1,2 @@
+ior.chpl:8: warning: ior is deprecated - please use or instead
+255

test/deprecated/BigInteger/popcount.chpl

@@ -0,0 +1,8 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var a: bigint = 0b010101010101;
+var n: uint;
+
+n = a.popcount();
+writeln(n);

test/deprecated/BigInteger/popcount.good

@@ -0,0 +1,2 @@
+popcount.chpl:7: warning: popcount is deprecated - please use bigint.popCount instead
+6

test/deprecated/BigInteger/rootSqrtRem.chpl

@@ -0,0 +1,11 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var a: bigint = 27;
+var res, rem: bigint;
+
+rootrem(res, rem, a, 3);
+writeln((res, rem));
+
+sqrtrem(res, rem, a);
+writeln((res, rem));

test/deprecated/BigInteger/rootSqrtRem.good

@@ -0,0 +1,4 @@
+rootSqrtRem.chpl:7: warning: rootrem is deprecated - please use rootRem instead
+rootSqrtRem.chpl:10: warning: sqrtrem is deprecated - please use sqrtRem instead
+(3, 0)
+(5, 2)

test/deprecated/BigInteger/scan01.chpl

@@ -0,0 +1,11 @@
+// deprecated in 1.32 by Jade
+use BigInteger;
+
+var a: bigint = 0b010101010101;
+var idx: uint;
+
+idx = a.scan0(2);
+writeln(idx);
+
+idx = a.scan1(3);
+writeln(idx);

test/deprecated/BigInteger/scan01.good

@@ -0,0 +1,4 @@
+scan01.chpl:7: warning: scan0 is deprecated - please use bigint.findNext0 instead
+scan01.chpl:10: warning: scan1 is deprecated - please use bigint.findNext1 instead
+3
+4

test/library/standard/BigInteger/getStr.chpl

@@ -0,0 +1,14 @@
+use BigInteger;
+use IO.FormattedIO;
+
+config const executeLocale = 0;
+
+var a: bigint = 17;
+
+on Locales[min(Locales.domain.high, executeLocale)] {
+  var s = a:string; // test cast in multilocal and local
+  writeln(s);
+  writeln(a); // test writeThis in multilocal and local
+  writef("%?\n", a); // check formatted strings
+  writeln("%?".format(a)); // check formatted strings
+}

test/library/standard/BigInteger/getStr.execopts

@@ -0,0 +1,2 @@
+-sexecuteLocale=0
+-sexecuteLocale=1

test/library/standard/BigInteger/getStr.good

@@ -0,0 +1,4 @@
+17
+17
+17
+17

test/library/standard/BigInteger/resultAsArgument.chpl

@@ -70,17 +70,17 @@ use BigInteger;
   writeln(a);
 }
 {
-  write("rootrem ");
+  write("rootRem ");
   var a = new bigint(5);
   var b: bigint;
-  rootrem(a, b, a, 2:uint);
+  rootRem(a, b, a, 2:uint);
   writeln(a, " ", b);
 }
 {
-  write("rootrem ");
+  write("rootRem ");
   var a = new bigint(5);
   var b: bigint;
-  rootrem(b, a, a, 2:uint);
+  rootRem(b, a, a, 2:uint);
   writeln(b, " ", a);
 }
 {
@@ -90,17 +90,17 @@ use BigInteger;
   writeln(a);
 }
 {
-  write("sqrtrem ");
+  write("sqrtRem ");
   var a = new bigint(10);
   var b: bigint;
-  sqrtrem(a, b, a);
+  sqrtRem(a, b, a);
   writeln(a, " ", b);
 }
 {
-  write("sqrtrem ");
+  write("sqrtRem ");
   var a = new bigint(10);
   var b: bigint;
-  sqrtrem(b, a, a);
+  sqrtRem(b, a, a);
   writeln(b, " ", a);
 }
 {
@@ -294,43 +294,43 @@ use BigInteger;
   writeln(a);
 }
 {
-  write("addmul ");
+  write("addMul ");
   var a = new bigint(5);
   var b = new bigint(6);
-  addmul(a, a, b);
+  addMul(a, a, b);
   writeln(a);
 }
 {
-  write("addmul ");
+  write("addMul ");
   var a = new bigint(5);
   var b = new bigint(6);
-  addmul(b, a, b);
+  addMul(b, a, b);
   writeln(b);
 }
 {
-  write("addmul ");
+  write("addMul ");
   var a = new bigint(5);
-  addmul(a, a, 6:uint);
+  addMul(a, a, 6:uint);
   writeln(a);
 }
 {
-  write("submul ");
+  write("subMul ");
   var a = new bigint(5);
   var b = new bigint(6);
-  submul(a, a, b);
+  subMul(a, a, b);
   writeln(a);
 }
 {
-  write("submul ");
+  write("subMul ");
   var a = new bigint(5);
   var b = new bigint(6);
-  submul(b, a, b);
+  subMul(b, a, b);
   writeln(b);
 }
 {
-  write("submul ");
+  write("subMul ");
   var a = new bigint(5);
-  submul(a, a, 6:uint);
+  subMul(a, a, 6:uint);
   writeln(a);
 }
 {
@@ -441,25 +441,25 @@ use BigInteger;
   writeln(b);
 }
 {
-  write("ior ");
+  write("or ");
   var a = new bigint(5);
   var b = new bigint(6);
-  ior(a, a, b);
+  or(a, a, b);
   writeln(a);
 }
 {
-  write("ior ");
+  write("or ");
   var a = new bigint(5);
   var b = new bigint(6);
-  ior(b, a, b);
+  or(b, a, b);
   writeln(b);
 }
 {
   // test the swap behavior where op2 has more limbs than op1
-  write("ior ");
+  write("or ");
   var a = new bigint(10);
   var b = new bigint("1267650600228229401496703205376"); // 2**100
-  ior(a, a, b);
+  or(a, a, b);
   writeln(a);
 }
 {

test/library/standard/BigInteger/resultAsArgument.good

@@ -8,11 +8,11 @@ powMod 1
 pow 0
 pow 16
 root 2
-rootrem 2 1
-rootrem 2 1
+rootRem 2 1
+rootRem 2 1
 sqrt 3
-sqrtrem 3 1
-sqrtrem 3 1
+sqrtRem 3 1
+sqrtRem 3 1
 nextPrime 17
 gcd 4
 gcd 4
@@ -41,12 +41,12 @@ mul 30
 mul 30
 mul 30
 mul 30
-addmul 35
-addmul 36
-addmul 35
-submul -25
-submul -24
-submul -25
+addMul 35
+addMul 36
+addMul 35
+subMul -25
+subMul -24
+subMul -25
 mul2Exp 20
 neg -5
 abs 5
@@ -63,9 +63,9 @@ mod 1
 mod 1
 and 4
 and 4
-ior 7
-ior 7
-ior 1267650600228229401496703205386
+or 7
+or 7
+or 1267650600228229401496703205386
 xor 3
 xor 3
 com -6

test/library/standard/GMP/ldelaney/gmp_Bigint_arithmetic.chpl

@@ -20,13 +20,13 @@ writeln(c);
 writeln(a);
 
 // a = a + (b * c)
-addmul(a, b, c);                      // a =   248
-addmul(a, b, 10);                     // a =   268
+addMul(a, b, c);                      // a =   248
+addMul(a, b, 10);                     // a =   268
 writeln(a);
 
 // a = a - (b * c)
-submul(a, b, c);                      // a =   668
-submul(a, b, 4);                      // a =   660
+subMul(a, b, c);                      // a =   668
+subMul(a, b, 4);                      // a =   660
 writeln(a);
 
 mul2Exp(a, c, 3);                    // a = -1600

test/library/standard/GMP/ldelaney/gmp_Bigint_assignment.chpl

@@ -39,6 +39,6 @@ if isReal(z) then writeln("real ", z);
 
 a.set(101);
 
-var str = a.get_str();
+var str = a:string;
 
 if isString(str) then writeln("string ", str);