[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /PECL_Gen Extension.php XmlParser.php  /PECL_Gen/Element Class.php Function.php
From:       "Hartmut Holzgraefe" <hholzgra () php ! net>
Date:       2005-01-27 0:05:44
Message-ID: cvshholzgra1106784344 () cvsserver
[Download RAW message or body]

hholzgra		Wed Jan 26 19:05:44 2005 EDT

  Modified files:              
    /pecl/PECL_Gen	Extension.php XmlParser.php 
    /pecl/PECL_Gen/Element	Class.php Function.php 
  Log:
  various thinko fixes
  
http://cvs.php.net/diff.php/pecl/PECL_Gen/Extension.php?r1=1.18&r2=1.19&ty=u
Index: pecl/PECL_Gen/Extension.php
diff -u pecl/PECL_Gen/Extension.php:1.18 pecl/PECL_Gen/Extension.php:1.19
--- pecl/PECL_Gen/Extension.php:1.18	Wed Jan 26 18:56:56 2005
+++ pecl/PECL_Gen/Extension.php	Wed Jan 26 19:05:42 2005
@@ -16,7 +16,7 @@
 // | Authors: Hartmut Holzgraefe <hholzgra@php.net>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: Extension.php,v 1.18 2005/01/26 23:56:56 hholzgra Exp $
+// $Id: Extension.php,v 1.19 2005/01/27 00:05:42 hholzgra Exp $
 //
 
 // {{{ includes
@@ -49,7 +49,7 @@
  * A class that generates PECL extension soure and documenation files
  *
  * @access  public
- * @version $Id: Extension.php,v 1.18 2005/01/26 23:56:56 hholzgra Exp $
+ * @version $Id: Extension.php,v 1.19 2005/01/27 00:05:42 hholzgra Exp $
  */
 
 class PECL_Gen_Extension 
@@ -1421,29 +1421,6 @@
 
     // }}} 
 
-    /**
-     * Create code for private helper functions
-     *
-     * @access private
-     * @return string  code snippet
-     */
-
-    function private_functions_c() 
-    {
-        $code = "";
-
-        foreach ($this->private_functions as $name => $func) {
-            $code .= "
-/* {{{ $name() */
-".PECL_Gen_Tools_Indent::indent(0, $func->code).
-"/* }}} */
-
-";
-        }
-
-        return $code;
-    }
-
     // {{{ public functions
     /**
      * Create code for the exported PHP functions
@@ -1499,8 +1476,6 @@
             echo "ZEND_DECLARE_MODULE_GLOBALS({$this->name})\n\n";
         }
 
-        echo $this->private_functions_c();
-
         if (!empty($this->resources)) {
             foreach ($this->resources as $resource) {
                 echo $resource->c_code($this);
http://cvs.php.net/diff.php/pecl/PECL_Gen/XmlParser.php?r1=1.2&r2=1.3&ty=u
Index: pecl/PECL_Gen/XmlParser.php
diff -u pecl/PECL_Gen/XmlParser.php:1.2 pecl/PECL_Gen/XmlParser.php:1.3
--- pecl/PECL_Gen/XmlParser.php:1.2	Tue Nov 16 05:33:23 2004
+++ pecl/PECL_Gen/XmlParser.php	Wed Jan 26 19:05:42 2005
@@ -16,7 +16,7 @@
 // | Authors: Hartmut Holzgraefe <hholzgra@php.net>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: XmlParser.php,v 1.2 2004/11/16 10:33:23 hholzgra Exp $
+// $Id: XmlParser.php,v 1.3 2005/01/27 00:05:42 hholzgra Exp $
 //
 
     require_once "XML/Parser.php";
@@ -48,10 +48,9 @@
         /**
          * We collect cData in here
          *
-         * @access private
          * @var    string
          */
-        var $data = "";
+        private $data = "";
 
         /**
          * We also try to remember where cData started
http://cvs.php.net/diff.php/pecl/PECL_Gen/Element/Class.php?r1=1.4&r2=1.5&ty=u
Index: pecl/PECL_Gen/Element/Class.php
diff -u pecl/PECL_Gen/Element/Class.php:1.4 pecl/PECL_Gen/Element/Class.php:1.5
--- pecl/PECL_Gen/Element/Class.php:1.4	Wed Jan 26 18:56:57 2005
+++ pecl/PECL_Gen/Element/Class.php	Wed Jan 26 19:05:44 2005
@@ -16,7 +16,7 @@
 // | Authors: Hartmut Holzgraefe <hholzgra@php.net>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: Class.php,v 1.4 2005/01/26 23:56:57 hholzgra Exp $
+// $Id: Class.php,v 1.5 2005/01/27 00:05:44 hholzgra Exp $
 //
 
     require_once "PECL/Gen/Tools/Indent.php";
@@ -127,7 +127,7 @@
                 return $this->raiseError("'$interface' is not a valid interface name");
             }           
         
-            if (isset[$this->implements[$interface]]) {
+            if (isset($this->implements[$interface])) {
                 return $this->raiseError("interface '$interface' added twice");
             }
 
@@ -148,7 +148,7 @@
                 return $this->raiseError("argument is not PECL_Gen_Element_Property");
             }
             
-            if (isset[$this->properties[$property->getName()]]) {
+            if (isset($this->properties[$property->getName()])) {
                 return $this->raiseError("property '$property' already exists");
             }
 
@@ -169,7 +169,7 @@
                 return $this->raiseError("argument is not PECL_Gen_Element_Function");
             }
             
-            if (isset[$this->functions[$function->getName()]]) {
+            if (isset($this->functions[$function->getName()])) {
                 return $this->raiseError("member function '$function' already exists");
             }
 
http://cvs.php.net/diff.php/pecl/PECL_Gen/Element/Function.php?r1=1.20&r2=1.21&ty=u
Index: pecl/PECL_Gen/Element/Function.php
diff -u pecl/PECL_Gen/Element/Function.php:1.20 pecl/PECL_Gen/Element/Function.php:1.21
--- pecl/PECL_Gen/Element/Function.php:1.20	Wed Jan 26 18:56:57 2005
+++ pecl/PECL_Gen/Element/Function.php	Wed Jan 26 19:05:44 2005
@@ -16,7 +16,7 @@
 // | Authors: Hartmut Holzgraefe <hholzgra@php.net>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: Function.php,v 1.20 2005/01/26 23:56:57 hholzgra Exp $
+// $Id: Function.php,v 1.21 2005/01/27 00:05:44 hholzgra Exp $
 //
 
     require_once "PECL/Gen/Element.php";
@@ -866,7 +866,7 @@
                         $code .= "    if (ZEND_NUM_ARGS()>0)  {\n        WRONG_PARAM_COUNT;\n    }\n\n";
                     }
                 } else {
-                    if ($varargs) {
+                    if ($this->varargs) {
                         $argc = sprint("MIN(ZEND_NUM_ARGS(),%d)", count($this->params)-1);
                     } else {
                         $argc = "ZEND_NUM_ARGS()";
@@ -879,7 +879,7 @@
 
 ";
                     
-                    if ($varargs) {
+                    if ($this->varargs) {
                         // TODO can't do a zend_get_parameters_array with offset yet
                     }
                     

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic