mirror
/
turtlestitch
kopia lustrzana https://github.com/backface/turtlestitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

fixed #712 - false "reporter didn't report" error messages

upd4.2
jmoenig 2018-07-10 18:28:57 +02:00
rodzic e5c5097ff3
commit baa6857171
4 zmienionych plików z 13 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
gui.js
Wyświetl plik

@ -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'

7
history.txt
Wyświetl plik

@ -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

6
snap.html
Wyświetl plik

@ -2,14 +2,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Snap! Build Your Own Blocks 4.2.1.1</title>
<title>Snap! Build Your Own Blocks 4.2.1.2 - dev -</title>
<link rel="shortcut icon" href="favicon.ico">
<script type="text/javascript" src="morphic.js?version=2018-06-21"></script>
<script type="text/javascript" src="widgets.js?version=2018-06-21"></script>
<script type="text/javascript" src="blocks.js?version=2018-06-21"></script>
<script type="text/javascript" src="threads.js?version=2018-07-10"></script>
<script type="text/javascript" src="threads.js?version=2018-07-10a"></script>
<script type="text/javascript" src="objects.js?version=2018-07-06"></script>
<script type="text/javascript" src="gui.js?version=2018-07-10"></script>
<script type="text/javascript" src="gui.js?version=2018-07-10a"></script>
<script type="text/javascript" src="paint.js?version=2018-06-21"></script>
<script type="text/javascript" src="lists.js?version=2018-06-21"></script>
<script type="text/javascript" src="byob.js?version=2018-06-21"></script>

21
threads.js
Wyświetl plik

@ -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;