cvs: /php4/ext/com COM.c /php4/ext/standard basic_functions.c
| From: | Andi Gutmans | Date: | Tue, 04 Jan 2000 13:56:44 +0000 |
| Subject: | cvs: /php4/ext/com COM.c /php4/ext/standard basic_functions.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-8903@lists.php.net to get a copy of this message | ||
andi Tue Jan 4 08:56:44 2000 EDT
Modified files:
/php4/ext/com COM.c
/php4/ext/standard basic_functions.c
Log:
- Separate the overloaded objects' types from Zend's data types.
There is no reason for them to be the same, and IS_METHOD just cluttered
the data types.
- Overloaded elements should now use OE_IS_OBJECT, OE_IS_ARRAY, and
OE_IS_METHOD
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.21 php4/ext/com/COM.c:1.22
--- php4/ext/com/COM.c:1.21 Fri Dec 31 20:31:29 1999
+++ php4/ext/com/COM.c Tue Jan 4 08:56:10 2000
@@ -791,13 +791,13 @@
for (element=property_reference->elements_list.head; element; element=element->next) {
overloaded_property = (zend_overloaded_element *) element->data;
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
if (do_COM_offget(&var_result, &var_result, &overloaded_property->element,
element!=property_reference->elements_list.head)==FAILURE) {
/* bail out */
}
/*printf("Array offset: ");*/
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
if (var_result.vt != VT_DISPATCH) {
/* bail out */
} else {
@@ -807,7 +807,7 @@
/*printf("Object property: ");*/
}
break;
- case IS_METHOD:
+ case OE_IS_METHOD:
return var_result;
break;
}
@@ -861,10 +861,10 @@
for (element=property_reference->elements_list.head; element &&
element!=property_reference->elements_list.tail; element=element->next) {
overloaded_property = (zend_overloaded_element *) element->data;
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
/*printf("Array offset: ");*/
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
if (var_result.vt != VT_DISPATCH) {
/* bail out */
} else {
@@ -872,7 +872,7 @@
/*printf("Object property: ");*/
}
break;
- case IS_METHOD:
+ case OE_IS_METHOD:
/* this shouldn't happen */
return FAILURE;
}
@@ -946,11 +946,11 @@
overloaded_property;
overloaded_property = (zend_overloaded_element *)
zend_llist_get_next(&property_reference->elements_list)) {
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
break;
- case IS_METHOD:
+ case OE_IS_METHOD:
break;
}
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.146 php4/ext/standard/basic_functions.c:1.147
--- php4/ext/standard/basic_functions.c:1.146 Fri Dec 31 20:31:48 1999
+++ php4/ext/standard/basic_functions.c Tue Jan 4 08:56:13 2000
@@ -1131,10 +1131,10 @@
for (element=property_reference->elements_list.head; element; element=element->next) {
overloaded_property = (zend_overloaded_element *) element->data;
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
printf("Array offset: ");
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
printf("Object property: ");
break;
}
@@ -1169,10 +1169,10 @@
for (element=property_reference->elements_list.head; element; element=element->next) {
overloaded_property = (zend_overloaded_element *) element->data;
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
printf("Array offset: ");
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
printf("Object property: ");
break;
}
@@ -1203,13 +1203,13 @@
for (element=property_reference->elements_list.head; element; element=element->next) {
overloaded_property = (zend_overloaded_element *) element->data;
switch (overloaded_property->type) {
- case IS_ARRAY:
+ case OE_IS_ARRAY:
printf("Array offset: ");
break;
- case IS_OBJECT:
+ case OE_IS_OBJECT:
printf("Object property: ");
break;
- case IS_METHOD:
+ case OE_IS_METHOD:
printf("Overloaded method: ");
}
switch (overloaded_property->element.type) {