#REFACTORING by cg
authorClaus Gittinger <cg@exept.de>
Thu, 06 Oct 2016 01:31:35 +0200
changeset 20551 599e32fb112f
parent 20550 66bb5e013497
child 20552 3b8031777e92
#REFACTORING by cg class: Block changed: #valueWithArguments: #valueWithOptionalArguments: #valueWithPossibleArguments:
Block.st
--- a/Block.st	Thu Oct 06 00:25:29 2016 +0200
+++ b/Block.st	Thu Oct 06 01:31:35 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -681,7 +679,6 @@
 ! !
 
 
-
 !Block methodsFor:'accessing'!
 
 home
@@ -1562,11 +1559,10 @@
 
     argArray := argArrayIn.
     (argArray notNil and:[(argArray class ~~ Array) and:[argArray isArray not]]) ifTrue:[
-        argArray isCollection ifTrue:[
-            argArray := argArray asArray
-        ] ifFalse:[
+        argArray isCollection ifFalse:[
             ^ self badArgumentArray:argArray
         ].
+        argArray := argArray asArray.
     ].
     (argArray size ~~ nargs) ifTrue:[
         ^ self wrongNumberOfArguments:argArray size
@@ -1828,11 +1824,10 @@
 
     argArray := argArrayIn.
     (argArray notNil and:[(argArray class ~~ Array) and:[argArray isArray not]]) ifTrue:[
-        argArray isCollection ifTrue:[
-            argArray := argArray asArray
-        ] ifFalse:[
+        argArray isCollection ifFalse:[
             ^ self badArgumentArray:argArray
         ].
+        argArray := argArray asArray.
     ].
 
     (argArray size < nargs) ifTrue:[
@@ -1995,11 +1990,10 @@
 
     argArray := argArrayIn.
     (argArray notNil and:[(argArray class ~~ Array) and:[argArray isArray not]]) ifTrue:[
-        argArray isCollection ifTrue:[
-            argArray := argArray asArray
-        ] ifFalse:[
+        argArray isCollection ifFalse:[
             ^ self badArgumentArray:argArray
         ].
+        argArray := argArray asArray.
     ].
     numArgsProvided := argArray size.
 %{