MFH

Author: thekid

ChangeLog.md

@@ -8,6 +8,18 @@ XP Compiler ChangeLog
   its length. Includes support for static and instance methods as well as
   indirect references like `$closure(...)` and `self::{$expression}(...)`,
   see https://wiki.php.net/rfc/first_class_callable_syntax
+
+## 6.6.0 / 2021-07-10
+
+* Emit null-coalesce operator as `$a ?? $a= expression` instead of as
+  `$a= $a ?? expression`, saving one assignment operation for non-null
+  case. Applies to PHP 7.0, 7.1 and 7.2.
+  (@thekid)
+* Removed conditional checks for PHP 8.1 with native enum support, all
+  releases and builds available on CI systems now contain it.
+  (@thekid)
+* Increased test coverage significantly (to more than 90%), especially
+  for classes used by the compiler command line.
   (@thekid)
 
 ## 6.5.0 / 2021-05-22

src/main/php/lang/ast/Compiled.class.php

@@ -55,12 +55,12 @@ public function write($bytes) {
     $this->compiled.= $bytes;
   }
 
-  /** @return void */
+  /** @codeCoverageIgnore */
   public function flush() {
     // NOOP
   }
 
-  /** @return void */
+  /** @codeCoverageIgnore */
   public function close() {
     // NOOP
   }
@@ -77,12 +77,6 @@ public function stream_read($count) {
     return $chunk;
   }
 
-  /** @return [:var] */
-  public function url_stat($path) {
-    $opened= substr($path, strpos($path, '://') + 3);
-    return ['size' => self::$source[$opened]->getResourceAsStream($opened)->size()];
-  }
-
   /** @return [:var] */
   public function stream_stat() {
     return ['size' => strlen($this->compiled)];

src/main/php/lang/ast/CompilingClassloader.class.php

@@ -166,8 +166,8 @@ public function loadClass0($class) {
     try {
       include($this->version.'://'.$uri);
     } catch (ClassLoadingException $e) {
-      unset(\xp::$cl[$class]);
-      throw $e;
+      unset(\xp::$cl[$class]); // @codeCoverageIgnore
+      throw $e;                // @codeCoverageIgnore
     } catch (\Throwable $e) {
       unset(\xp::$cl[$class]);
       throw new ClassFormatException('Compiler error: '.$e->getMessage(), $e);

src/main/php/lang/ast/emit/PHP.class.php

@@ -364,72 +364,30 @@ protected function emitLambda($result, $lambda) {
   }
 
   protected function emitEnumCase($result, $case) {
-    $result->out->write('public static $'.$case->name.';');
+    $result->out->write('case '.$case->name);
+    if ($case->expression) {
+      $result->out->write('=');
+      $this->emitOne($result, $case->expression);
+    }
+    $result->out->write(';');
   }
 
   protected function emitEnum($result, $enum) {
     array_unshift($result->type, $enum);
     array_unshift($result->meta, []);
     $result->locals= [[], []];
 
-    $result->out->write('final class '.$this->declaration($enum->name).' implements \\'.($enum->base ? 'BackedEnum' : 'UnitEnum'));
-    $enum->implements && $result->out->write(', '.implode(', ', $enum->implements));
+    $result->out->write('enum '.$this->declaration($enum->name));
+    $enum->base && $result->out->write(':'.$enum->base);
+    $enum->implements && $result->out->write(' implements '.implode(', ', $enum->implements));
     $result->out->write('{');
 
-    $cases= [];
     foreach ($enum->body as $member) {
-      if ($member->is('enumcase')) $cases[]= $member;
       $this->emitOne($result, $member);
     }
 
-    // Constructors
-    if ($enum->base) {
-      $result->out->write('public $name, $value;');
-      $result->out->write('private static $values= [];');
-      $result->out->write('private function __construct($name, $value) {
-        $this->name= $name;
-        $this->value= $value;
-        self::$values[$value]= $this;
-      }');
-      $result->out->write('public static function tryFrom($value) {
-        return self::$values[$value] ?? null;
-      }');
-      $result->out->write('public static function from($value) {
-        if ($r= self::$values[$value] ?? null) return $r;
-        throw new \Error(\util\Objects::stringOf($value)." is not a valid backing value for enum \"".self::class."\"");
-      }');
-    } else {
-      $result->out->write('public $name;');
-      $result->out->write('private function __construct($name) {
-        $this->name= $name;
-      }');
-    }
-
-    // Prevent cloning enums
-    $result->out->write('public function __clone() {
-      throw new \Error("Trying to clone an uncloneable object of class ".self::class);
-    }');
-
-    // Enum cases
-    $result->out->write('public static function cases() { return [');
-    foreach ($cases as $case) {
-      $result->out->write('self::$'.$case->name.', ');
-    }
-    $result->out->write(']; }');
-
     // Initializations
     $result->out->write('static function __init() {');
-    if ($enum->base) {
-      foreach ($cases as $case) {
-        $result->out->write('self::$'.$case->name.'= new self("'.$case->name.'", ');
-        $this->emitOne($result, $case->expression);
-        $result->out->write(');');
-      }
-    } else {
-      foreach ($cases as $case) {
-        $result->out->write('self::$'.$case->name.'= new self("'.$case->name.'");');
-      }
-    }
     $this->emitInitializations($result, $result->locals[0]);
     $this->emitMeta($result, $enum->name, $enum->annotations, $enum->comment);
     $result->out->write('}} '.$enum->name.'::__init();');

src/main/php/lang/ast/emit/PHP70.class.php

@@ -11,7 +11,7 @@
  */
 class PHP70 extends PHP {
   use OmitPropertyTypes, OmitConstModifiers;
-  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteMultiCatch, RewriteClassOnObjects, RewriteExplicitOctals;
+  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteMultiCatch, RewriteClassOnObjects, RewriteExplicitOctals, RewriteEnums;
 
   /** Sets up type => literal mappings */
   public function __construct() {

src/main/php/lang/ast/emit/PHP71.class.php

@@ -9,7 +9,7 @@
  */
 class PHP71 extends PHP {
   use OmitPropertyTypes, CallablesAsClosures;
-  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals;
+  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals, RewriteEnums;
 
   /** Sets up type => literal mappings */
   public function __construct() {

src/main/php/lang/ast/emit/PHP72.class.php

@@ -9,7 +9,7 @@
  */
 class PHP72 extends PHP {
   use OmitPropertyTypes, CallablesAsClosures;
-  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals;
+  use RewriteNullCoalesceAssignment, RewriteLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals, RewriteEnums;
 
   /** Sets up type => literal mappings */
   public function __construct() {

src/main/php/lang/ast/emit/PHP74.class.php

@@ -8,7 +8,7 @@
  * @see  https://wiki.php.net/rfc#php_74
  */
 class PHP74 extends PHP {
-  use RewriteBlockLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals, CallablesAsClosures;
+  use RewriteBlockLambdaExpressions, RewriteClassOnObjects, RewriteExplicitOctals, RewriteEnums, CallablesAsClosures;
 
   /** Sets up type => literal mappings */
   public function __construct() {

src/main/php/lang/ast/emit/PHP80.class.php

@@ -9,7 +9,7 @@
  * @see  https://wiki.php.net/rfc#php_80
  */
 class PHP80 extends PHP {
-  use RewriteBlockLambdaExpressions, RewriteExplicitOctals, CallablesAsClosures;
+  use RewriteBlockLambdaExpressions, RewriteExplicitOctals, RewriteEnums, CallablesAsClosures;
 
   /** Sets up type => literal mappings */
   public function __construct() {

src/main/php/lang/ast/emit/PHP81.class.php

@@ -40,51 +40,6 @@ protected function emitArguments($result, $arguments) {
     }
   }
 
-  protected function emitEnumCase($result, $case) {
-
-    // TODO: Once enum PR is merged, remove this conditional and refactor the
-    // code into a `RewriteEnums` trait to be included for all other versions
-    if (Type::$ENUMS) {
-      $result->out->write('case '.$case->name);
-      if ($case->expression) {
-        $result->out->write('=');
-        $this->emitOne($result, $case->expression);
-      }
-      $result->out->write(';');
-    } else {
-      parent::emitEnumCase($result, $case);
-    }
-  }
-
-  protected function emitEnum($result, $enum) {
-
-    // TODO: Once enum PR is merged, remove this conditional and refactor the
-    // code into a `RewriteEnums` trait to be included for all other versions
-    if (Type::$ENUMS) {
-      array_unshift($result->type, $enum);
-      array_unshift($result->meta, []);
-      $result->locals= [[], []];
-
-      $result->out->write('enum '.$this->declaration($enum->name));
-      $enum->base && $result->out->write(':'.$enum->base);
-      $enum->implements && $result->out->write(' implements '.implode(', ', $enum->implements));
-      $result->out->write('{');
-
-      foreach ($enum->body as $member) {
-        $this->emitOne($result, $member);
-      }
-
-      // Initializations
-      $result->out->write('static function __init() {');
-      $this->emitInitializations($result, $result->locals[0]);
-      $this->emitMeta($result, $enum->name, $enum->annotations, $enum->comment);
-      $result->out->write('}} '.$enum->name.'::__init();');
-      array_shift($result->type);
-    } else {
-      parent::emitEnum($result, $enum);
-    }
-  }
-
   protected function emitNew($result, $new) {
     if ($new->type instanceof Node) {
       $result->out->write('new (');