diff --git a/HISTORY.md b/HISTORY.md index 2ed2e029..14006fba 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -14,6 +14,7 @@ ### 2022-01-07 * blocks: added syntax tree representation for variable getters +* blocks, byob: blank-out variable getters in syntax-tree result list ### 2022-01-06 * Catalan library translations, thanks, Joan! diff --git a/snap.html b/snap.html index 70766adc..f140afc1 100755 --- a/snap.html +++ b/snap.html @@ -23,7 +23,7 @@ - + diff --git a/src/blocks.js b/src/blocks.js index d47918df..da516a54 100644 --- a/src/blocks.js +++ b/src/blocks.js @@ -989,11 +989,11 @@ SyntaxElementMorph.prototype.labelParts = { */ '%t': { type: 'template', - label: 'v' + label: '\xa0' // non-breaking space, appears blank }, '%upvar': { type: 'template', - label: '\u2191' // up-arrow + label: '\xa0' // non-breaking space, appears blank }, // other single types @@ -3810,7 +3810,7 @@ BlockMorph.prototype.syntaxTree = function (parameterNames) { parts.at(1).updateEmptySlots(); if (expr.selector === 'reportGetVar') { parts.add(expr.blockSpec); - expr.setSpec('v'); + expr.setSpec('\xa0'); // non-breaking space, appears blank } parameterNames.forEach(name => parts.add(name)); return parts; diff --git a/src/byob.js b/src/byob.js index d3f71577..286dfff1 100644 --- a/src/byob.js +++ b/src/byob.js @@ -9,7 +9,7 @@ written by Jens Mönig jens@moenig.org - Copyright (C) 2021 by Jens Mönig + Copyright (C) 2022 by Jens Mönig This file is part of Snap!. @@ -110,7 +110,7 @@ WatcherMorph, XML_Serializer, SnapTranslator, SnapExtensions*/ // Global stuff //////////////////////////////////////////////////////// -modules.byob = '2021-December-16'; +modules.byob = '2022-January-07'; // Declarations @@ -725,11 +725,11 @@ CustomCommandBlockMorph.prototype.refresh = function (aDefinition) { }); } - // find unnamed upvars and label them + // find unnamed upvars (indicated by non-breaking space) and label them // to their internal definition (default) this.cachedInputs = null; this.inputs().forEach((inp, idx) => { - if (inp instanceof TemplateSlotMorph && inp.contents() === '\u2191') { + if (inp instanceof TemplateSlotMorph && inp.contents() === '\xa0') { inp.setContents(def.inputNames()[idx]); } });