docgen updates and preparing to parse Pixi source.

photonstorm · photonstorm · commit f73bf702d5b7 · 2014-09-16T00:28:25.000+01:00
diff --git a/docgen/index.php b/docgen/index.php
@@ -24,7 +24,8 @@
 
     function dirToArray($dir) { 
 
-        $ignore = array('.', '..', 'pixi');
+        // $ignore = array('.', '..', 'pixi');
+        $ignore = array('.', '..');
         $fileIgnore = array('p2.js');
         $result = array(); 
         $root = scandir($dir); 
@@ -51,20 +52,35 @@ function dirToArray($dir) {
         return $result; 
     }
 
-    function displaySection($title, $files) {
+    function displaySection($title, $files, $parent = "") {
+
+        if ($title === "")
+        {
+            echo "<h1>Phaser v2.1.1</h1>";
+        }
+        else
+        {
+            echo "<h2>$title</h2>";
+        }
 
-        echo "<h2>$title</h2>";
         echo "<ul>";
 
         foreach ($files as $key => $file)
         {
             if (is_array($file))
             {
-                displaySection($key, $file);
+                displaySection($key, $file, $title);
             }
             else
             {
-                echo "<li><a href=\"view.php?src=$title/$file\">$file</a></li>";
+                $src = $title . "/" . $file;
+
+                if ($parent !== "")
+                {
+                    $src = $parent . "/" . $src;
+                }
+
+                echo "<li><a href=\"view.php?src=$src\">$file</a></li>";
             }
         }
 
@@ -75,7 +91,7 @@ function displaySection($title, $files) {
     $path = realpath('../src');
     $files = dirToArray($path);
 
-    displaySection("Phaser v2.1.1", $files);
+    displaySection("", $files, "");
 
     // echo "<pre>";
     // print_r($files);
diff --git a/docgen/src/Method.php b/docgen/src/Method.php
@@ -12,6 +12,8 @@ class Method
         public $isProtected = false;
         public $isPrivate = false;
 
+        public $isStatic = false;
+
         public function __construct($block)
         {
             //  Because zero offset + allowing for final line
@@ -25,6 +27,25 @@ public function __construct($block)
             {
                 $name = substr($name, $equals + 1);
             }
+            else
+            {
+                $equals = strrpos($name, '.');
+
+                if ($equals > 0)
+                {
+                    $name = substr($name, $equals + 1);
+                }
+                else
+                {
+                    //  No # and no . so we'll assume "@method name" format
+                    $equals = strrpos($name, ' ');
+
+                    if ($equals > 0)
+                    {
+                        $name = substr($name, $equals + 1);
+                    }
+                }
+            }
 
             $this->name = $name;
 
@@ -46,6 +67,11 @@ public function __construct($block)
                 $this->isPrivate = true;
             }
 
+            if ($block->getTypeBoolean('@static'))
+            {
+                $this->isStatic = true;
+            }
+
             $this->title = array("name" => $this->name, "visibility" => $this->getVisibility());
 
             $this->help = $block->cleanContent();
@@ -77,6 +103,7 @@ public function getArray()
         {
             return array(
                 'title' => $this->title,
+                'static' => $this->isStatic,
                 'returns' => $this->returns,
                 'help' => implode('\n', $this->help),
                 'line' => $this->line,
diff --git a/docgen/src/Processor.php b/docgen/src/Processor.php
@@ -60,7 +60,10 @@ private function scanFile() {
                     //  The first element is always the opening /** so remove it
                     array_shift($chunk);
 
-                    $this->blocks[] = new Block($openLine, $closeLine, $js[$i + 1], $chunk);
+                    if (isset($js[$i + 1]))
+                    {
+                        $this->blocks[] = new Block($openLine, $closeLine, $js[$i + 1], $chunk);
+                    }
                 }
                 else
                 {
diff --git a/docgen/view.php b/docgen/view.php
@@ -51,6 +51,8 @@
     </head>
     <body>
 
+    <a href="index.php">Index</a>
+
     <h1><?php echo $src ?></h1>
 
 <?php

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ private function scanFile() {`
`60`	`60`	`// The first element is always the opening /** so remove it`
`61`	`61`	`array_shift($chunk);`
`62`	`62`
`63`		`- $this->blocks[] = new Block($openLine, $closeLine, $js[$i + 1], $chunk);`
	`63`	`+ if (isset($js[$i + 1]))`
	`64`	`+ {`
	`65`	`+ $this->blocks[] = new Block($openLine, $closeLine, $js[$i + 1], $chunk);`
	`66`	`+ }`
`64`	`67`	`}`
`65`	`68`	`else`
`66`	`69`	`{`