cvs: /php4/ext/com COM.c /php4/ext/domxml domxml.c /php4/ext/java java.c /php4/ext/standard basic_functions.c info.c /php4/tests testcom

zeev Mon Apr 10 13:21:32 2000 EDT Modified files: /php4/ext/com COM.c /php4/ext/domxml domxml.c /php4/ext/java java.c /php4/ext/standard basic_functions.c info.c /php4/tests testcom Log: Object overloading API changed slightly (llist is now a pointer) Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.25 php4/ext/com/COM.c:1.26 --- php4/ext/com/COM.c:1.25 Thu Mar 30 14:56:31 2000 +++ php4/ext/com/COM.c Mon Apr 10 13:21:00 2000 @@ -788,11 +788,11 @@ var_result.vt = VT_DISPATCH; var_result.pdispVal = i_dispatch; - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: - if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list.head)==FAILURE) { + if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) { /* bail out */ } /*printf("Array offset: ");*/ @@ -801,7 +801,7 @@ if (var_result.vt != VT_DISPATCH) { /* bail out */ } else { - if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list.head)==FAILURE) { + if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) { /* bail out */ } /*printf("Object property: ");*/ @@ -858,7 +858,7 @@ var_result.vt = VT_DISPATCH; var_result.pdispVal = i_dispatch; - for (element=property_reference->elements_list.head; element && element!=property_reference->elements_list.tail; element=element->next) { + 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 OE_IS_ARRAY: @@ -868,7 +868,7 @@ if (var_result.vt != VT_DISPATCH) { /* bail out */ } else { - do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list.head); + do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list->head); /*printf("Object property: ");*/ } break; @@ -904,9 +904,9 @@ { zend_overloaded_element *overloaded_property; pval *object = property_reference->object; - zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list.tail->data; + zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data; - if (zend_llist_count(&property_reference->elements_list)==1 + if (zend_llist_count(property_reference->elements_list)==1 && !strcmp(function_name->element.value.str.val, "com")) { /* constructor */ pval *object_handle; @@ -942,9 +942,9 @@ php_variant_to_pval(&var_result, return_value, 0); } - for (overloaded_property = (zend_overloaded_element *) zend_llist_get_first(&property_reference->elements_list); + for (overloaded_property = (zend_overloaded_element *) zend_llist_get_first(property_reference->elements_list); overloaded_property; - overloaded_property = (zend_overloaded_element *) zend_llist_get_next(&property_reference->elements_list)) { + overloaded_property = (zend_overloaded_element *) zend_llist_get_next(property_reference->elements_list)) { switch (overloaded_property->type) { case OE_IS_ARRAY: break; Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.34 php4/ext/domxml/domxml.c:1.35 --- php4/ext/domxml/domxml.c:1.34 Wed Apr 5 15:30:17 2000 +++ php4/ext/domxml/domxml.c Mon Apr 10 13:21:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.34 2000/04/05 22:30:17 cmv Exp $ */ +/* $Id: domxml.c,v 1.35 2000/04/10 20:21:01 zeev Exp $ */ #include "php.h" @@ -168,7 +168,7 @@ printf("Reading a property from a OverloadedTestClass object:\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: @@ -206,7 +206,7 @@ zend_print_variable(value); printf("'\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: @@ -239,7 +239,7 @@ printf("Invoking a method on OverloadedTestClass object:\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.17 php4/ext/java/java.c:1.18 --- php4/ext/java/java.c:1.17 Sat Mar 25 07:57:03 2000 +++ php4/ext/java/java.c Mon Apr 10 13:21:01 2000 @@ -324,7 +324,7 @@ { pval *object = property_reference->object; zend_overloaded_element *function_name = (zend_overloaded_element *) - property_reference->elements_list.tail->data; + property_reference->elements_list->tail->data; int arg_count = ARG_COUNT(ht); jlong result = 0; @@ -393,7 +393,7 @@ int type; /* get the property name */ - zend_llist_element *element = property_reference->elements_list.head; + zend_llist_element *element = property_reference->elements_list->head; zend_overloaded_element *property=(zend_overloaded_element *)element->data; jstring propName = (*jenv)->NewStringUTF(jenv, property->element.value.str.val); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.181 php4/ext/standard/basic_functions.c:1.182 --- php4/ext/standard/basic_functions.c:1.181 Sat Apr 8 16:53:19 2000 +++ php4/ext/standard/basic_functions.c Mon Apr 10 13:21:01 2000 @@ -1568,7 +1568,7 @@ printf("Reading a property from a OverloadedTestClass object:\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: @@ -1606,7 +1606,7 @@ zend_print_variable(value); printf("'\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: @@ -1640,7 +1640,7 @@ printf("Invoking a method on OverloadedTestClass object:\n"); - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.79 php4/ext/standard/info.c:1.80 --- php4/ext/standard/info.c:1.79 Fri Apr 7 09:41:19 2000 +++ php4/ext/standard/info.c Mon Apr 10 13:21:01 2000 @@ -168,10 +168,10 @@ php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); #endif if (sapi_module.name) { - php_info_print_table_row(2, "SAPI", sapi_module.name ); + php_info_print_table_row(2, "Server API", sapi_module.name ); } - php_info_print_table_row(2, "php.ini Path", CONFIGURATION_FILE_PATH ); + php_info_print_table_row(2, "Configuration File (php.ini) Path", CONFIGURATION_FILE_PATH ); #if ZEND_DEBUG php_info_print_table_row(2, "ZEND_DEBUG", "enabled" ); Index: php4/tests/testcom diff -u php4/tests/testcom:1.1 php4/tests/testcom:1.2 --- php4/tests/testcom:1.1 Thu Jul 8 14:42:29 1999 +++ php4/tests/testcom Mon Apr 10 13:21:01 2000 @@ -4,6 +4,8 @@ $word->Visible = 1; $word->Documents->Add(); $word->Selection->TypeText("This is a test..."); -$word->Documents[1]->SaveAs("Useless test.doc"); $word->Quit(); +/* +$word->Documents[1]->SaveAs("Useless test.doc"); +*/ ?>