Convert main code to PHP 5.4 syntax

Author: thekid

src/main/php/xp/compiler/CompilationProfile.class.php

@@ -10,9 +10,9 @@
  * * Optimizations to apply
  */
 class CompilationProfile extends \lang\Object {
-  public $warnings= array();
-  public $errors= array();
-  public $optimizations= array();
+  public $warnings= [];
+  public $errors= [];
+  public $optimizations= [];
 
   /**
    * Add a check that will produce a warning

src/main/php/xp/compiler/CompilationProfileReader.class.php

@@ -8,7 +8,7 @@
  * @test    xp://net.xp_lang.tests.CompilationProfileReaderTest
  */
 class CompilationProfileReader extends \lang\Object {
-  protected $sources= array();
+  protected $sources= [];
 
   /**
    * Add source properties

src/main/php/xp/compiler/JitClassLoader.class.php

@@ -121,7 +121,7 @@ public function packageContents($package) {
     // List directory contents, replacing compileable source files with 
     // class file names. These of course don't exist yet, but will be 
     // compiled on demand
-    $return= array();
+    $return= [];
     $dir= strtr($package, '.', DIRECTORY_SEPARATOR);
     foreach ($this->files->getSourcePaths() as $path) {
       if (!is_dir($d= $path.$dir.DIRECTORY_SEPARATOR)) continue;
@@ -189,15 +189,15 @@ public function loadClass0($class) {
       throw new ClassFormatException('Cannot compile '.$source->getURI().': '.$e->formattedErrors(''), $e);
     } catch (FormatException $e) {
       $this->debug && $e->printStackTrace();
-      throw new JitCompilationError($class, array($this), $this->emitter->messages(), $e);
+      throw new JitCompilationError($class, [$this], $this->emitter->messages(), $e);
     }
 
     // Clean up
     unset($this->source[$class]);
 
     // Define type
     $this->debug && fputs(STDERR, $r->type()->toString()."\n");
-    $r->executeWith(array());
+    $r->executeWith([]);
     \xp::$cl[$class]= $this->getClassName().'://'.$this->instanceId();
     return $r->type()->literal();
   }
@@ -240,7 +240,7 @@ public function instanceId() {
    * @return  lang.IClassLoader
    */
   public static function instanceFor($path, $debug= false) {
-    static $pool= array();
+    static $pool= [];
 
     if (!isset($pool[$path.$debug])) {
       $pool[$path.$debug]= new self($path, $debug);

src/main/php/xp/compiler/Runner.class.php

@@ -94,8 +94,8 @@ static function __static() {
    */
   protected static function textOf($markup) {
     return strip_tags(preg_replace(
-      array('#<pre>#', '#</pre>#', '#<li>#'),
-      array(self::$line, self::$line, '* '),
+      ['#<pre>#', '#</pre>#', '#<li>#'],
+      [self::$line, self::$line, '* '],
       trim($markup)
     ));
   }
@@ -106,9 +106,9 @@ protected static function textOf($markup) {
    */
   protected static function showUsage() {
     $class= new \lang\XPClass(__CLASS__);
-    Console::$err->writeLine(strtr(self::textOf($class->getComment()), array(
+    Console::$err->writeLine(strtr(self::textOf($class->getComment()), [
       '{{VERSION}}' => $class->getClassLoader()->getResource('VERSION')
-    )));
+    ]));
 
     // List supported syntaxes
     Console::$err->writeLine(self::$line);
@@ -135,7 +135,7 @@ protected static function fromFolder($uri, $recursive) {
       }
     }
 
-    $files= array();
+    $files= [];
     $it= new FilteredIOCollectionIterator(new FileCollection($uri), $filter, $recursive);
     foreach ($it as $element) {
       $files[]= new FileSource(new File($element->getURI()));
@@ -150,7 +150,7 @@ protected static function fromFolder($uri, $recursive) {
    * @return  xp.compiler.io.FileManager
    */
   protected static function declaringFileManager() {
-    return newinstance('xp.compiler.io.FileManager', array(), '{
+    return newinstance('xp.compiler.io.FileManager', [], '{
       public $declared= array();
       public function write($r, \io\File $target) {
         $r->executeWith(array());
@@ -183,7 +183,7 @@ public static function main(array $args) {
     $profiles= ['default'];
     $emitter= 'php5.5';
     $result= function($success) { return $success ? 0 : 1; };
-    $files= array();
+    $files= [];
     $listener= new DefaultDiagnosticListener(Console::$out);
     for ($i= 0, $s= sizeof($args); $i < $s; $i++) {
       if ('-?' == $args[$i] || '--help' == $args[$i]) {
@@ -222,7 +222,7 @@ public static function main(array $args) {
         $manager= self::declaringFileManager();
         $result= function($success, $argv) use($manager) {
           if (!$success) return 1;
-          return (int)$manager->declared[0]->getMethod('main')->invoke(null, array($argv));
+          return (int)$manager->declared[0]->getMethod('main')->invoke(null, [$argv]);
         };
         break;
       } else if ('-w' == $args[$i]) {
@@ -231,7 +231,7 @@ public static function main(array $args) {
         $manager= self::declaringFileManager();
         $result= function($success, $argv) use($manager) {
           if (!$success) return 1;
-          Console::writeLine($manager->declared[0]->getMethod('main')->invoke(null, array($argv)));
+          Console::writeLine($manager->declared[0]->getMethod('main')->invoke(null, [$argv]));
           return 0;
         };
         break;

src/main/php/xp/compiler/Syntax.class.php

@@ -6,7 +6,7 @@
  * Syntax base class
  */
 abstract class Syntax extends \lang\Object {
-  private static $syntaxes= array();
+  private static $syntaxes= [];
   protected $parser= null;
   protected $name;
 

src/main/php/xp/compiler/ast/AnnotationNode.class.php

@@ -15,5 +15,5 @@
  */
 class AnnotationNode extends Node {
   public $type       = null;
-  public $parameters = array();
+  public $parameters = [];
 }

src/main/php/xp/compiler/ast/ArrayNode.class.php

@@ -21,7 +21,7 @@ class ArrayNode extends Node implements Resolveable {
    * @return  var
    */
   public function resolve() {
-    $resolved= array();
+    $resolved= [];
     foreach ($this->values as $i => $value) {
       if (!$value instanceof Resolveable) {
         throw new \lang\IllegalStateException('Value at offset '.$i.' is not resolveable: '.\xp::stringOf($value));

src/main/php/xp/compiler/ast/ConstructorNode.class.php

@@ -6,7 +6,7 @@
 class ConstructorNode extends RoutineNode {
   public
     $modifiers  = 0,
-    $parameters = array();
+    $parameters = [];
 
   /**
    * Returns this members's name

src/main/php/xp/compiler/ast/DoNode.class.php

@@ -19,7 +19,7 @@ class DoNode extends Node {
    * @param   xp.compiler.ast.Node expression
    * @param   xp.compiler.ast.Node[] statements
    */
-  public function __construct(Node $expression= null, $statements= array()) {
+  public function __construct(Node $expression= null, $statements= []) {
     $this->expression= $expression;
     $this->statements= $statements;
   }

src/main/php/xp/compiler/ast/IndexerNode.class.php

@@ -28,7 +28,7 @@
 class IndexerNode extends TypeMemberNode {
   public $type= null;
   public $parameter= null;
-  public $handlers= array();
+  public $handlers= [];
 
   /**
    * Returns this routine's name