[PHP-DOC] cvs: phpdoc /scripts functable.php

[Sean Coates]

sean            Tue Feb  6 06:32:56 2007 UTC

  Modified files:              
    /phpdoc/scripts     functable.php 
  Log:
  testing is good, mmkay? (seems to be working now, but please test with fresh 
eyes)
  
http://cvs.php.net/viewvc.cgi/phpdoc/scripts/functable.php?r1=1.11&r2=1.12&diff_format=u
Index: phpdoc/scripts/functable.php
diff -u phpdoc/scripts/functable.php:1.11 phpdoc/scripts/functable.php:1.12
--- phpdoc/scripts/functable.php:1.11   Tue Feb  6 05:36:24 2007
+++ phpdoc/scripts/functable.php        Tue Feb  6 06:32:56 2007
@@ -15,7 +15,7 @@
 +----------------------------------------------------------------------+
 | Authors:    Sean Coates <[EMAIL PROTECTED]>                               |
 +----------------------------------------------------------------------+
-$Id: functable.php,v 1.11 2007/02/06 05:36:24 sean Exp $
+$Id: functable.php,v 1.12 2007/02/06 06:32:56 sean Exp $
 */
 
 // direct the output of this file into phpdoc/phpbook/phpbook-xsl/version.xml
@@ -192,8 +192,8 @@
         ([^*;{]*)                   # suffix
         /ix';                           // }}} annoying folding
     $ZendFB_regex  = "`^[ \t]*(?:static)?[ 
\t]*(?:zend_)?function_entry\s*(?!php_hw_api_)\w+(?<!_class_functions)\s*\[\]\s*=\s*\{(.*)(?:\{\s*NULL\s*,\s*NULL\s*,\s*NULL\s*\}|\{0\})`msU";
-    $FB_instance_regex = "`^[ \t]*(?:($macronames)\s*\(|\{)\s*\"?(\w+)`im";
     $macronames = 
"ZEND_FE|ZEND_FALIAS|PHP_FE|PHP_FALIAS|ZEND_NAMED_FE|PHP_NAMED_FE|PHP_STATIC_FE";
+    $FB_instance_regex = "`^[ \t]*(?:($macronames)\s*\(|\{)\s*\"?(\w+)`im";
 
     $files = get_src_files($path);
 
@@ -234,16 +234,15 @@
         // function blocks
         $file_contents = file_get_contents($f);
         if (preg_match_all($ZendFB_regex, $file_contents, $matches)) {
-            foreach ($matches[0] as $mk => $mv) {
-                $block_titles[$mk] = strtok($mv, "\n");
-            }
-            $tok = strtok($matches[1], "\n");
+            $tok = strtok($matches[1][0], "\n");
             while ($tok) {
                 if (preg_match($FB_instance_regex, $tok, $matches)) {
+                    $func = strtolower($matches[2]);
                     if (!in_array($matches[2], $protoFuncs)) {
+                        fwrite(STDERR, "Missing proto: $func\n");
                         $funcs[] = array(
                             'file' => substr($f, strlen(SRC_DIR) + 1),
-                            'func' => strtolower($matches[2]),
+                            'func' => $func,
                         );
                     }
                 }