php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Object overloading API changed slightly (llist is now a pointer)

Browse Source
This commit is contained in:
Zeev Suraski
2000-04-10 20:21:02 +00:00
parent c5d5c69bfe
commit 64f91d80fa
7 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/domxml/domxml.c
+3 -3
View File
@@ -168,7 +168,7 @@ pval domxmltestnode_class_get_property(zend_property_reference *property_referen
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 @@ int domxmltestnode_class_set_property(zend_property_reference *property_referenc
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 @@ void domxmltestnode_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_prope
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:
ext/java/java.c
+2 -2
View File
@@ -324,7 +324,7 @@ void java_call_function_handler
{
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 @@ static pval _java_getset_property
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);
ext/rpc/com/COM.c
+9 -9
View File
@@ -788,11 +788,11 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer
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 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer
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 @@ int php_COM_set_property_handler(zend_property_reference *property_reference, pv
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 @@ int php_COM_set_property_handler(zend_property_reference *property_reference, pv
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 @@ void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_r
{
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 @@ void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_r
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;
ext/rpc/java/java.c
+2 -2
View File
@@ -324,7 +324,7 @@ void java_call_function_handler
{
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 @@ static pval _java_getset_property
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);
ext/standard/basic_functions.c
+3 -3
View File
@@ -1568,7 +1568,7 @@ pval test_class_get_property(zend_property_reference *property_reference)
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 @@ int test_class_set_property(zend_property_reference *property_reference, pval *v
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 @@ void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_refere
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:
ext/standard/info.c
+2 -2
View File
@@ -168,10 +168,10 @@ PHPAPI void php_print_info(int flag)
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" );
tests/testcom
+3 -1
View File
@@ -4,6 +4,8 @@ print "Loaded Word, version {$word->Version}\n";
$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");
*/
?>