Remove use native_types, add use varint_types

benchmark/bench.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function simple(): void
 {
     $a = 0;

benchmark/micro_bench.php

@@ -1,8 +1,6 @@
 <?php
 declare(strict_types=1);
 
-use native_types;
-
 function hallo() {
 }
 

examples/array-loop/main.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function main(int $argc, array $argv): void
 {
     $u = (int)$argv[2];

examples/array-loop/std-array.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function main()
 {
     $array = std::array(std::array(std::array(Type::Int, 13), 16), 19);

examples/debug/mem_leak.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function gen_random (int $n) {
     global $LAST;
     return( ($n * ($LAST = ($LAST * IA + IC) % IM)) / IM );

examples/error/unset-int-prop.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class Test {
     public int $x = 100;
 

examples/error/unset-int-var.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     $x = 100;

examples/high-precision.php

@@ -1,7 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void
 {
     $integer = std::bigInt("123456789012345678901234567890");

examples/perf/class-static-prop.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class Foo {
     static public int $a;
     static public object $o;

examples/perf/code.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 const N = 1000_0000;
 const ROUNDS = 5;
 

examples/perf/empty_class_static_prop.php

@@ -1,9 +1,7 @@
 <?php
-use native_types;
 class Foo {
     static public int $a;
 }
-
 function main() {
     $s = microtime( true);
     $n = 1000_0000;

examples/pi.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     ini_set("precision", 17);

examples/wasm-hello/src/WasiDemo.php

@@ -1,8 +1,6 @@
 <?php
-
 declare(strict_types=1);
 
-use native_types;
 
 final class WasiDemo
 {

phpunit/code/assign-divide-by-zero.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {

phpunit/code/assign-modulo-by-zero.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {

phpunit/code/big-numeric/bigfloat-pow-operator.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $bigfloat = std::bigFloat('2');

phpunit/code/big-numeric/decimal-pow-operator.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $decimal = std::decimal('2');

phpunit/code/big-numeric/mixed-big-comparison.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $bigint = std::bigInt('2');

phpunit/code/bigfloat-unsupported-mod.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigFloat("3.14");

phpunit/code/bigfloat-unsupported-shift.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigFloat("10.0");

phpunit/code/bigint-post-inc.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigInt(100);

phpunit/code/bigint-pre-inc.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigInt(100);

phpunit/code/constant-overflow-native-add.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-div-subtree.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-div.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-mod.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-mul.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-neg.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-nested-add.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-nested-div.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-nested-mod.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-nested-zero.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-nonconstant.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function addToMaximum(int $value): int
 {

phpunit/code/constant-overflow-native-ok.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-native-sub.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/constant-overflow-warning.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 declare(strict_types=1);
 

phpunit/code/control-flow/loop-switch-continue.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function switch_continue_in_for(): void
 {
     for ($i = 0; $i < 2; $i++) {

phpunit/code/control-flow/standalone-switch-continue.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function standalone_switch_continue(int $value): void
 {
     switch ($value) {

phpunit/code/decimal-pre-dec.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("100");

phpunit/code/decimal-unsupported-bitand.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("3.14");

phpunit/code/decimal-unsupported-bitor.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("100");

phpunit/code/divide-by-zero-any.php

@@ -0,0 +1,7 @@
+<?php
+
+function divideByZeroAny(): void
+{
+    $value = std::any(10);
+    var_dump($value / 0);
+}

phpunit/code/divide-by-zero-int.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {

phpunit/code/divide-by-zero-string.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {

phpunit/code/dynamic-scalar-binary-operands.php

@@ -1,5 +1,7 @@
 <?php
 
+use varint_types;
+
 function recursivePhpInt(int $value): int
 {
     return $value < 2

phpunit/code/hot-path-codegen.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function hotPathTrace(string $value): string
 {
     return $value;

phpunit/code/local-literal-declaration-initializer-varint.php

@@ -1,8 +1,8 @@
 <?php
 
-use native_types;
+use varint_types;
 
-function localLiteralDeclarationInitializerNative(): void
+function localLiteralDeclarationInitializerVarInt(): void
 {
     $integer = 42;
     $negative = -7;

phpunit/code/local-literal-declaration-initializer.php

@@ -8,6 +8,7 @@ function localLiteralDeclarationInitializer(): void
     $boolean = true;
     $string = 'hello';
     $nullValue = null;
+    $explicitAny = std::any(100);
 
     if ($boolean) {
         $nested = 9;
@@ -24,5 +25,6 @@ function localLiteralDeclarationInitializer(): void
         $nullValue,
         $nested,
         $computed,
+        $explicitAny,
     );
 }

phpunit/code/modulo-by-zero-int.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {

phpunit/code/native-bool-array-dim-write.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = false;

phpunit/code/native-float-array-dim-write.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = 1.5;

phpunit/code/native-int-array-dim-write.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = 1;

phpunit/code/native-method-unset-keeps-optimization.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativeMethodUnsetKeepsOptimization
 {
     public int $value = 7;

phpunit/code/native-property-assign-op-class-const.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyAssignOpClassConstBox
 {
     public int $flags = 7;

phpunit/code/native-property-assign-op-int.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyAssignOpIntBox
 {
     public int $value = 1;

phpunit/code/native-property-full-name.php

@@ -1,7 +1,5 @@
 <?php
-
 namespace NativePropSource {
-    use native_types;
 
     class Target
     {
@@ -12,7 +10,6 @@ namespace NativePropSource {
 }
 
 namespace NativePropSource\Target {
-    use native_types;
     use NativePropSource\Target;
 
     class Child extends Target

phpunit/code/native-property-private-other-class.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePrivateOwner
 {
     private int $value = 1;

phpunit/code/native-property-protected-unrelated-class.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativeProtectedOwner
 {
     protected int $value = 1;

phpunit/code/native-property-static-type-mismatch.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyStaticTypeMismatchBox
 {
     public int $value = 0;

phpunit/code/native-property-this-write-conversion.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyThisWriteConversionBox
 {
     public int $value = 0;

phpunit/code/native-property-unset-disables-hoist.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyUnsetDisablesHoist
 {
     public int $value = 7;

phpunit/code/native-property-write-conversion.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyWriteConversionBox
 {
     public int $value = 0;

phpunit/code/native-scalar-binary-operands.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function recursiveNativeInt(int $value): int
 {
     return $value < 2

phpunit/code/nullsafe-nested-private-property.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NullsafeNestedOwner
 {
     public NullsafeNestedChild $child;

phpunit/code/nullsafe-private-property.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NullsafePrivateOwner
 {
     private int $value = 1;

phpunit/code/object-prop-subclass-mismatch.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class TypedObjectPropBase
 {
 }

phpunit/code/php-int-max-fold-global.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function lowercaseIsRuntime()
 {

phpunit/code/php-int-max-fold-namespace.php

@@ -2,6 +2,8 @@
 
 namespace FoldNs;
 
+use varint_types;
+
 const PHP_INT_MAX = 5;
 
 function shadowedFold(): int

phpunit/code/re-assign-array-to-bool.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;

phpunit/code/re-assign-array-to-float.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;

phpunit/code/re-assign-array-to-int.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;

phpunit/code/re-assign-array-to-obj.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();

phpunit/code/re-assign-bool-to-array.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];

phpunit/code/re-assign-bool-to-obj.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();

phpunit/code/re-assign-float-to-array.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];

phpunit/code/re-assign-float-to-obj.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();

phpunit/code/re-assign-int-to-array.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];

phpunit/code/re-assign-int-to-obj.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();

phpunit/code/re-assign-obj-to-array.php

@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     $obj = [];

phpunit/code/re-assign-obj-to-bool.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;

phpunit/code/re-assign-obj-to-float.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;

phpunit/code/re-assign-obj-to-int.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;

phpunit/code/re-assign-obj-to-str.php

@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $x = "hello";

phpunit/code/re-assign-str-to-array.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];

phpunit/code/re-assign-str-to-bool.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;

phpunit/code/re-assign-str-to-float.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;

phpunit/code/re-assign-str-to-int.php

@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;

phpunit/code/readonly-property-no-native-ref.php

@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class ReadonlyPropertyNoNativeRef
 {
     public readonly int $integer;

phpunit/code/removed-native-types.php

@@ -0,0 +1,7 @@
+<?php
+
+use native_types;
+
+function removedNativeTypes(): void
+{
+}

phpunit/code/shift-boundary-native-neg-left.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-neg-right.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-negative.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-nested-neg-right.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-nested-overflow.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-ok.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-overflow.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-sign-bit.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-native-wrapped-overflow.php

@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {

phpunit/code/shift-boundary-warning.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 declare(strict_types=1);
 

phpunit/code/typed-scalar-arithmetic-codegen.php

@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function divTypedInts(int $a, int $b): float
 {