pike.git/ src/ svalue.h

1999-11-18

1999-11-18 04:14:55 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 0542efb131be1e2efe85086c86370cec4bc123d2 (70 lines) (+43/-27) ^{[ Show | Annotate ]}
  Branch: 7.9

resolved some conflicts for PHP

Rev: src/builtin_functions.h:1.10
Rev: src/errors.h:1.7
Rev: src/interpret.h:1.35
Rev: src/interpreter.h:1.18
Rev: src/lexer.h:1.11
Rev: src/preprocessor.h:1.15
Rev: src/program.c:1.174
Rev: src/program.h:1.66
Rev: src/security.h:1.8
Rev: src/svalue.h:1.38
Rev: src/threads.h:1.71

5:   \*/      /* -  * $Id: svalue.h,v 1.37 1999/11/16 00:51:56 mast Exp $ +  * $Id: svalue.h,v 1.38 1999/11/18 04:14:54 hubbe Exp $    */   #ifndef SVALUE_H   #define SVALUE_H
79:    union anything u;   };    - #define T_ARRAY 0 - #define T_MAPPING 1 - #define T_MULTISET 2 - #define T_OBJECT 3 - #define T_FUNCTION 4 - #define T_PROGRAM 5 - #define T_STRING 6 - #define T_FLOAT 7 - #define T_INT 8 + #define PIKE_T_ARRAY 0 + #define PIKE_T_MAPPING 1 + #define PIKE_T_MULTISET 2 + #define PIKE_T_OBJECT 3 + #define PIKE_T_FUNCTION 4 + #define PIKE_T_PROGRAM 5 + #define PIKE_T_STRING 6 + #define PIKE_T_FLOAT 7 + #define PIKE_T_INT 8      #define T_VOID 16   #define T_MANY 17
154:   #define tRef tOr(tString,tComplex)   #define tIfnot(X,Y) tAnd(tNot(X),Y)    - #define BIT_ARRAY (1<<T_ARRAY) - #define BIT_MAPPING (1<<T_MAPPING) - #define BIT_MULTISET (1<<T_MULTISET) - #define BIT_OBJECT (1<<T_OBJECT) - #define BIT_FUNCTION (1<<T_FUNCTION) - #define BIT_PROGRAM (1<<T_PROGRAM) - #define BIT_STRING (1<<T_STRING) - #define BIT_INT (1<<T_INT) - #define BIT_FLOAT (1<<T_FLOAT) + #define BIT_ARRAY (1<<PIKE_T_ARRAY) + #define BIT_MAPPING (1<<PIKE_T_MAPPING) + #define BIT_MULTISET (1<<PIKE_T_MULTISET) + #define BIT_OBJECT (1<<PIKE_T_OBJECT) + #define BIT_FUNCTION (1<<PIKE_T_FUNCTION) + #define BIT_PROGRAM (1<<PIKE_T_PROGRAM) + #define BIT_STRING (1<<PIKE_T_STRING) + #define BIT_INT (1<<PIKE_T_INT) + #define BIT_FLOAT (1<<PIKE_T_FLOAT)      /* Used to signify that this array might not be finished yet */   /* garbage collect uses this */
185:   #define BIT_CALLABLE (BIT_FUNCTION|BIT_PROGRAM|BIT_ARRAY|BIT_OBJECT)      /* Max type which contains svalues */ - #define MAX_COMPLEX T_PROGRAM + #define MAX_COMPLEX PIKE_T_PROGRAM   /* Max type with ref count */ - #define MAX_REF_TYPE T_STRING + #define MAX_REF_TYPE PIKE_T_STRING   /* Max type handled by svalue primitives */ - #define MAX_TYPE T_INT + #define MAX_TYPE PIKE_T_INT      #define NUMBER_NUMBER 0   #define NUMBER_UNDEFINED 1
198:   #define FUNCTION_BUILTIN USHRT_MAX      #define is_gt(a,b) is_lt(b,a) - #define IS_ZERO(X) ((X)->type==T_INT?(X)->u.integer==0:(1<<(X)->type)&(BIT_OBJECT|BIT_FUNCTION)?!svalue_is_true(X):0) + #define IS_ZERO(X) ((X)->type==PIKE_T_INT?(X)->u.integer==0:(1<<(X)->type)&(BIT_OBJECT|BIT_FUNCTION)?!svalue_is_true(X):0)    - #define IS_UNDEFINED(X) ((X)->type==T_INT&&!(X)->u.integer&&(X)->subtype==1) + #define IS_UNDEFINED(X) ((X)->type==PIKE_T_INT&&!(X)->u.integer&&(X)->subtype==1)      #define check_destructed(S) \   do{ \    struct svalue *_s=(S); \ -  if((_s->type == T_OBJECT || _s->type==T_FUNCTION) && !_s->u.object->prog) { \ +  if((_s->type == PIKE_T_OBJECT || _s->type==PIKE_T_FUNCTION) && !_s->u.object->prog) { \    free_object(_s->u.object); \ -  _s->type = T_INT; \ +  _s->type = PIKE_T_INT; \    _s->subtype = NUMBER_DESTRUCTED ; \    _s->u.integer = 0; \    } \
215:      /* var MUST be a variable!!! */   #define safe_check_destructed(var) do{ \ -  if((var->type == T_OBJECT || var->type==T_FUNCTION) && !var->u.object->prog) \ +  if((var->type == PIKE_T_OBJECT || var->type==PIKE_T_FUNCTION) && !var->u.object->prog) \    var=&dest_ob_zero; \   }while(0)   
324:   INT32 pike_sizeof(struct svalue *s);   /* Prototypes end here */    + #ifndef NO_PIKE_SHORTHAND +  + #define T_ARRAY PIKE_T_ARRAY + #define T_MAPPING PIKE_T_MAPPING + #define T_MULTISET PIKE_T_MULTISET + #define T_OBJECT PIKE_T_OBJECT + #define T_FUNCTION PIKE_T_FUNCTION + #define T_PROGRAM PIKE_T_PROGRAM + #define T_STRING PIKE_T_STRING + #define T_FLOAT PIKE_T_FLOAT + #define T_INT PIKE_T_INT +    #endif -  +  +  + #endif