CVS update: php31/main
| From: | rasmus | Date: | Sat, 19 Sep 1998 16:50:34 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1260@lists.php.net to get a copy of this message | ||
Date: Saturday September 19, 1998 @ 12:50
Author: rasmus
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv9915/main
Modified Files:
control_structures_inline.h language-parser.y variables.c
variables.h
Log Message:
Bring SNMP and LDAP modules up to date
Index: php31/main/control_structures_inline.h
diff -c php31/main/control_structures_inline.h:2.10 php31/main/control_structures_inline.h:2.11
*** php31/main/control_structures_inline.h:2.10 Thu Sep 10 20:22:50 1998
--- php31/main/control_structures_inline.h Sat Sep 19 12:50:31 1998
***************
*** 29,35 ****
*/
! /* $Id: control_structures_inline.h,v 2.10 1998/09/11 00:22:50 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: control_structures_inline.h,v 2.11 1998/09/19 16:50:31 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 669,675 ****
GLOBAL(shutdown_requested) = ABNORMAL_SHUTDOWN;
}
if (expr) {
! print_variable(expr _INLINE_TLS);
pval_destructor(expr _INLINE_TLS);
}
}
--- 669,675 ----
GLOBAL(shutdown_requested) = ABNORMAL_SHUTDOWN;
}
if (expr) {
! php3i_print_variable(expr _INLINE_TLS);
pval_destructor(expr _INLINE_TLS);
}
}
Index: php31/main/language-parser.y
diff -c php31/main/language-parser.y:2.9 php31/main/language-parser.y:2.10
*** php31/main/language-parser.y:2.9 Thu Sep 10 20:22:51 1998
--- php31/main/language-parser.y Sat Sep 19 12:50:32 1998
***************
*** 31,37 ****
*/
! /* $Id: language-parser.y,v 2.9 1998/09/11 00:22:51 zeev Exp $ */
/*
--- 31,37 ----
*/
! /* $Id: language-parser.y,v 2.10 1998/09/19 16:50:32 rasmus Exp $ */
/*
***************
*** 484,491 ****
echo_expr_list:
/* empty */
! | echo_expr_list ',' expr { if (GLOBAL(Execute)) { print_variable(&$3 _INLINE_TLS);
pval_destructor(&$3 _INLINE_TLS); } }
! | expr { if (GLOBAL(Execute)) { print_variable(&$1 _INLINE_TLS); pval_destructor(&$1
_INLINE_TLS); } }
;
--- 484,491 ----
echo_expr_list:
/* empty */
! | echo_expr_list ',' expr { if (GLOBAL(Execute)) { php3i_print_variable(&$3
_INLINE_TLS); pval_destructor(&$3 _INLINE_TLS); } }
! | expr { if (GLOBAL(Execute)) { php3i_print_variable(&$1 _INLINE_TLS);
pval_destructor(&$1 _INLINE_TLS); } }
;
***************
*** 570,576 ****
| scalar { if (GLOBAL(Execute)) $$ = $1; }
| PHP_ARRAY '(' array_pair_list ')' { if (GLOBAL(Execute)) $$ = $3; }
| '
' encaps_list '' { cs_system(&$$,&$2 _INLINE_TLS); }
! | PHP_PRINT expr { if (GLOBAL(Execute)) { print_variable(&$2 _INLINE_TLS);
pval_destructor(&$2 _INLINE_TLS); $$.value.lval=1; $$.type=IS_LONG; } }
;
scalar:
--- 570,576 ----
| scalar { if (GLOBAL(Execute)) $$ = $1; }
| PHP_ARRAY '(' array_pair_list ')' { if (GLOBAL(Execute)) $$ = $3; }
| '' encaps_list '' { cs_system(&$$,&$2 _INLINE_TLS); }
! | PHP_PRINT expr { if (GLOBAL(Execute)) { php3i_print_variable(&$2 _INLINE_TLS);
pval_destructor(&$2 _INLINE_TLS); $$.value.lval=1; $$.type=IS_LONG; } }
;
scalar:
Index: php31/main/variables.c
diff -c php31/main/variables.c:2.6 php31/main/variables.c:2.7
*** php31/main/variables.c:2.6 Thu Sep 10 20:22:53 1998
--- php31/main/variables.c Sat Sep 19 12:50:32 1998
***************
*** 29,35 ****
*/
! /* $Id: variables.c,v 2.6 1998/09/11 00:22:53 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: variables.c,v 2.7 1998/09/19 16:50:32 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 399,405 ****
}
! void print_variable(pval *var INLINE_TLS)
{
convert_to_string(var);
if (var->value.str.len==0) {
--- 399,405 ----
}
! void php3i_print_variable(pval *var INLINE_TLS)
{
convert_to_string(var);
if (var->value.str.len==0) {
Index: php31/main/variables.h
diff -c php31/main/variables.h:2.4 php31/main/variables.h:2.5
*** php31/main/variables.h:2.4 Thu Sep 10 20:22:53 1998
--- php31/main/variables.h Sat Sep 19 12:50:33 1998
***************
*** 29,35 ****
*/
! /* $Id: variables.h,v 2.4 1998/09/11 00:22:53 zeev Exp $ */
#ifndef _VARIABLES_H
--- 29,35 ----
*/
! /* $Id: variables.h,v 2.5 1998/09/19 16:50:33 rasmus Exp $ */
#ifndef _VARIABLES_H
***************
*** 44,50 ****
extern void get_next_array_variable(pval *result, pval *varname);
extern int incdec_variable(pval *result, pval *varname, int (*func) (pval *), int post
INLINE_TLS);
/*not used ?? extern void incdec_class_variable(pval *result, pval *classname, pval *varname, int
(*func) (pval *), int post);*/
! extern void print_variable(pval *var INLINE_TLS);
extern int is_not_internal_function(pval *pvalue);
extern void array_assign_next(pval *result, pval *varname, pval *expr);
extern void add_array_pair_list(pval *result, pval *idx, pval *value, int initialize INLINE_TLS);
--- 44,50 ----
extern void get_next_array_variable(pval *result, pval *varname);
extern int incdec_variable(pval *result, pval *varname, int (*func) (pval *), int post
INLINE_TLS);
/*not used ?? extern void incdec_class_variable(pval *result, pval *classname, pval *varname, int
(*func) (pval *), int post);*/
! extern void php3i_print_variable(pval *var INLINE_TLS);
extern int is_not_internal_function(pval *pvalue);
extern void array_assign_next(pval *result, pval *varname, pval *expr);
extern void add_array_pair_list(pval *result, pval *idx, pval *value, int initialize INLINE_TLS);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net