renamed COMBINE label, switching the inputs

pull/89/head
jmoenig 2019-06-25 16:21:42 +02:00
rodzic ca56432c3a
commit bc908f9608
4 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -90,6 +90,7 @@
### 2019-06-25
* threads: 2 optional formal inputs for rings in MAP, KEEP, FIND, COMBINE: index and source list
* objects, threads: renamed COMBINE label, switching the inputs
### 2019-06-24
* removed "such that" from KEEP and FIND block labels

Wyświetl plik

@ -8,7 +8,7 @@
<script type="text/javascript" src="src/widgets.js?version=2019-04-05"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-06-03_1"></script>
<script type="text/javascript" src="src/threads.js?version=2019-06-25"></script>
<script type="text/javascript" src="src/objects.js?version=2019-06-24"></script>
<script type="text/javascript" src="src/objects.js?version=2019-06-25"></script>
<script type="text/javascript" src="src/gui.js?version=2019-05-29"></script>
<script type="text/javascript" src="src/paint.js?version=2019-02-22"></script>
<script type="text/javascript" src="src/lists.js?version=2019-06-04_1"></script>

Wyświetl plik

@ -84,7 +84,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph, HandleMorph,
AlignmentMorph, Process, XML_Element, VectorPaintEditorMorph, WorldMap*/
modules.objects = '2019-June-24';
modules.objects = '2019-June-25';
var SpriteMorph;
var StageMorph;
@ -1337,13 +1337,13 @@ SpriteMorph.prototype.initBlocks = function () {
reportCombine: {
type: 'reporter',
category: 'lists',
spec: 'combine with %repRing items of %l'
spec: 'combine %l using %repRing'
},
reportAtomicCombine: {
dev: true, // not shown in palette, only accessible via relabelling
type: 'reporter',
category: 'lists',
spec: '%blitz combine with %repRing items of %l'
spec: '%blitz combine %l using %repRing'
},
doForEach: {
type: 'command',

Wyświetl plik

@ -2479,7 +2479,7 @@ Process.prototype.reportFindFirst = function (predicate, list) {
this.evaluate(predicate, new List(parms));
};
Process.prototype.reportCombine = function (reporter, list) {
Process.prototype.reportCombine = function (list, reporter) {
// Fold - answer an aggregation of all list items from "left to right"
// Distinguish between linked and arrayed lists.
// if the reporter uses formal parameters instead of implicit empty slots
@ -5239,7 +5239,7 @@ Process.prototype.reportAtomicFindFirst = function (reporter, list) {
return false;
};
Process.prototype.reportAtomicCombine = function (reporter, list) {
Process.prototype.reportAtomicCombine = function (list, reporter) {
// if the reporter uses formal parameters instead of implicit empty slots
// there are two additional optional parameters:
// #1 - accumulator