Fix [block] variable shadowing

Matway · Apr 13, 2020 · c29dda2 · c29dda2
1 parent d480999
commit c29dda2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/builtinImpl.mpl b/builtinImpl.mpl
@@ -919,10 +919,10 @@ staticityOfBinResult: [
     [signature: parseSignature;]
     [
       name: ("null." processor.blocks.getSize) assembleString;
-      block: signature name makeStringView TRUE dynamic processImportFunction Block addressToReference;
+      newBlock: signature name makeStringView TRUE dynamic processImportFunction Block addressToReference;
     ]
     [
-      gnr: block.varNameInfo @block getName;
+      gnr: newBlock.varNameInfo @block getName;
       cnr: gnr @block captureName;
       refToVar: cnr.refToVar copy;
 
@@ -1275,7 +1275,7 @@ staticityOfBinResult: [
       varName.data.getTag VarString = ~ ["function name must be static string" block compilerError] when
     ]
     [signature: parseSignature;]
-    [block: signature VarString varName.data.get makeStringView FALSE dynamic processImportFunction Block addressToReference;]
+    [newBlock: signature VarString varName.data.get makeStringView FALSE dynamic processImportFunction Block addressToReference;]
   ) sequence
 ] "mplBuiltinImportFunction" @declareBuiltin ucall
 

diff --git a/irWriter.mpl b/irWriter.mpl
@@ -536,9 +536,9 @@ addAliasesForUsedNodes: [
   String @[email protected]
   "; Func aliases" toString @[email protected]
   @processor.@blocks [
-    block: .get;
-    block nodeHasCode [
-      @block.@aliases [move @[email protected]] each
+    block0: .get;
+    block0 nodeHasCode [
+      @block0.@aliases [move @[email protected]] each
     ] when
   ] each
 ];