suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request from jpolitz/master

Browse Source 
Allow #f as a valid source location
This commit is contained in:
Danny Yoo 2014-03-21 15:20:53 -07:00
commit 60a70798a8
2 changed files with 15 additions and 8 deletions
whalesong/js-assembler/runtime-src
baselib-check.jsbaselib-primitives.js

6
whalesong/js-assembler/runtime-src/baselib-check.js
View File

@ -143,6 +143,11 @@
baselib.numbers.isNatural,
'natural');
var checkNaturalOrFalse = makeCheckArgumentType(
function(x) { return (baselib.numbers.isNatural(x) ||
x === false); },
'natural or false');
var checkByte = makeCheckArgumentType(
baselib.numbers.isByte,
'byte');
@ -284,6 +289,7 @@
exports.checkReal = checkReal;
exports.checkNonNegativeReal = checkNonNegativeReal;
exports.checkNatural = checkNatural;
exports.checkNaturalOrFalse = checkNaturalOrFalse;
exports.checkNaturalInRange = checkNaturalInRange;
exports.checkByte = checkByte;
exports.checkBytes = checkBytes;

17
whalesong/js-assembler/runtime-src/baselib-primitives.js
View File

@ -84,6 +84,7 @@
var checkReal = baselib.check.checkReal;
var checkNonNegativeReal = baselib.check.checkNonNegativeReal;
var checkNatural = baselib.check.checkNatural;
var checkNaturalOrFalse = baselib.check.checkNaturalOrFalse;
var checkNaturalInRange = baselib.check.checkNaturalInRange;
var checkInteger = baselib.check.checkInteger;
var checkIntegerForChar = baselib.check.makeCheckArgumentType(
@ -2756,10 +2757,10 @@
5,
function(M) {
var source = M.e[M.e.length - 1];
var line = checkNatural(M, 'srcloc', 1);
var column = checkNatural(M, 'srcloc', 2);
var position = checkNatural(M, 'srcloc', 3);
var span = checkNatural(M, 'srcloc', 4);
var line = checkNaturalOrFalse(M, 'srcloc', 1);
var column = checkNaturalOrFalse(M, 'srcloc', 2);
var position = checkNaturalOrFalse(M, 'srcloc', 3);
var span = checkNaturalOrFalse(M, 'srcloc', 4);
return baselib.srclocs.makeSrcloc(source, line, column, position, span);
});
@ -2768,10 +2769,10 @@
5,
function(M) {
var source = M.e[M.e.length - 1];
var line = checkNatural(M, 'make-srcloc', 1);
var column = checkNatural(M, 'make-srcloc', 2);
var position = checkNatural(M, 'make-srcloc', 3);
var span = checkNatural(M, 'make-srcloc', 4);
var line = checkNaturalOrFalse(M, 'make-srcloc', 1);
var column = checkNaturalOrFalse(M, 'make-srcloc', 2);
var position = checkNaturalOrFalse(M, 'make-srcloc', 3);
var span = checkNaturalOrFalse(M, 'make-srcloc', 4);
return baselib.srclocs.makeSrcloc(source, line, column, position, span);
});