[PHP-CVS] cvs: php4 /pear/XML Parser.php

[Stig Bakken]

ssb             Sun Apr  8 00:40:21 2001 EDT

  Modified files:              
    /php4/pear/XML      Parser.php 
  Log:
  * indentation and inline doc fixes
  
  
Index: php4/pear/XML/Parser.php
diff -u php4/pear/XML/Parser.php:1.10 php4/pear/XML/Parser.php:1.11
--- php4/pear/XML/Parser.php:1.10       Thu Mar 15 12:39:14 2001
+++ php4/pear/XML/Parser.php    Sun Apr  8 00:40:21 2001
@@ -25,7 +25,6 @@
  * based on the bundled expat library.
  *
  * @author  Stig Bakken <[EMAIL PROTECTED]>
- * @version $id $
  * @todo    Tests that need to be made:
  *          - error class
  *          - mixing character encodings
@@ -37,28 +36,22 @@
     // {{{ properties
 
     /**
-    * XML parser handle
-    *
-    * @var  resource  xml_parser
-    */
+     * @var  resource  XML parser handle
     var $parser;
     
     /**
-    *
-    * @var  resource    fopen
-    */
+     * @var  resource  File handle if parsing from a file
+     */
     var $fp;
     
     /**
-    *
-    * @var  boolean
-    */
+     * @var  boolean  Whether to do case folding
+     */
     var $folding = true;
     
     /**
-    *
-    * @var  string
-    */
+     * @var  string  Mode of operation, one of "event" or "func"
+     */
     var $mode;
     
     
@@ -68,13 +61,13 @@
     * @var  array
     */        
     var $handler = array(
-                            "character_data_handler"            => "cdataHandler",
-                            "default_handler"                   => "defaultHandler",
-                            "processing_instruction_handler"    => "piHandler",
-                            "unparsed_entitry_decl_handler"     => "unparsedHandler",
-                            "notation_decl_handler"             => "notationHandler",
-                            "external_entity_ref_handler"       => "entityrefHandler"
-                        );
+        "character_data_handler"            => "cdataHandler",
+        "default_handler"                   => "defaultHandler",
+        "processing_instruction_handler"    => "piHandler",
+        "unparsed_entitry_decl_handler"     => "unparsedHandler",
+        "notation_decl_handler"             => "notationHandler",
+        "external_entity_ref_handler"       => "entityrefHandler"
+    );
     
 
     // }}}
@@ -87,21 +80,17 @@
     * @param    string
     * @throws   XML_Parser_Error
     */
-    function XML_Parser($charset = 'UTF-8', $mode = "event") {
+    function XML_Parser($charset = 'UTF-8', $mode = "event")
+    {
+        $$this->PEAR();
         
-        $this->PEAR();
-        
         $xp = @xml_parser_create($charset);
         if (is_resource($xp)) {
-        
             $this->parser = $xp;
             $this->setMode($mode);
             xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
-            
         } else {
-            
-            return new XML_Parser_Error("Can't create xml parser");
-            
+            return new XML_Parser_Error("Can not create xml parser");
         }
         
     }
@@ -251,13 +240,12 @@
     // }}}
     // {{{ funcEndHandler()
 
-    function funcEndHandler($xp, $elem) {
-    
+    function funcEndHandler($xp, $elem)
+    {
         $func = $elem . '_';
         if (method_exists($this, $func)) {
             call_user_method($func, $this, $xp, $elem);
         }
-        
     }
     
     
@@ -265,7 +253,8 @@
     * 
     * @abstract
     */
-    function StartHandler($xp, $elem, $attribs) {
+    function StartHandler($xp, $elem, $attribs)
+    {
         return NULL;
     } 
     
@@ -274,7 +263,8 @@
     *
     * @abstract
     */
-    function EndHandler($xp, $elem) {
+    function EndHandler($xp, $elem)
+    {
         return NULL;
     }
     
@@ -305,4 +295,4 @@
 
     // }}}
 }
-?>
\ No newline at end of file
+?>



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]