From bc908f96081e7435a12fc313dd5b138cc26d8e72 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Tue, 25 Jun 2019 16:21:42 +0200
Subject: [PATCH] renamed COMBINE label, switching the inputs

---
 HISTORY.md     | 1 +
 snap.html      | 2 +-
 src/objects.js | 6 +++---
 src/threads.js | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 33b990d9..1d20ae89 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -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
diff --git a/snap.html b/snap.html
index ea351209..519dc288 100755
--- a/snap.html
+++ b/snap.html
@@ -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>
diff --git a/src/objects.js b/src/objects.js
index d0180297..056bb1b9 100644
--- a/src/objects.js
+++ b/src/objects.js
@@ -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',
diff --git a/src/threads.js b/src/threads.js
index 57f882fa..c1ff71b4 100644
--- a/src/threads.js
+++ b/src/threads.js
@@ -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