cvs: php-src /ext/xmlreader php_xmlreader.c php_xmlreader.h /ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php

rrichards Thu Oct 13 17:19:14 2005 EDT Modified files: /php-src/ext/xmlreader php_xmlreader.c php_xmlreader.h /php-src/ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php Log: move constants to class

http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.16 php-src/ext/xmlreader/php_xmlreader.c:1.17 --- php-src/ext/xmlreader/php_xmlreader.c:1.16 Fri Oct 7 09:26:11 2005 +++ php-src/ext/xmlreader/php_xmlreader.c Thu Oct 13 17:19:13 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.16 2005/10/07 13:26:11 rrichards Exp $ */ +/* $Id: php_xmlreader.c,v 1.17 2005/10/13 21:19:13 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1114,36 +1114,37 @@ xmlreader_register_prop_handler(&xmlreader_prop_handlers, "xmlLang", NULL, xmlTextReaderConstXmlLang, IS_STRING TSRMLS_CC); /* Constants for NodeType - cannot define common types to share with dom as there are differences in these types */ - REGISTER_LONG_CONSTANT("XMLREADER_NONE", XML_READER_TYPE_NONE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_ELEMENT", XML_READER_TYPE_ELEMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_ATTRIBUTE", XML_READER_TYPE_ATTRIBUTE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_TEXT", XML_READER_TYPE_TEXT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_CDATA", XML_READER_TYPE_CDATA, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_ENTITY_REF", XML_READER_TYPE_ENTITY_REFERENCE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_ENTITY", XML_READER_TYPE_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_PI", XML_READER_TYPE_PROCESSING_INSTRUCTION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_COMMENT", XML_READER_TYPE_COMMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_DOC", XML_READER_TYPE_DOCUMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_DOC_TYPE", XML_READER_TYPE_DOCUMENT_TYPE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_DOC_FRAGMENT", XML_READER_TYPE_DOCUMENT_FRAGMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_NOTATION", XML_READER_TYPE_NOTATION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_WHITESPACE", XML_READER_TYPE_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_SIGNIFICANT_WHITESPACE", XML_READER_TYPE_SIGNIFICANT_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_END_ELEMENT", XML_READER_TYPE_END_ELEMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_END_ENTITY", XML_READER_TYPE_END_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_XML_DECLARATION", XML_READER_TYPE_XML_DECLARATION, CONST_CS | CONST_PERSISTENT); + + REGISTER_XMLREADER_CLASS_CONST_LONG("NONE", XML_READER_TYPE_NONE); + REGISTER_XMLREADER_CLASS_CONST_LONG("ELEMENT", XML_READER_TYPE_ELEMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("ATTRIBUTE", XML_READER_TYPE_ATTRIBUTE); + REGISTER_XMLREADER_CLASS_CONST_LONG("TEXT", XML_READER_TYPE_TEXT); + REGISTER_XMLREADER_CLASS_CONST_LONG("CDATA", XML_READER_TYPE_CDATA); + REGISTER_XMLREADER_CLASS_CONST_LONG("ENTITY_REF", XML_READER_TYPE_ENTITY_REFERENCE); + REGISTER_XMLREADER_CLASS_CONST_LONG("ENTITY", XML_READER_TYPE_ENTITY); + REGISTER_XMLREADER_CLASS_CONST_LONG("PI", XML_READER_TYPE_PROCESSING_INSTRUCTION); + REGISTER_XMLREADER_CLASS_CONST_LONG("COMMENT", XML_READER_TYPE_COMMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("DOC", XML_READER_TYPE_DOCUMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("DOC_TYPE", XML_READER_TYPE_DOCUMENT_TYPE); + REGISTER_XMLREADER_CLASS_CONST_LONG("DOC_FRAGMENT", XML_READER_TYPE_DOCUMENT_FRAGMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("NOTATION", XML_READER_TYPE_NOTATION); + REGISTER_XMLREADER_CLASS_CONST_LONG("WHITESPACE", XML_READER_TYPE_WHITESPACE); + REGISTER_XMLREADER_CLASS_CONST_LONG("SIGNIFICANT_WHITESPACE", XML_READER_TYPE_SIGNIFICANT_WHITESPACE); + REGISTER_XMLREADER_CLASS_CONST_LONG("END_ELEMENT", XML_READER_TYPE_END_ELEMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("END_ENTITY", XML_READER_TYPE_END_ENTITY); + REGISTER_XMLREADER_CLASS_CONST_LONG("XML_DECLARATION", XML_READER_TYPE_XML_DECLARATION); /* Constants for Parser options */ - REGISTER_LONG_CONSTANT("XMLREADER_LOADDTD", XML_PARSER_LOADDTD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_DEFAULTATTRS", XML_PARSER_DEFAULTATTRS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_VALIDATE", XML_PARSER_VALIDATE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_SUBST_ENTITIES", XML_PARSER_SUBST_ENTITIES, CONST_CS | CONST_PERSISTENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("LOADDTD", XML_PARSER_LOADDTD); + REGISTER_XMLREADER_CLASS_CONST_LONG("DEFAULTATTRS", XML_PARSER_DEFAULTATTRS); + REGISTER_XMLREADER_CLASS_CONST_LONG("VALIDATE", XML_PARSER_VALIDATE); + REGISTER_XMLREADER_CLASS_CONST_LONG("SUBST_ENTITIES", XML_PARSER_SUBST_ENTITIES); /* Constants for Errors when loading - not yet used until we implement custom error handling - REGISTER_LONG_CONSTANT("XMLREADER_VALIDITY_WARNING", XML_PARSER_SEVERITY_VALIDITY_WARNING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_VALIDITY_ERROR", XML_PARSER_SEVERITY_VALIDITY_ERROR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_WARNING", XML_PARSER_SEVERITY_WARNING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XMLREADER_ERROR", XML_PARSER_SEVERITY_ERROR, CONST_CS | CONST_PERSISTENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("VALIDITY_WARNING", XML_PARSER_SEVERITY_VALIDITY_WARNING, CONST_CS | CONST_PERSISTENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("VALIDITY_ERROR", XML_PARSER_SEVERITY_VALIDITY_ERROR, CONST_CS | CONST_PERSISTENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("WARNING", XML_PARSER_SEVERITY_WARNING, CONST_CS | CONST_PERSISTENT); + REGISTER_XMLREADER_CLASS_CONST_LONG("ERROR", XML_PARSER_SEVERITY_ERROR, CONST_CS | CONST_PERSISTENT); */ return SUCCESS; http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.h?r1=1.4&r2=1.5&ty=u Index: php-src/ext/xmlreader/php_xmlreader.h diff -u php-src/ext/xmlreader/php_xmlreader.h:1.4 php-src/ext/xmlreader/php_xmlreader.h:1.5 --- php-src/ext/xmlreader/php_xmlreader.h:1.4 Wed Oct 5 15:41:57 2005 +++ php-src/ext/xmlreader/php_xmlreader.h Thu Oct 13 17:19:13 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.h,v 1.4 2005/10/05 19:41:57 rrichards Exp $ */ +/* $Id: php_xmlreader.h,v 1.5 2005/10/13 21:19:13 rrichards Exp $ */ #ifndef PHP_XMLREADER_H #define PHP_XMLREADER_H @@ -49,6 +49,8 @@ PHP_MSHUTDOWN_FUNCTION(xmlreader); PHP_MINFO_FUNCTION(xmlreader); +#define REGISTER_XMLREADER_CLASS_CONST_LONG(const_name, value) \ + zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC); #ifdef ZTS #define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v) http://cvs.php.net/diff.php/php-src/ext/xmlreader/examples/xmlreader_file.php?r1=1.1&r2=1.2&ty=u Index: php-src/ext/xmlreader/examples/xmlreader_file.php diff -u php-src/ext/xmlreader/examples/xmlreader_file.php:1.1 php-src/ext/xmlreader/examples/xmlreader_file.php:1.2 --- php-src/ext/xmlreader/examples/xmlreader_file.php:1.1 Mon Apr 19 14:55:02 2004 +++ php-src/ext/xmlreader/examples/xmlreader_file.php Thu Oct 13 17:19:14 2005 @@ -2,11 +2,11 @@ $reader = new XMLReader(); $reader->open('xmlreader.xml'); while ($reader->read()) { - if ($reader->nodeType != XMLREADER_END_ELEMENT) { + if ($reader->nodeType != XMLREADER::END_ELEMENT) { print "Node Name: ".$reader->name."\n"; print "Node Value: ".$reader->value."\n"; print "Node Depth: ".$reader->depth."\n"; - if ($reader->nodeType==XMLREADER_ELEMENT && $reader->hasAttributes) { + if ($reader->nodeType==XMLREADER::ELEMENT && $reader->hasAttributes) { $attr = $reader->moveToFirstAttribute(); while ($attr) { print " Attribute Name: ".$reader->name."\n"; http://cvs.php.net/diff.php/php-src/ext/xmlreader/examples/xmlreader_string.php?r1=1.1&r2=1.2&ty=u Index: php-src/ext/xmlreader/examples/xmlreader_string.php diff -u php-src/ext/xmlreader/examples/xmlreader_string.php:1.1 php-src/ext/xmlreader/examples/xmlreader_string.php:1.2 --- php-src/ext/xmlreader/examples/xmlreader_string.php:1.1 Mon Apr 19 14:55:02 2004 +++ php-src/ext/xmlreader/examples/xmlreader_string.php Thu Oct 13 17:19:14 2005 @@ -13,11 +13,11 @@ $reader = new XMLReader(); $reader->XML($xmlstring); while ($reader->read()) { - if ($reader->nodeType != XMLREADER_END_ELEMENT) { + if ($reader->nodeType != XMLREADER::END_ELEMENT) { print "Node Name: ".$reader->name."\n"; print "Node Value: ".$reader->value."\n"; print "Node Depth: ".$reader->depth."\n"; - if ($reader->nodeType==XMLREADER_ELEMENT && $reader->hasAttributes) { + if ($reader->nodeType==XMLREADER::ELEMENT && $reader->hasAttributes) { $attr = $reader->moveToFirstAttribute(); while ($attr) { print " Attribute Name: ".$reader->name."\n"; http://cvs.php.net/diff.php/php-src/ext/xmlreader/examples/xmlreader_validatedtd.php?r1=1.1&r2=1.2&ty=u Index: php-src/ext/xmlreader/examples/xmlreader_validatedtd.php diff -u php-src/ext/xmlreader/examples/xmlreader_validatedtd.php:1.1 php-src/ext/xmlreader/examples/xmlreader_validatedtd.php:1.2 --- php-src/ext/xmlreader/examples/xmlreader_validatedtd.php:1.1 Tue Apr 27 06:46:21 2004 +++ php-src/ext/xmlreader/examples/xmlreader_validatedtd.php Thu Oct 13 17:19:14 2005 @@ -3,8 +3,8 @@ $xml = new XMLReader(); $xml->open("dtdexample.xml"); -$xml->setParserProperty(XMLREADER_LOADDTD, TRUE); -$xml->setParserProperty(XMLREADER_VALIDATE, TRUE); +$xml->setParserProperty(XMLREADER::LOADDTD, TRUE); +$xml->setParserProperty(XMLREADER::VALIDATE, TRUE); while($xml->read()) { /* Print node name indenting it based on depth and $indent var */ print str_repeat(" ", $xml->depth * $indent).$xml->name."\n";