Type-check the SPLIT block's input before eval'ing it

pull/3/merge
jmoenig 2013-10-04 10:34:59 +02:00
rodzic 9a0881b96a
commit ec6b46a4c5
2 zmienionych plików z 16 dodań i 2 usunięć

Wyświetl plik

@ -1933,3 +1933,7 @@ ______
131001
------
* Objects: smooth numerical values displayed in watchers
131004
------
* Threads: Type-check the SPLIT block's input before eval'ing it

Wyświetl plik

@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
// Global stuff ////////////////////////////////////////////////////////
modules.threads = '2013-September-16';
modules.threads = '2013-October-04';
var ThreadManager;
var Process;
@ -2002,8 +2002,18 @@ Process.prototype.reportUnicodeAsLetter = function (num) {
};
Process.prototype.reportTextSplit = function (string, delimiter) {
var str = (string || '').toString(),
var types = ['text', 'number'],
strType = this.reportTypeOf(string),
delType = this.reportTypeOf(this.inputOption(delimiter)),
str,
del;
if (!contains(types, strType)) {
throw new Error('expecting a text instad of a ' + strType);
}
if (!contains(types, delType)) {
throw new Error('expecting a text delimiter instad of a ' + delType);
}
str = (string || '').toString();
switch (this.inputOption(delimiter)) {
case 'line':
del = '\n';