Re: Engine 2 ; domxml misses macros [patch]
| From: | Markus Fischer | Date: | Sat, 11 Aug 2001 16:24:43 +0000 |
| Subject: | Re: Engine 2 ; domxml misses macros [patch] | ||
| References: | 1 2 | Groups: | php.dev |
| Request: | Send a blank email to php-dev+get-62944@lists.php.net to get a copy of this message | ||
ext/domxml/php_domxml.c was missing some OBJPROP macros
- Markus
On Fri, Aug 10, 2001 at 07:20:32PM +0300, Andi Gutmans wrote :
> Zeev forgot to merge some changes into the Engine 2 CVS. Next time I'll
> rollback his changes if he forgets :)
> I have merged them so please update the ZendEngine2 CVS and try again.
> Please give any feedback.
>
> Thanks,
>
> Andi
>
> At 05:38 PM 8/10/2001 +0200, Markus Fischer wrote:
> >Doesn't compile for me ..
> >
> >make output attached; bails out at ext/mysql ...
> >
> >If I disable mysql then it fails at ext/pcre, ext/posix, ...
> >
> >- markus
> >
> >
> >On Fri, Aug 10, 2001 at 05:20:55PM +0300, Andi Gutmans wrote :
> >> Hey,
> >>
> >> The Engine 2 CVS pretty much implements the first step of the new object
> >> model. Objects are now handles which reference the same object and
> >> $obj->method1()->method2() is supported now. Quite a few places in PHP
> >that
> >> use objects like call_user_function() might still not work though.
> >> If anyone can try and run PHP with the Engine 2 CVS and send feedback on
> >> how well or badly their old object code runs that'll be great. I'm also
> >> interested in how many scripts are actually broken by the fact that
> >objects
> >> are not copied when sent to functions by value and so on.
> >>
> >> To check it out just checkout the ZendEngine2 CVS tree from cvs.zend.com
> >> and rename it from ZendEngine2 -> Zend before building PHP.
> >>
> >> Andi
> >>
> >>
> >> --
> >> PHP Development Mailing List
> >> <http://www.php.net/>
> >> To unsubscribe, e-mail: php-dev-unsubscribe@lists.php.net
> >> For additional commands, e-mail: php-dev-help@lists.php.net
> >> To contact the list administrators, e-mail: php-list-admin@lists.php.net
> >
> >--
> >Markus Fischer, http://guru.josefine.at/~mfischer/
> >EMail: mfischer@guru.josefine.at
> >PGP Public Key:
> >http://guru.josefine.at/~mfischer/C2272BD0.asc
> >PGP Fingerprint: D3B0 DD4F E12B F911 3CE1 C2B5 D674 B445 C227 2BD0
> >
> >--
> >PHP Development Mailing List <http://www.php.net/>
> >To unsubscribe, e-mail: php-dev-unsubscribe@lists.php.net
> >For additional commands, e-mail: php-dev-help@lists.php.net
> >To contact the list administrators, e-mail: php-list-admin@lists.php.net
>
>
> --
> PHP Development Mailing List <http://www.php.net/>
> To unsubscribe, e-mail: php-dev-unsubscribe@lists.php.net
> For additional commands, e-mail: php-dev-help@lists.php.net
> To contact the list administrators, e-mail: php-list-admin@lists.php.net
--
Markus Fischer, http://guru.josefine.at/~mfischer/
EMail: mfischer@guru.josefine.at
PGP Public Key: http://guru.josefine.at/~mfischer/C2272BD0.asc
PGP Fingerprint: D3B0 DD4F E12B F911 3CE1 C2B5 D674 B445 C227 2BD0
-All your scripts are belong to Zend-
? .php_domxml.c.swp ? domxml.patch Index: php_domxml.c =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.c,v retrieving revision 1.53 diff -u -r1.53 php_domxml.c --- php_domxml.c 10 Aug 2001 08:02:09 -0000 1.53 +++ php_domxml.c 11 Aug 2001 16:18:17 -0000 @@ -2368,11 +2368,11 @@ /* Get the attributes of the current node and add it as a property */ if(node_attributes(&attributes, last TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); /* Get recursively the children of the current node and add it as a property */ if(node_children(&mchildren, last->children TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); count++; last = last->next; } @@ -2420,7 +2420,7 @@ Thanks to Paul DuBois for pointing me at this. */ if (node_children(&children, root TSRMLS_CC) >= 0) { - zend_hash_update(return_value->value.obj.properties, "children", + zend_hash_update(Z_OBJPROP_P(return_value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); } /* xmlFreeDoc(docp); */ @@ -2572,7 +2572,7 @@ child = php_domobject_new(node, &retnode TSRMLS_CC); zend_hash_next_index_insert(arr->value.ht, &child, sizeof(zval *), NULL); } - zend_hash_update(rv->value.obj.properties, "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(rv), "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); break; } case XPATH_BOOLEAN:
? .php_domxml.c.swp ? domxml.patch Index: php_domxml.c =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.c,v retrieving revision 1.53 diff -u -r1.53 php_domxml.c --- php_domxml.c 10 Aug 2001 08:02:09 -0000 1.53 +++ php_domxml.c 11 Aug 2001 16:18:17 -0000 @@ -2368,11 +2368,11 @@ /* Get the attributes of the current node and add it as a property */ if(node_attributes(&attributes, last TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); /* Get recursively the children of the current node and add it as a property */ if(node_children(&mchildren, last->children TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); count++; last = last->next; } @@ -2420,7 +2420,7 @@ Thanks to Paul DuBois for pointing me at this. */ if (node_children(&children, root TSRMLS_CC) >= 0) { - zend_hash_update(return_value->value.obj.properties, "children", + zend_hash_update(Z_OBJPROP_P(return_value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); } /* xmlFreeDoc(docp); */ @@ -2572,7 +2572,7 @@ child = php_domobject_new(node, &retnode TSRMLS_CC); zend_hash_next_index_insert(arr->value.ht, &child, sizeof(zval *), NULL); } - zend_hash_update(rv->value.obj.properties, "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(rv), "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); break; } case XPATH_BOOLEAN: