Refactor: Class parser

src/main/php/lang/XPClass.class.php

@@ -467,7 +467,6 @@ public function getDeclaredInterfaces() {
     }
     return $r;
   }
-
 
   /**
    * Retrieves the api doc comment for this class. Returns NULL if
@@ -476,8 +475,17 @@ public function getDeclaredInterfaces() {
    * @return  string
    */
   public function getComment() {
-    if (!($details= self::detailsForClass($this->name))) return null;
-    return $details['class'][DETAIL_COMMENT];
+    $comment= $this->_reflect->getDocComment();
+    if (false === $comment) {
+      $class= $this->_reflect->getName();
+      return isset(\xp::$meta[$class]['class'][DETAIL_COMMENT]) ? \xp::$meta[$class]['class'][DETAIL_COMMENT]: null;
+    } else {
+      return trim(preg_replace('/\n\s+\* ?/', "\n", "\n".substr(
+        $comment,
+        4,                              // "/**\n"
+        strpos($comment, '* @')- 2      // position of first details token
+      )));
+    }
   }
 
   /**

src/main/php/lang/codedom/AnnotationArray.class.php

@@ -0,0 +1,43 @@
+<?php namespace lang\codedom;
+
+use util\Objects;
+
+class AnnotationArray extends \lang\Object {
+  private $backing;
+
+  public function __construct($value) {
+    $this->backing= $value;
+  }
+
+  public function resolve($context, $imports) {
+    $resolved= [];
+    foreach ($this->backing as $value) {
+      $k= key($value);
+      if (0 === $k) {
+        $resolved[]= current($value)->resolve($context, $imports);
+      } else {
+        $resolved[$k]= current($value)->resolve($context, $imports);
+      }
+    }
+    return $resolved;
+  }
+
+  /**
+   * Creates a string representation
+   *
+   * @return string
+   */
+  public function toString() {
+    return $this->getClassName().'('.Objects::stringOf($this->backing).')';
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && Objects::equal($this->backing, $cmp->backing);
+  }
+}

src/main/php/lang/codedom/AnnotationClosure.class.php

@@ -0,0 +1,50 @@
+<?php namespace lang\codedom;
+
+use util\Objects;
+use lang\IllegalStateException;
+
+class AnnotationClosure extends \lang\Object {
+  private $signature, $code;
+
+  public function __construct($signature, $code) {
+    $this->signature= $signature;
+    $this->code= $code;
+  }
+
+  public function resolve($context, $imports) {
+    $func= eval('return function('.$this->signature.') {'.$this->code.'};');
+    if (!($func instanceof \Closure)) {
+      if ($error= error_get_last()) {
+        set_error_handler('__error', 0);
+        trigger_error('clear_last_error');
+        restore_error_handler();
+      } else {
+        $error= ['message' => 'Syntax error'];
+      }
+      throw new IllegalStateException('In `'.$this->code.'`: '.ucfirst($error['message']));
+    }
+    return $func;
+  }
+
+  /**
+   * Creates a string representation
+   *
+   * @return string
+   */
+  public function toString() {
+    return $this->getClassName().'('.Objects::stringOf($this->backing).')';
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && (
+      $this->signature === $cmp->signature &&
+      $this->code === $cmp->code
+    );
+  }
+}

src/main/php/lang/codedom/AnnotationConstant.class.php

@@ -0,0 +1,35 @@
+<?php namespace lang\codedom;
+
+class AnnotationConstant extends \lang\Object {
+  private $name;
+
+  public function __construct($name) {
+    $this->name= $name;
+  }
+
+  public function resolve($context, $imports) {
+    if (defined($this->name)) {
+      return constant($this->name);
+    }
+    raise('lang.ElementNotFoundException', 'Undefined constant "'.$this->name.'"');
+  }
+
+  /**
+   * Creates a string representation
+   *
+   * @return string
+   */
+  public function toString() {
+    return $this->getClassName().'('.$this->name.')';
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && $this->name === $cmp->name;
+  }
+}

src/main/php/lang/codedom/AnnotationDeclaration.class.php

@@ -0,0 +1,40 @@
+<?php namespace lang\codedom;
+
+use util\Objects;
+
+class AnnotationDeclaration extends \lang\Object {
+  private $target, $name, $value;
+
+  public function __construct($target, $name, \lang\Generic $value) {
+    $this->target= $target;
+    $this->name= $name;
+    $this->value= $value;
+  }
+
+  /** @return string */
+  public function target() { return $this->target; }
+
+  /** @return string */
+  public function name() { return $this->name; }
+
+  /** @return string */
+  public function value() { return $this->value; }
+
+  public function resolve($context, $imports) {
+    return $this->value->resolve($context, $imports);
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && (
+      $this->target === $cmp->target &&
+      $this->name === $cmp->name &&
+      Objects::equal($this->value, $cmp->value)
+    );
+  }
+}

src/main/php/lang/codedom/AnnotationInstance.class.php

@@ -0,0 +1,46 @@
+<?php namespace lang\codedom;
+
+use lang\Objects;
+
+class AnnotationInstance extends \lang\Object { use ResolvingType;
+  private $type;
+
+  public function __construct($type, $arguments) {
+    $this->type= $type;
+    $this->arguments= $arguments;
+  }
+
+  public function resolve($context, $imports) {
+    $type= $this->typeOf($this->type, $context, $imports);
+    if ($type->hasConstructor()) {
+      return $type->getConstructor()->newInstance(array_map(
+        function($arg) use($context, $imports) { return $arg->resolve($context, $imports); },
+        $this->arguments
+      ));
+    } else {
+      return $type->newInstance();
+    }
+  }
+
+  /**
+   * Creates a string representation
+   *
+   * @return string
+   */
+  public function toString() {
+    return $this->getClassName().'(new '.$this->type.'('.Objects::stringOf($this->arguments).'))';
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && (
+      Objects::equal($this->arguments, $cmp->arguments) &&
+      Objects::equal($this->type, $cmp->type)
+    );
+  }
+}

src/main/php/lang/codedom/AnnotationMember.class.php

@@ -0,0 +1,54 @@
+<?php namespace lang\codedom;
+
+use lang\Objects;
+use lang\IllegalAccessException;
+use lang\reflect\Modifiers;
+
+class AnnotationMember extends \lang\Object { use ResolvingType;
+  private $type;
+
+  public function __construct($type, $name) {
+    $this->type= $type;
+    $this->name= $name;
+  }
+
+  public function resolve($context, $imports) {
+    $type= $this->typeOf($this->type, $context, $imports);
+    if ('$' === $this->name{0}) {
+      $field= $type->getField(substr($this->name, 1));
+      $m= $field->getModifiers();
+      if ($m & MODIFIER_PUBLIC) {
+        return $field->get(null);
+      } else if (($m & MODIFIER_PROTECTED) && $type->isAssignableFrom($context)) {
+        return $field->setAccessible(true)->get(null);
+      } else if (($m & MODIFIER_PRIVATE) && $type->getName() === $context) {
+        return $field->setAccessible(true)->get(null);
+      } else {
+        throw new IllegalAccessException(sprintf(
+          'Cannot access %s field %s::$%s',
+          implode(' ', Modifiers::namesOf($m)),
+          $type->getName(),
+          $field->getName()
+        ));
+      }
+      return $type->getField(substr($this->name, 1))->setAccessible(true)->get(null);
+    } else if ('class' === $this->name) {
+      return ltrim($type->literal(), '\\');
+    } else {
+      return $type->getConstant($this->name);
+    }
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && (
+      $this->name === $cmp->name &&
+      $this->type === $cmp->type
+    );
+  }
+}

src/main/php/lang/codedom/AnnotationPairs.class.php

@@ -0,0 +1,38 @@
+<?php namespace lang\codedom;
+
+use util\Objects;
+
+class AnnotationPairs extends \lang\Object {
+  private $backing;
+
+  public function __construct($value) {
+    $this->backing= $value;
+  }
+
+  public function resolve($context, $imports) {
+    $resolved= [];
+    foreach ($this->backing as $pair) {
+      $resolved[key($pair)]= current($pair)->resolve($context, $imports);
+    }
+    return $resolved;
+  }
+
+  /**
+   * Creates a string representation
+   *
+   * @return string
+   */
+  public function toString() {
+    return $this->getClassName().'('.Objects::stringOf($this->backing).')';
+  }
+
+  /**
+   * Returns whether a given value is equal to this code unit
+   *
+   * @param  var $cmp
+   * @return bool
+   */
+  public function equals($cmp) {
+    return $cmp instanceof self && Objects::equal($this->backing, $cmp->backing);
+  }
+}