Fix some conflict checking for inlined closures.

newspeak/NSCompilerTesting.ns

@@ -1457,6 +1457,9 @@ public testParameterImmutabilityEnforced = (
 public testParameterTemporaryConflictInBlock = (
 	assertCompilationErrorIn: 'class Sample = () (foo = ( [:x | | x | ] ))' including: 'x'.
 )
+public testParameterTemporaryConflictInInlinedBlock = (
+	assertCompilationErrorIn: 'class Sample = () (foo = ( 1 to: 10 do: [:x | | x | ] ))' including: 'x'.
+)
 public testParameterTemporaryConflictInMethod = (
 	assertCompilationErrorIn: 'class Sample = () (foo: x = ( | x | ))' including: 'x'.
 )
@@ -1551,6 +1554,7 @@ public testReservedWordsAsMethods = (
 	assertNoCompilationErrorIn: 'class Sample = ()( thisContext = () )'.
 )
 public testReservedWordsAsParams = (
+	(* Method *)
 	assertCompilationErrorIn: 'class Sample = ()( foo: self = () )' including: 'self'.
 	assertCompilationErrorIn: 'class Sample = ()( foo: super = () )' including: 'super'.
 	assertCompilationErrorIn: 'class Sample = ()( foo: outer = () )' including: 'outer'.
@@ -1559,13 +1563,23 @@ public testReservedWordsAsParams = (
 	assertCompilationErrorIn: 'class Sample = ()( foo: nil = () )' including: 'nil'.
 	assertNoCompilationErrorIn: 'class Sample = ()( foo: thisContext = () )'.
 
+	(* Closure *)
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:self | ] ) )' including: 'self'.
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:super | ] ) )' including: 'super'.
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:outer | ] ) )' including: 'outer'.
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:true | ] ) )' including: 'true'.
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:false | ] ) )' including: 'false'.
 	assertCompilationErrorIn: 'class Sample = ()( foo = ( [:nil | ] ) )' including: 'nil'.
 	assertNoCompilationErrorIn: 'class Sample = ()( foo = ( [:thisContext | ] ) )'.
+
+	(* Inlined closure *)
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:self | ] ) )' including: 'self'.
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:super | ] ) )' including: 'super'.
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:outer | ] ) )' including: 'outer'.
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:true | ] ) )' including: 'true'.
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:false | ] ) )' including: 'false'.
+	assertCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:nil | ] ) )' including: 'nil'.
+	assertNoCompilationErrorIn: 'class Sample = ()( foo = ( 1 to: 2 do: [:thisContext | ] ) )'.
 )
 public testReservedWordsAsSlots = (
 	assertCompilationErrorIn: 'class Sample = ( | self | ) ()' including: 'self'.

newspeak/NewspeakCompilation.ns

@@ -190,6 +190,7 @@ public from: first <AST> to: last <AST> by: step <AST> do: block <BlockAST> = (
 
 	(* Create counter variable from block's parameter. *)
 	counterDecl:: block parameters removeLast. (* BOGUS: Should not mutate AST *)
+	checkForReservedWord: counterDecl name.
 	counterEntry:: LocalEntry forDeclaration: counterDecl atDepth: nil.
 	counterEntry induction: true.
 	loopScope at: counterDecl name put: counterEntry.
@@ -224,6 +225,10 @@ public from: first <AST> to: last <AST> by: step <AST> do: block <BlockAST> = (
 		copyPositionFrom: block.
 
 	(* inlined closure body *)
+	block body temporaries do:
+		[:temp |
+		 temp name = counterDecl name ifTrue:
+			[Exception signal: 'Conflicting slots named ', temp name]].
 	body:: (rewriteInlinedBlockNode: block forValue: false) body.
 
 	(* add counter increment to loop body *)