1 files changed, 57 insertions, 3 deletions

diff --git a/threads.js b/threads.js
index 06454e3..6f5f35c 100644
--- a/threads.js
+++ b/threads.js
@@ -128,6 +128,15 @@ function snapEquals(a, b) {
     return x === y;
 }
 
+// stricter alternative to parseFloat
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/parseFloat/
+function filterFloat(value) {
+    if(/^(\-|\+)?([0-9]+(\.[0-9]+)?|Infinity)$/
+        .test(value))
+        return Number(value);
+    return NaN;
+}
+
 // ThreadManager ///////////////////////////////////////////////////////
 
 function ThreadManager() {
@@ -441,11 +450,20 @@ Process.prototype.pause = function () {
     if (this.context && this.context.startTime) {
         this.pauseOffset = Date.now() - this.context.startTime;
     }
+    if (this.context.activeNote) {
+        this.context.activeNote.stop();
+    }
 };
 
 Process.prototype.resume = function () {
     this.isPaused = false;
     this.pauseOffset = null;
+    if (this.context.activeNote) {
+        if (this.context.activeNote.oscillator === null) {
+            // prevents Note from resuming twice
+            this.context.activeNote.play();
+        }
+    }
 };
 
 Process.prototype.pauseStep = function () {
@@ -735,6 +753,13 @@ Process.prototype.expectReport = function () {
 
 // Process Exception Handling
 
+Process.prototype.checkIfList = function (maybeList) {
+    if (!(maybeList instanceof List)) {
+        maybeList = new List();
+    }
+    return maybeList;
+};
+
 Process.prototype.handleError = function (error, element) {
     var m = element;
     this.stop();
@@ -1306,15 +1331,19 @@ Process.prototype.reportCONS = function (car, cdr) {
 };
 
 Process.prototype.reportCDR = function (list) {
+    list = this.checkIfList(list);
     return list.cdr();
 };
 
 Process.prototype.doAddToList = function (element, list) {
+    list = this.checkIfList(list);
     list.add(element);
 };
 
 Process.prototype.doDeleteFromList = function (index, list) {
     var idx = index;
+    list = this.checkIfList(list);
+
     if (this.inputOption(index) === 'all') {
         return list.clear();
     }
@@ -1329,6 +1358,8 @@ Process.prototype.doDeleteFromList = function (index, list) {
 
 Process.prototype.doInsertInList = function (element, index, list) {
     var idx = index;
+    list = this.checkIfList(list);
+
     if (index === '') {
         return null;
     }
@@ -1343,6 +1374,8 @@ Process.prototype.doInsertInList = function (element, index, list) {
 
 Process.prototype.doReplaceInList = function (index, list, element) {
     var idx = index;
+    list = this.checkIfList(list);
+
     if (index === '') {
         return null;
     }
@@ -1357,6 +1390,8 @@ Process.prototype.doReplaceInList = function (index, list, element) {
 
 Process.prototype.reportListItem = function (index, list) {
     var idx = index;
+    list = this.checkIfList(list);
+
     if (index === '') {
         return '';
     }
@@ -1370,10 +1405,12 @@ Process.prototype.reportListItem = function (index, list) {
 };
 
 Process.prototype.reportListLength = function (list) {
+    list = this.checkIfList(list);
     return list.length();
 };
 
 Process.prototype.reportListContainsItem = function (list, element) {
+    list = this.checkIfList(list);
     return list.contains(element);
 };
 
@@ -1429,7 +1466,7 @@ Process.prototype.doStopAll = function () {
     if (this.homeContext.receiver) {
         stage = this.homeContext.receiver.parentThatIsA(StageMorph);
         if (stage) {
-            stage.threads.resumeAll(stage);
+            //stage.threads.resumeAll(stage); // leads to a strange Note bug
             stage.keysPressed = {};
             stage.threads.stopAll();
             stage.stopAllActiveSounds();
@@ -1632,6 +1669,8 @@ Process.prototype.reportMap = function (reporter, list) {
     // documented in each of the variants' code (linked or arrayed) below
 
     var next;
+    list = this.checkIfList(list);
+
     if (list.isLinked) {
         // this.context.inputs:
         // [0] - reporter
@@ -1920,13 +1959,14 @@ Process.prototype.reportIsA = function (thing, typeString) {
 Process.prototype.reportTypeOf = function (thing) {
     // answer a string denoting the argument's type
     var exp;
+
     if (thing === null || (thing === undefined)) {
         return 'nothing';
     }
     if (thing === true || (thing === false)) {
         return 'Boolean';
     }
-    if (!isNaN(parseFloat(thing))) {
+    if (!isNaN(filterFloat(thing))) {
         return 'number';
     }
     if (isString(thing)) {
@@ -2993,18 +3033,32 @@ Process.prototype.doPlayNote = function (pitch, beats) {
 
 Process.prototype.doPlayNoteForSecs = function (pitch, secs) {
     // interpolated
+    var receiver = this.homeContext.receiver;
+    var volume = receiver.volume;
+    var muted = receiver.parentThatIsA(StageMorph).muted;
+
+    if (muted === true) {
+        volume = 0;
+    }
+
     if (!this.context.startTime) {
         this.context.startTime = Date.now();
-        this.context.activeNote = new Note(pitch);
+        this.context.activeNote = new Note(pitch, volume);
         this.context.activeNote.play();
     }
+
     if ((Date.now() - this.context.startTime) >= (secs * 1000)) {
         if (this.context.activeNote) {
             this.context.activeNote.stop();
             this.context.activeNote = null;
         }
         return null;
+    } else if (this.context.activeNote) {
+        if (this.context.activeNote.volume !== volume) {
+            this.context.activeNote.setVolume(volume);
+        }
     }
+
     this.pushContext('doYield');
     this.pushContext();
 };