Skip to content

corresponding changes to https://github.com/brownplt/pyret-lang/pull/1839 #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: horizon
Choose a base branch
from
Open

corresponding changes to https://github.com/brownplt/pyret-lang/pull/1839 #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/web/js/cpo-ide-hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@
],
nativeRequires: [
"cpo/cpo-builtin-modules",
"pyret-base/js/js-numbers",
],
provides: {},
theModule: function(runtime, namespace, uri,
compileLib, compileStructs, pyRepl, cpo,
runtimeLib, loadLib, cpoBuiltins, parsePyret,
cpoModules, jsnums
cpoModules
) {
window.CPOIDEHooks = {
runtime: runtime,
Expand All @@ -49,7 +48,7 @@
compileStructs: compileStructs,
compileLib: compileLib,
cpoModules: cpoModules,
jsnums: jsnums
jsnums: runtime.jsnums
};
return runtime.makeModuleReturn({}, {});
}
Expand Down
6 changes: 3 additions & 3 deletions src/web/js/output-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
provides: {},
nativeRequires: [
"pyret-base/js/runtime-util",
"pyret-base/js/js-numbers"
],
theModule: function(runtime, _, uri, parsePyret, errordisplayLib, srclocLib, astLib, imageLib, loadLib, util, jsnums) {
theModule: function(runtime, _, uri, parsePyret, errordisplayLib, srclocLib, astLib, imageLib, loadLib, util) {

var jsnums = runtime.jsnums;
var image = runtime.getField(imageLib, "internal");
var srcloc = runtime.getField(srclocLib, "values");
var isSrcloc = runtime.getField(srcloc, "is-Srcloc");
Expand Down Expand Up @@ -1399,7 +1399,7 @@
// after, and numerals to be repeated.
var numr = num.numerator();
var denr = num.denominator();
var decimal = jsnums.toRepeatingDecimal(numr, denr, runtime.NumberErrbacks);
var decimal = jsnums.toRepeatingDecimal(numr, denr);
var prePointString = decimal[0];
var postPointString = decimal[1];
var decRpt = decimal[2];
Expand Down
17 changes: 7 additions & 10 deletions src/web/js/trove/chart-lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{ 'import-type': 'builtin', 'name': 'image-lib' },
],
nativeRequires: [
'pyret-base/js/js-numbers',
'google-charts',
],
provides: {
Expand All @@ -17,8 +16,9 @@
'plot': "tany",
}
},
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, jsnums , google) {
'use strict';
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, google) {
'use strict';
var jsnums = RUNTIME.jsnums;
// Load google library via editor.html to avoid loading issues

function notImp(name) {
Expand Down Expand Up @@ -89,7 +89,7 @@
function getPrettyNumToStringDigits(d) {
// this accepts Pyret num
return n =>
jsnums.toStringDigits(n, d, RUNTIME.NumberErrbacks).replace(/\.?0*$/, '');
jsnums.toStringDigits(n, d).replace(/\.?0*$/, '');
}

const prettyNumToStringDigits5 = getPrettyNumToStringDigits(5);
Expand Down Expand Up @@ -180,8 +180,7 @@
xMaxC.removeClass('error-bg');
xMaxC.addClass('ok-bg');

if (jsnums.greaterThanOrEqual(xMinVal, xMaxVal,
RUNTIME.NumberErrbacks)) {
if (jsnums.greaterThanOrEqual(xMinVal, xMaxVal)) {
xMinC.addClass('error-bg');
xMaxC.addClass('error-bg');
xMinC.removeClass('ok-bg');
Expand Down Expand Up @@ -211,8 +210,7 @@
yMaxC.removeClass('error-bg');
yMaxC.addClass('ok-bg');

if (jsnums.greaterThanOrEqual(xMinVal, xMaxVal,
RUNTIME.NumberErrbacks)) {
if (jsnums.greaterThanOrEqual(xMinVal, xMaxVal)) {
yMinC.addClass('error-bg');
yMaxC.addClass('error-bg');
yMinC.removeClass('ok-bg');
Expand All @@ -232,8 +230,7 @@
numSamplesC.addClass('ok-bg');

if (!isTrue(RUNTIME.num_is_integer(numSamplesVal)) ||
jsnums.lessThanOrEqual(numSamplesVal, 1,
RUNTIME.NumberErrbacks)) {
jsnums.lessThanOrEqual(numSamplesVal, 1)) {
numSamplesC.addClass('error-bg');
numSamplesC.removeClass('ok-bg');
return null;
Expand Down
24 changes: 12 additions & 12 deletions src/web/js/trove/d3-lib-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
{ 'import-type': 'builtin', 'name': 'image-lib' },
],
nativeRequires: [
'pyret-base/js/js-numbers',
'd3'
],
provides: {},
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, jsnums, d3) {
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, d3) {
'use strict';

var jsnums = RUNTIME.jsnums;
var IMAGE = RUNTIME.getField(IMAGELIB, "internal");


Expand All @@ -34,13 +34,13 @@
* @return {jsnums -> jsnums}
*/
return function (k) {
var oldDiff = jsnums.subtract(k, oldX, RUNTIME.NumberErrbacks);
var oldRange = jsnums.subtract(oldY, oldX, RUNTIME.NumberErrbacks);
var portion = jsnums.divide(oldDiff, oldRange, RUNTIME.NumberErrbacks);
var newRange = jsnums.subtract(newY, newX, RUNTIME.NumberErrbacks);
var newPortion = jsnums.multiply(portion, newRange, RUNTIME.NumberErrbacks);
var result = jsnums.add(newPortion, newX, RUNTIME.NumberErrbacks);
return toFixnum ? jsnums.toFixnum(result, RUNTIME.NumberErrbacks) : result;
var oldDiff = jsnums.subtract(k, oldX);
var oldRange = jsnums.subtract(oldY, oldX);
var portion = jsnums.divide(oldDiff, oldRange);
var newRange = jsnums.subtract(newY, newX);
var newPortion = jsnums.multiply(portion, newRange);
var result = jsnums.add(newPortion, newX);
return toFixnum ? jsnums.toFixnum(result) : result;
};
}

Expand All @@ -50,13 +50,13 @@

function getPrettyNumToStringDigits(digits) {
return function (num) {
return jsnums.toStringDigits(num, digits, RUNTIME.NumberErrbacks).replace(/\.?0*$/, '');
return jsnums.toStringDigits(num, digits).replace(/\.?0*$/, '');
};
}

function between(b, a, c) {
return (jsnums.lessThanOrEqual(a, b, RUNTIME.NumberErrbacks) && jsnums.lessThanOrEqual(b, c, RUNTIME.NumberErrbacks)) ||
(jsnums.lessThanOrEqual(c, b, RUNTIME.NumberErrbacks) && jsnums.lessThanOrEqual(b, a, RUNTIME.NumberErrbacks));
return (jsnums.lessThanOrEqual(a, b) && jsnums.lessThanOrEqual(b, c)) ||
(jsnums.lessThanOrEqual(c, b) && jsnums.lessThanOrEqual(b, a));
}

function numMin(a, b) { /* ignore the rest */
Expand Down
24 changes: 12 additions & 12 deletions src/web/js/trove/d3-lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
{ 'import-type': 'builtin', 'name': 'image-lib' },
],
nativeRequires: [
'pyret-base/js/js-numbers',
'd3'
],
provides: {},
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, jsnums, d3) {
theModule: function (RUNTIME, NAMESPACE, uri, IMAGELIB, d3) {
'use strict';

var jsnums = RUNTIME.jsnums;
var IMAGE = RUNTIME.getField(IMAGELIB, "internal");

function assert(val, msg) {
Expand All @@ -33,13 +33,13 @@
* @return {jsnums -> jsnums}
*/
return function (k) {
var oldDiff = jsnums.subtract(k, oldX, RUNTIME.NumberErrbacks);
var oldRange = jsnums.subtract(oldY, oldX, RUNTIME.NumberErrbacks);
var portion = jsnums.divide(oldDiff, oldRange, RUNTIME.NumberErrbacks);
var newRange = jsnums.subtract(newY, newX, RUNTIME.NumberErrbacks);
var newPortion = jsnums.multiply(portion, newRange, RUNTIME.NumberErrbacks);
var result = jsnums.add(newPortion, newX, RUNTIME.NumberErrbacks);
return toFixnum ? jsnums.toFixnum(result, RUNTIME.NumberErrbacks) : result;
var oldDiff = jsnums.subtract(k, oldX);
var oldRange = jsnums.subtract(oldY, oldX);
var portion = jsnums.divide(oldDiff, oldRange);
var newRange = jsnums.subtract(newY, newX);
var newPortion = jsnums.multiply(portion, newRange);
var result = jsnums.add(newPortion, newX);
return toFixnum ? jsnums.toFixnum(result) : result;
};
}

Expand All @@ -49,13 +49,13 @@

function getPrettyNumToStringDigits(digits) {
return function (num) {
return jsnums.toStringDigits(num, digits, RUNTIME.NumberErrbacks).replace(/\.?0*$/, '');
return jsnums.toStringDigits(num, digits).replace(/\.?0*$/, '');
};
}

function between(b, a, c) {
return (jsnums.lessThanOrEqual(a, b, RUNTIME.NumberErrbacks) && jsnums.lessThanOrEqual(b, c, RUNTIME.NumberErrbacks)) ||
(jsnums.lessThanOrEqual(c, b, RUNTIME.NumberErrbacks) && jsnums.lessThanOrEqual(b, a, RUNTIME.NumberErrbacks));
return (jsnums.lessThanOrEqual(a, b) && jsnums.lessThanOrEqual(b, c)) ||
(jsnums.lessThanOrEqual(c, b) && jsnums.lessThanOrEqual(b, a));
}

function numMin(a, b) { /* ignore the rest */
Expand Down
Loading
Loading