diff --git a/gui.js b/gui.js index 3e94e0d8..4ca8d3bd 100644 --- a/gui.js +++ b/gui.js @@ -3504,7 +3504,7 @@ IDE_Morph.prototype.aboutSnap = function () { module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn, world = this.world(); - aboutTxt = 'Snap! 4.2.1.1\nBuild Your Own Blocks\n\n' + aboutTxt = 'Snap! 4.2.1.2 - dev -\nBuild Your Own Blocks\n\n' + 'Copyright \u24B8 2018 Jens M\u00F6nig and ' + 'Brian Harvey\n' + 'jens@moenig.org, bh@cs.berkeley.edu\n\n' diff --git a/history.txt b/history.txt index fe814353..4ad2bca4 100755 --- a/history.txt +++ b/history.txt @@ -4211,7 +4211,6 @@ Translation Updates: * Portuguese, thanks, Manuel! * Catalan, thanks, Joan! -=== in development === 180703 ------ @@ -4259,3 +4258,9 @@ Translation Updates: * Threads, GUI: reverted Cache-Control header for HTTP requests b/c of CORS issues === v4.2.1.1 maintenance release === + +=== in development === + +180710 +------ +* Threads, GUI: fixed #712 - false "reporter didn't report" error messages diff --git a/snap.html b/snap.html index fc7e62b1..0191b5d0 100755 --- a/snap.html +++ b/snap.html @@ -2,14 +2,14 @@ - Snap! Build Your Own Blocks 4.2.1.1 + Snap! Build Your Own Blocks 4.2.1.2 - dev - - + - + diff --git a/threads.js b/threads.js index 35c7e140..7e15d5c3 100644 --- a/threads.js +++ b/threads.js @@ -1183,12 +1183,12 @@ Process.prototype.fork = function (context, args) { stage = this.homeContext.receiver.parentThatIsA(StageMorph); proc.instrument = this.instrument; proc.receiver = this.receiver; - proc.initializeFor(context, args, this.enableSingleStepping); + proc.initializeFor(context, args); // proc.pushContext('doYield'); stage.threads.processes.push(proc); }; -Process.prototype.initializeFor = function (context, args, ignoreExit) { +Process.prototype.initializeFor = function (context, args) { // used by Process.fork() and global invoke() if (context.isContinuation) { throw new Error( @@ -1206,8 +1206,7 @@ Process.prototype.initializeFor = function (context, args, ignoreExit) { ), parms = args.asArray(), i, - value, - exit; + value; // remember the receiver this.context = context.receiver; @@ -1256,20 +1255,6 @@ Process.prototype.initializeFor = function (context, args, ignoreExit) { if (runnable.expression instanceof CommandBlockMorph) { runnable.expression = runnable.expression.blockSequence(); - - // insert a tagged exit context - // which "report" can catch later - // needed for invoke() situations - if (!ignoreExit) { // when single stepping LAUNCH - exit = new Context( - runnable.parentContext, - 'expectReport', - outer, - outer.receiver - ); - exit.tag = 'exit'; - runnable.parentContext = exit; - } } this.homeContext = new Context(); // context.outerContext;