Fixed guard mechanism that forbids instantiating builtin types via ob…

…ject.__new__()

src/Stdlib/TypeExtensions/ObjectTypeExtension.php

@@ -9,10 +9,10 @@
 use \Smuuf\Primi\Values\TypeValue;
 use \Smuuf\Primi\Values\AbstractValue;
 use \Smuuf\Primi\Values\InstanceValue;
-use \Smuuf\Primi\Values\StaticTypeValue;
 use \Smuuf\Primi\Extensions\PrimiFunc;
 use \Smuuf\Primi\Extensions\TypeExtension;
 use \Smuuf\Primi\Structures\CallArgs;
+use Smuuf\Primi\Values\BuiltinTypeValue;
 
 class ObjectTypeExtension extends TypeExtension {
 
@@ -35,8 +35,8 @@ public static function __new__(
 		// can be instantiated into PHP `InstanceValue` objects. Otherwise
 		// things would get messy (for example `DictValue::__construct()` would
 		// not get used in any way, etc.)
-		if ($type instanceof StaticTypeValue) {
-			throw new TypeError("First argument for object.__new__() must not be a native type");
+		if ($type instanceof BuiltinTypeValue) {
+			throw new TypeError("First argument for object.__new__() must not be a builtin type");
 		}
 
 		return new InstanceValue($type, $ctx);

src/Values/TypeValue.php

@@ -136,9 +136,13 @@ public function invoke(
 		// than the "type" type itself - and calling this object should
 		// represent instantiation of new object that will have this type.
 		if ($fn = Types::attr_lookup($this, MagicStrings::MAGICMETHOD_NEW, $this)) {
+
+			// The static '__new__()' will receive type object as the first
+			// argument.
 			$newArgs = $args
-				? new CallArgs([$this, ...$args->getArgs()], $args->getKwargs())
+				? (new CallArgs([$this]))->withExtra($args)
 				: new CallArgs([$this]);
+
 			$result = $fn->invoke($context, $newArgs, $callsite);
 
 			if ($init = $result->attrGet(MagicStrings::MAGICMETHOD_INIT)) {