OOP: Tweaks for scope conflicts when adding / removing vars

4 files changed, 59 insertions, 21 deletions

diff --git a/blocks.js b/blocks.js
index 711976f..45f1049 100644
--- a/blocks.js
+++ b/blocks.js
@@ -155,7 +155,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2015-March-21';
+modules.blocks = '2015-March-23';
 
 
 var SyntaxElementMorph;
@@ -1191,6 +1191,15 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
             );
             part.isStatic = true;
             break;
+        case '%shd':
+            part = new InputSlotMorph(
+                null,
+                false,
+                'shadowedVariablesMenu',
+                true
+            );
+            part.isStatic = true;
+            break;
         case '%lst':
             part = new InputSlotMorph(
                 null,
@@ -1889,7 +1898,8 @@ SyntaxElementMorph.prototype.endLayout = function () {
     %att    - chameleon colored rectangular drop-down for attributes
     %fun    - chameleon colored rectangular drop-down for math functions
     %typ    - chameleon colored rectangular drop-down for data types
-    %var - chameleon colored rectangular drop-down for variable names
+    %var    - chameleon colored rectangular drop-down for variable names
+    %shd    - Chameleon colored rectuangular drop-down for shadowed var names
     %lst    - chameleon colored rectangular drop-down for list names
     %b        - chameleon colored hexagonal slot (for predicates)
     %l        - list icon
@@ -6902,6 +6912,21 @@ InputSlotMorph.prototype.getVarNamesDict = function () {
     return {};
 };
 
+InputSlotMorph.prototype.shadowedVariablesMenu = function () {
+    var block = this.parentThatIsA(BlockMorph),
+        rcvr,
+        dict = {};
+
+    if (!block) {return dict; }
+    rcvr = block.receiver();
+    if (rcvr) {
+        rcvr.inheritedVariableNames(true).forEach(function (name) {
+            dict[name] = name;
+        });
+    }
+    return dict;
+};
+
 InputSlotMorph.prototype.setChoices = function (dict, readonly) {
     // externally specify choices and read-only status,
     // used for custom blocks
diff --git a/history.txt b/history.txt
index e02d368..fc54386 100755
--- a/history.txt
+++ b/history.txt
@@ -2480,3 +2480,7 @@ ______
 150321
 ------
 * OOP: Prototypal inheritance of sprite-local variables
+
+150321
+------
+* OOP: Objects, Blocks, Threads - tweaks
diff --git a/objects.js b/objects.js
index 56e5806..2ea8427 100644
--- a/objects.js
+++ b/objects.js
@@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2015-March-21';
+modules.objects = '2015-March-23';
 
 var SpriteMorph;
 var StageMorph;
@@ -1107,7 +1107,7 @@ SpriteMorph.prototype.initBlocks = function () {
         doDeleteAttr: {
             type: 'command',
             category: 'variables',
-            spec: 'delete %var'
+            spec: 'delete %shd'
         },
 
         // Lists
@@ -1720,12 +1720,14 @@ SpriteMorph.prototype.blockTemplates = function (category) {
     function addVar(pair) {
         var ide;
         if (pair) {
-            if (myself.isVariableNameInUse(pair[0])) {
+            if (myself.isVariableNameInUse(pair[0], pair[1])) {
                 myself.inform('that name is already in use');
             } else {
                 ide = myself.parentThatIsA(IDE_Morph);
                 myself.addVariable(pair[0], pair[1]);
-                myself.toggleVariableWatcher(pair[0], pair[1]);
+                if (!myself.showingVariableWatcher(pair[0])) {
+                    myself.toggleVariableWatcher(pair[0], pair[1]);
+                }
                 ide.flushBlocksCache('variables'); // b/c of inheritance
                 ide.refreshPalette();
             }
@@ -4203,7 +4205,10 @@ SpriteMorph.prototype.allSpecimens = function () {
 
 // SpriteMorph inheritance - variables
 
-SpriteMorph.prototype.isVariableNameInUse = function (vName) {
+SpriteMorph.prototype.isVariableNameInUse = function (vName, isGlobal) {
+    if (isGlobal) {
+        return contains(this.variables.allNames(), vName);
+    }
     if (contains(this.variables.names(), vName)) {return true; }
     return contains(this.globalVariables().names(), vName);
 };
@@ -4243,8 +4248,14 @@ SpriteMorph.prototype.inheritedVariableNames = function (shadowedOnly) {
 };
 
 SpriteMorph.prototype.deletableVariableNames = function () {
-    return this.variables.names().concat(
-        this.globalVariables().names()
+    var locals = this.variables.names(),
+        inherited = this.inheritedVariableNames();
+    return locals.concat(
+        this.globalVariables().names().filter(
+            function (each) {
+                return !contains(locals, each) && !contains(inherited, each);
+            }
+        )
     );
 };
 
@@ -5406,16 +5417,7 @@ StageMorph.prototype.blockTemplates = function (category) {
         blocks.push(block('doShowVar'));
         blocks.push(block('doHideVar'));
         blocks.push(block('doDeclareVariables'));
-
-    // inheritance:
-
-        blocks.push('-');
-        blocks.push(block('doDeleteAttr'));
-
-    ///////////////////////////////
-
         blocks.push('=');
-
         blocks.push(block('reportNewList'));
         blocks.push('-');
         blocks.push(block('reportCONS'));
@@ -5813,6 +5815,10 @@ StageMorph.prototype.isVariableNameInUse
 StageMorph.prototype.globalVariables
     = SpriteMorph.prototype.globalVariables;
 
+StageMorph.prototype.inheritedVariableNames = function () {
+    return [];
+};
+
 // SpriteBubbleMorph ////////////////////////////////////////////////////////
 
 /*
diff --git a/threads.js b/threads.js
index d3dcfc9..82f7ab0 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2015-March-21';
+modules.threads = '2015-March-23';
 
 var ThreadManager;
 var Process;
@@ -1299,14 +1299,17 @@ Process.prototype.doRemoveTemporaries = function () {
 
 Process.prototype.doDeleteAttr = function (attrName) {
     // currently only variables are deletable
-    var name = attrName;
+    var name = attrName,
+        rcvr = this.blockReceiver();
 
     if (name instanceof Context) {
         if (name.expression.selector === 'reportGetVar') {
             name = name.expression.blockSpec;
         }
     }
-    this.blockReceiver().deleteVariable(name);
+    if (contains(rcvr.inheritedVariableNames(true), name)) {
+        rcvr.deleteVariable(name);
+    }
 };
 
 // Process lists primitives