Skip to content

Commit ccd9c86

Browse files
author
Ben Lerner
committed
remove stray NumberErrbacks, and fix calls to gcd to no longer pass an array of values as second argument
1 parent 90252f2 commit ccd9c86

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/js/base/js-numbers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ define("pyret-base/js/js-numbers", function() {
10071007
} else if (isRational(x) && isRational(y)) {
10081008
var xn = numerator(x); var xd = denominator(x);
10091009
var yn = numerator(y); var yd = denominator(y);
1010-
var new_d = lcm(xd, [yd]);
1010+
var new_d = lcm(xd, yd);
10111011
var new_xn = multiply(xn, divide(new_d, xd));
10121012
var new_yn = multiply(yn, divide(new_d, yd));
10131013
return divide(remainder(new_xn, new_yn), new_d);

src/js/base/runtime.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5229,14 +5229,14 @@ function (Namespace, jsnumslib, codePoint, util, exnStackParser, loader, seedran
52295229
if (arguments.length !== 2) { var $a=new Array(arguments.length); for (var $i=0;$i<arguments.length;$i++) { $a[$i]=arguments[$i]; } throw thisRuntime.ffi.throwArityErrorC(["num-gcd"], 2, $a, false); }
52305230
thisRuntime.checkArgsInternal2("Numbers", "num-gcd",
52315231
n, thisRuntime.Number, m, thisRuntime.Number);
5232-
return thisRuntime.makeNumberBig(jsnums.gcd(n, m, NumberErrbacks));
5232+
return thisRuntime.makeNumberBig(jsnums.gcd(n, m));
52335233
}
52345234

52355235
var num_lcm = function(n, m) {
52365236
if (arguments.length !== 2) { var $a=new Array(arguments.length); for (var $i=0;$i<arguments.length;$i++) { $a[$i]=arguments[$i]; } throw thisRuntime.ffi.throwArityErrorC(["num-lcm"], 2, $a, false); }
52375237
thisRuntime.checkArgsInternal2("Numbers", "num-lcm",
52385238
n, thisRuntime.Number, m, thisRuntime.Number);
5239-
return thisRuntime.makeNumberBig(jsnums.lcm(n, m, NumberErrbacks));
5239+
return thisRuntime.makeNumberBig(jsnums.lcm(n, m));
52405240
}
52415241

52425242
var num_sqrt = function(n) {

src/js/trove/charts-lib.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,22 @@
144144
ret[rawVal] = num;
145145
}
146146
}
147-
if (jsnums.greaterThanOrEqual(ret.xMinValue, ret.xMaxValue, RUNTIME.NumberErrbacks)) {
147+
if (jsnums.greaterThanOrEqual(ret.xMinValue, ret.xMaxValue)) {
148148
raw.xMinValue.addClass('error-bg');
149149
raw.xMaxValue.addClass('error-bg');
150150
raw.xMinValue.removeClass('ok-bg');
151151
raw.xMaxValue.removeClass('ok-bg');
152152
return null;
153153
}
154-
if (jsnums.greaterThanOrEqual(ret.yMinValue, ret.yMaxValue, RUNTIME.NumberErrbacks)) {
154+
if (jsnums.greaterThanOrEqual(ret.yMinValue, ret.yMaxValue)) {
155155
raw.yMinValue.addClass('error-bg');
156156
raw.yMaxValue.addClass('error-bg');
157157
raw.yMinValue.removeClass('ok-bg');
158158
raw.yMaxValue.removeClass('ok-bg');
159159
return null;
160160
}
161161
if (!isTrue(RUNTIME.num_is_integer(ret.numSamples)) ||
162-
jsnums.lessThanOrEqual(ret.numSamples, 1, RUNTIME.NumberErrbacks)) {
162+
jsnums.lessThanOrEqual(ret.numSamples, 1)) {
163163
raw.numSamples.addClass('error-bg');
164164
raw.numSamples.removeClass('ok-bg');
165165
return null;

src/js/trove/image-lib.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@
141141

142142
var isAngle = function(x) {
143143
return jsnums.isReal(x) &&
144-
jsnums.greaterThanOrEqual(x, 0, RUNTIME.NumberErrbacks) &&
145-
jsnums.lessThan(x, 360, RUNTIME.NumberErrbacks);
144+
jsnums.greaterThanOrEqual(x, 0) &&
145+
jsnums.lessThan(x, 360);
146146
};
147147

148148
// Produces true if the value is a color or a color string.
@@ -229,15 +229,15 @@
229229

230230

231231
var isSideCount = function(x) {
232-
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 3, RUNTIME.NumberErrbacks);
232+
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 3);
233233
};
234234

235235
var isStepCount = function(x) {
236-
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 1, RUNTIME.NumberErrbacks);
236+
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 1);
237237
};
238238

239239
var isPointsCount = function(x) {
240-
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 2, RUNTIME.NumberErrbacks);
240+
return jsnums.isInteger(x) && jsnums.greaterThanOrEqual(x, 2);
241241
};
242242

243243
// Produces true if thing is an image-like object.
@@ -1333,7 +1333,7 @@
13331333

13341334
// rotate around outer circle, storing x and y coordinates
13351335
var radians = 0, vertices = [];
1336-
var numComponents = jsnums.gcd(count, [step], RUNTIME.NumberErrbacks);
1336+
var numComponents = jsnums.gcd(count, step);
13371337
var pointsPerComponent = count / numComponents;
13381338
var angle = (2*Math.PI/count);
13391339
for (var curComp = 0; curComp < numComponents; curComp++) {

0 commit comments

Comments
 (0)