vrana           Fri Jun 24 10:53:00 2005 EDT

  Modified files:              
    /phpdoc/scripts     check-references.php 
  Log:
  Expand macros only if available
  
http://cvs.php.net/diff.php/phpdoc/scripts/check-references.php?r1=1.19&r2=1.20&ty=u
Index: phpdoc/scripts/check-references.php
diff -u phpdoc/scripts/check-references.php:1.19 
phpdoc/scripts/check-references.php:1.20
--- phpdoc/scripts/check-references.php:1.19    Fri Jun 24 09:50:20 2005
+++ phpdoc/scripts/check-references.php Fri Jun 24 10:52:58 2005
@@ -176,7 +176,7 @@
 $source_types = array(); // array("function_name" => array("type_spec", 
filename, lineno), ...)
 $return_types = array(); // array("function_name" => array("doc_type", 
filename, lineno), ...)
 $source_arg_counts = array(); // array("function_name" => 
array(disallowed_count => true, ...), ...)
-//~ foreach (array("$pecl_dir/standard") as $dirname) {
+//~ foreach (array("$phpsrc_dir/ext/standard") as $dirname) {
 foreach (array_merge(array($zend_dir), glob("$phpsrc_dir/ext/*", 
GLOB_ONLYDIR), glob("$pecl_dir/*", GLOB_ONLYDIR), glob("$phpsrc_dir/sapi/*", 
GLOB_ONLYDIR)) as $dirname) {
        if (dirname($dirname) == $pecl_dir && 
!file_exists("$phpdoc_dir/reference/" . strtolower(basename($dirname)))) {
                continue; // skip undocumented PECL extensions
@@ -208,7 +208,9 @@
        }
        
        foreach ($files as $filename => $file) {
-               $file = preg_replace_callback('~\\b(' . implode('|', 
array_keys($macros)) . ')\\b(\\(.*\\))?~', 'expand_macros', $file);
+               if ($macros) {
+                       $file = preg_replace_callback('~\\b(' . implode('|', 
array_keys($macros)) . ')\\b(\\(.*\\))?~', 'expand_macros', $file);
+               }
                
                // references
                preg_match_all("~^[ 
\t]*(?:ZEND|PHP)_FE\\((\\w+)\\s*,\\s*(\\w+)\\s*[,)]~m", $file, $matches, 
PREG_SET_ORDER);

Reply via email to