From 12ba9b7703075d08710aef9718c86c441b775108 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 5 Jun 2013 18:37:44 +0200
Subject: Objects: fix for hiding 'getLastAnswer' and 'getTimer' primitives

---
 objects.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'objects.js')

diff --git a/objects.js b/objects.js
index 771a0a1..59a9d49 100644
--- a/objects.js
+++ b/objects.js
@@ -123,7 +123,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2013-May-16';
+modules.objects = '2013-June-05';
 
 var SpriteMorph;
 var StageMorph;
@@ -700,12 +700,12 @@ SpriteMorph.prototype.initBlocks = function () {
             spec: 'ask %s and wait',
             defaults: [localize('what\'s your name?')]
         },
-        reportLastAnswer: {
+        reportLastAnswer: { // retained for legacy compatibility
             type: 'reporter',
             category: 'sensing',
             spec: 'answer'
         },
-        getLastAnswer: { // variant for watcher
+        getLastAnswer: {
             type: 'reporter',
             category: 'sensing',
             spec: 'answer'
@@ -740,12 +740,12 @@ SpriteMorph.prototype.initBlocks = function () {
             category: 'sensing',
             spec: 'reset timer'
         },
-        reportTimer: {
+        reportTimer: { // retained for legacy compatibility
             type: 'reporter',
             category: 'sensing',
             spec: 'timer'
         },
-        getTimer: { // variant for watcher
+        getTimer: {
             type: 'reporter',
             category: 'sensing',
             spec: 'timer'
@@ -1073,8 +1073,8 @@ SpriteMorph.prototype.blockAlternatives = {
     doStopAll: ['doStopBlock', 'doStop'],
 
     // sensing:
-    reportLastAnswer: ['reportTimer'],
-    reportTimer: ['reportLastAnswer'],
+    getLastAnswer: ['getTimer'],
+    getTimer: ['getLastAnswer'],
     reportMouseX: ['reportMouseY'],
     reportMouseY: ['reportMouseX'],
 
@@ -1592,7 +1592,7 @@ SpriteMorph.prototype.blockTemplates = function (category) {
         blocks.push('-');
         blocks.push(block('doAsk'));
         blocks.push(watcherToggle('getLastAnswer'));
-        blocks.push(block('reportLastAnswer'));
+        blocks.push(block('getLastAnswer'));
         blocks.push('-');
         blocks.push(block('reportMouseX'));
         blocks.push(block('reportMouseY'));
@@ -1604,7 +1604,7 @@ SpriteMorph.prototype.blockTemplates = function (category) {
         blocks.push('-');
         blocks.push(block('doResetTimer'));
         blocks.push(watcherToggle('getTimer'));
-        blocks.push(block('reportTimer'));
+        blocks.push(block('getTimer'));
         blocks.push('-');
         blocks.push(block('reportAttributeOf'));
         blocks.push('-');
@@ -3838,7 +3838,7 @@ StageMorph.prototype.blockTemplates = function (category) {
 
         blocks.push(block('doAsk'));
         blocks.push(watcherToggle('getLastAnswer'));
-        blocks.push(block('reportLastAnswer'));
+        blocks.push(block('getLastAnswer'));
         blocks.push('-');
         blocks.push(block('reportMouseX'));
         blocks.push(block('reportMouseY'));
@@ -3848,7 +3848,7 @@ StageMorph.prototype.blockTemplates = function (category) {
         blocks.push('-');
         blocks.push(block('doResetTimer'));
         blocks.push(watcherToggle('getTimer'));
-        blocks.push(block('reportTimer'));
+        blocks.push(block('getTimer'));
         blocks.push('-');
         blocks.push(block('reportAttributeOf'));
         blocks.push('-');
-- 
cgit v1.3.1