pyret-npm 0.0.67 → 0.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -39248,31 +39248,7 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
39248
39248
|
|
|
39249
39249
|
// fromFixnum: fixnum -> pyretnum
|
|
39250
39250
|
var fromFixnum = function(x, errbacks) {
|
|
39251
|
-
|
|
39252
|
-
return Roughnum.makeInstance(x, errbacks);
|
|
39253
|
-
}
|
|
39254
|
-
var nf = Math.floor(x);
|
|
39255
|
-
if (nf === x) {
|
|
39256
|
-
if (isOverflow(nf)) {
|
|
39257
|
-
return makeBignum(expandExponent(x+''));
|
|
39258
|
-
} else {
|
|
39259
|
-
return nf;
|
|
39260
|
-
}
|
|
39261
|
-
} else {
|
|
39262
|
-
// used to return float, now rational
|
|
39263
|
-
var stringRep = x.toString();
|
|
39264
|
-
var match = stringRep.match(/^(.*)\.(.*)$/);
|
|
39265
|
-
if (match) {
|
|
39266
|
-
var afterDecimal = parseInt(match[2]);
|
|
39267
|
-
var factorToInt = Math.pow(10, match[2].length);
|
|
39268
|
-
var extraFactor = _integerGcd(factorToInt, afterDecimal);
|
|
39269
|
-
var multFactor = factorToInt / extraFactor;
|
|
39270
|
-
return Rational.makeInstance(Math.round(x*multFactor), Math.round(factorToInt/extraFactor), errbacks);
|
|
39271
|
-
} else {
|
|
39272
|
-
return Rational.makeInstance(x, 1, errbacks);
|
|
39273
|
-
}
|
|
39274
|
-
|
|
39275
|
-
}
|
|
39251
|
+
return fromString(String(x), errbacks);
|
|
39276
39252
|
};
|
|
39277
39253
|
|
|
39278
39254
|
var expandExponent = function(s) {
|
|
@@ -41151,7 +41127,6 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
41151
41127
|
|
|
41152
41128
|
var roughnumRatRegexp = new RegExp("^~([+-]?\\d+)/(\\d+)$");
|
|
41153
41129
|
|
|
41154
|
-
|
|
41155
41130
|
var scientificPattern = new RegExp("^([+-]?\\d*\\.?\\d*)[Ee]([+]?\\d+)$");
|
|
41156
41131
|
|
|
41157
41132
|
// fromString: string -> (pyretnum | false)
|
|
@@ -160,31 +160,7 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
160
160
|
|
|
161
161
|
// fromFixnum: fixnum -> pyretnum
|
|
162
162
|
var fromFixnum = function(x, errbacks) {
|
|
163
|
-
|
|
164
|
-
return Roughnum.makeInstance(x, errbacks);
|
|
165
|
-
}
|
|
166
|
-
var nf = Math.floor(x);
|
|
167
|
-
if (nf === x) {
|
|
168
|
-
if (isOverflow(nf)) {
|
|
169
|
-
return makeBignum(expandExponent(x+''));
|
|
170
|
-
} else {
|
|
171
|
-
return nf;
|
|
172
|
-
}
|
|
173
|
-
} else {
|
|
174
|
-
// used to return float, now rational
|
|
175
|
-
var stringRep = x.toString();
|
|
176
|
-
var match = stringRep.match(/^(.*)\.(.*)$/);
|
|
177
|
-
if (match) {
|
|
178
|
-
var afterDecimal = parseInt(match[2]);
|
|
179
|
-
var factorToInt = Math.pow(10, match[2].length);
|
|
180
|
-
var extraFactor = _integerGcd(factorToInt, afterDecimal);
|
|
181
|
-
var multFactor = factorToInt / extraFactor;
|
|
182
|
-
return Rational.makeInstance(Math.round(x*multFactor), Math.round(factorToInt/extraFactor), errbacks);
|
|
183
|
-
} else {
|
|
184
|
-
return Rational.makeInstance(x, 1, errbacks);
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
}
|
|
163
|
+
return fromString(String(x), errbacks);
|
|
188
164
|
};
|
|
189
165
|
|
|
190
166
|
var expandExponent = function(s) {
|
|
@@ -2063,7 +2039,6 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
2063
2039
|
|
|
2064
2040
|
var roughnumRatRegexp = new RegExp("^~([+-]?\\d+)/(\\d+)$");
|
|
2065
2041
|
|
|
2066
|
-
|
|
2067
2042
|
var scientificPattern = new RegExp("^([+-]?\\d*\\.?\\d*)[Ee]([+]?\\d+)$");
|
|
2068
2043
|
|
|
2069
2044
|
// fromString: string -> (pyretnum | false)
|
|
@@ -39214,31 +39214,7 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
39214
39214
|
|
|
39215
39215
|
// fromFixnum: fixnum -> pyretnum
|
|
39216
39216
|
var fromFixnum = function(x, errbacks) {
|
|
39217
|
-
|
|
39218
|
-
return Roughnum.makeInstance(x, errbacks);
|
|
39219
|
-
}
|
|
39220
|
-
var nf = Math.floor(x);
|
|
39221
|
-
if (nf === x) {
|
|
39222
|
-
if (isOverflow(nf)) {
|
|
39223
|
-
return makeBignum(expandExponent(x+''));
|
|
39224
|
-
} else {
|
|
39225
|
-
return nf;
|
|
39226
|
-
}
|
|
39227
|
-
} else {
|
|
39228
|
-
// used to return float, now rational
|
|
39229
|
-
var stringRep = x.toString();
|
|
39230
|
-
var match = stringRep.match(/^(.*)\.(.*)$/);
|
|
39231
|
-
if (match) {
|
|
39232
|
-
var afterDecimal = parseInt(match[2]);
|
|
39233
|
-
var factorToInt = Math.pow(10, match[2].length);
|
|
39234
|
-
var extraFactor = _integerGcd(factorToInt, afterDecimal);
|
|
39235
|
-
var multFactor = factorToInt / extraFactor;
|
|
39236
|
-
return Rational.makeInstance(Math.round(x*multFactor), Math.round(factorToInt/extraFactor), errbacks);
|
|
39237
|
-
} else {
|
|
39238
|
-
return Rational.makeInstance(x, 1, errbacks);
|
|
39239
|
-
}
|
|
39240
|
-
|
|
39241
|
-
}
|
|
39217
|
+
return fromString(String(x), errbacks);
|
|
39242
39218
|
};
|
|
39243
39219
|
|
|
39244
39220
|
var expandExponent = function(s) {
|
|
@@ -41117,7 +41093,6 @@ define("pyret-base/js/js-numbers", function() {
|
|
|
41117
41093
|
|
|
41118
41094
|
var roughnumRatRegexp = new RegExp("^~([+-]?\\d+)/(\\d+)$");
|
|
41119
41095
|
|
|
41120
|
-
|
|
41121
41096
|
var scientificPattern = new RegExp("^([+-]?\\d*\\.?\\d*)[Ee]([+]?\\d+)$");
|
|
41122
41097
|
|
|
41123
41098
|
// fromString: string -> (pyretnum | false)
|