Menu
▾
▴
[frontierkernel-commits] Frontier/Common/headers frontierdefs.h,1.7,1.7.6.1 lang.h,1.8,1.8.4.1 macconv.h,1.4,1.4.6.1 stringdefs.h,1.3,1.3.6.1
|
From: Karsten W. <kar...@us...> - 2006-01-31 16:40:18
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31416 Modified Files: Tag: pre_int64_branch frontierdefs.h lang.h macconv.h stringdefs.h Log Message: initial checkin from private sandbox Index: macconv.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/macconv.h,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** macconv.h 11 Jan 2005 22:48:01 -0000 1.4 --- macconv.h 31 Jan 2006 16:40:09 -0000 1.4.6.1 *************** *** 152,155 **** --- 152,158 ---- typeLongInteger = 'long', typeShortInteger = 'shor', + // kw - 2006-01-27 --- new 64-bit int types + typeSInt64 = 'comp', + typeLongFloat = 'doub', typeShortFloat = 'sing', Index: stringdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/stringdefs.h,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** stringdefs.h 11 Jan 2005 22:48:02 -0000 1.3 --- stringdefs.h 31 Jan 2006 16:40:09 -0000 1.3.6.1 *************** *** 75,78 **** --- 75,83 ---- #define STR_picture "\x07" "picture" + // kw - 2006-01-30 --- new types added + #define STR_longlongtype "\x09" "64bit-int" + #define STR_longdatetype "\x08" "longdate" + + #define STR_with "\x04" "with" #define STR_this "\x04" "this" Index: lang.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** lang.h 13 Jan 2005 23:54:18 -0000 1.8 --- lang.h 31 Jan 2006 16:40:09 -0000 1.8.4.1 *************** *** 279,287 **** #ifdef xmlfeatures ! xmlvaluetype, ! #endif /*new types must be added at end of list, these get saved on disk*/ ! ctvaluetypes --- 279,292 ---- #ifdef xmlfeatures ! xmlvaluetype, ! #endif /*new types must be added at end of list, these get saved on disk*/ ! #if LONGINT_LONGDATE == 1 ! // kw - 2006-01-27 --- new types added ! longlongintvaluetype, ! ! longdatetimevaluetype, ! #endif ctvaluetypes *************** *** 289,312 **** ! typedef struct tydiskvalue { /*4.0.2b1 dmb*/ dbaddress adr; - Handle hvalue; ! ! } tydiskvalue, *ptrdiskvalue, **hdldiskvalue; typedef union tyvaluedata { ! ! boolean flvalue; ! ! byte chvalue; ! ! short intvalue; ! ! long longvalue; ! ! unsigned long datevalue; #ifdef MACVERSION --- 294,321 ---- ! // kw - 2006-01-27 --- new longlong types ! ! #if LONGINT_LONGDATE == 1 ! # if defined (WIN95VERSION) ! typedef long long int tylonglongint; ! # endif ! # if defined (MACVERSION) ! typedef SInt64 tylonglongint; ! # endif ! #endif + + typedef struct tydiskvalue { /*4.0.2b1 dmb*/ dbaddress adr; Handle hvalue; ! } tydiskvalue, *ptrdiskvalue, **hdldiskvalue; typedef union tyvaluedata { ! boolean flvalue; ! byte chvalue; ! short intvalue; ! long longvalue; ! unsigned long datevalue; #ifdef MACVERSION *************** *** 318,322 **** OSType ostypevalue; - Handle stringvalue; --- 327,330 ---- *************** *** 325,408 **** */ ! hdlstring addressvalue; ! ! Handle binaryvalue; ! ! short tokenvalue; /*can be coerced to a tyfunctype, see note in langtokens.h*/ ! ! struct tytreenode **codevalue; /*implemented in UserLang*/ ! ! Handle externalvalue; /*structure is defined in langexternal.h*/ ! ! Point pointvalue; ! ! Rect **rectvalue; ! ! Pattern **patternvalue; ! ! RGBColor **rgbvalue; ! ! Fixed fixedvalue; ! ! float singlevalue; ! ! double **doublevalue; ! ! Handle objspecvalue; ! ! hdlfilespec filespecvalue; ! ! Handle aliasvalue; /*AliasHandle*/ ! ! OSType enumvalue; ! #ifdef oplanglists struct tylistrecord **listvalue; - struct tylistrecord **recordvalue; #else ! Handle listvalue; ! ! Handle recordvalue; #endif ! ! dbaddress diskvalue; /*4.0.2b1 dmb*/ ! } tyvaluedata; typedef struct tyvaluerecord { ! ! tyvaluetype valuetype; ! /*flags are never set in the database; used at runtime only*/ ! byte fltmpdata: 1; /*set when value data is handle to original, and needs duplication*/ ! ! byte fltmpstack: 1; /*set when value data is in the temp stack, and is volatile*/ ! ! byte flformalval: 1; /*set when value is set as default by function header*/ ! ! byte fldiskval: 1; /*set when value data points to disk block of actual value*/ ! tyvaluedata data; ! } tyvaluerecord; typedef struct tytreenode { - tytreetype nodetype; /*add, subtract, if, etc.*/ - - tyvaluerecord nodeval; /*the value stored at this level of the tree*/ - - struct tytreenode **link; /*links parameter lists, statement lists*/ - - unsigned long lnum; /*which line number in the source was this node generated from?*/ - - byte charnum; /*at what character offset? max is 255*/ - - byte ctparams; /*number of params actually allocated, max is 4*/ - /*param1 - param4 must be at the end of the record - see newtreenode*/ ! struct tytreenode **param1, **param2, **param3, **param4; } tytreenode, *ptrtreenode, **hdltreenode; --- 333,393 ---- */ ! hdlstring addressvalue; ! Handle binaryvalue; ! short tokenvalue; /*can be coerced to a tyfunctype, see note in langtokens.h*/ ! struct tytreenode **codevalue; /*implemented in UserLang*/ ! Handle externalvalue; /*structure is defined in langexternal.h*/ ! Point pointvalue; ! Rect **rectvalue; ! Pattern **patternvalue; ! RGBColor **rgbvalue; ! Fixed fixedvalue; ! float singlevalue; ! double **doublevalue; ! Handle objspecvalue; ! hdlfilespec filespecvalue; ! Handle aliasvalue; /*AliasHandle*/ ! OSType enumvalue; ! #ifdef oplanglists struct tylistrecord **listvalue; struct tylistrecord **recordvalue; #else ! Handle listvalue; ! Handle recordvalue; #endif ! ! dbaddress diskvalue; /*4.0.2b1 dmb*/ ! #if LONGINT_LONGDATE == 1 ! tylonglongint **longlongintvalue; ! tylonglongint **longdatevalue; ! #endif ! } tyvaluedata; typedef struct tyvaluerecord { ! tyvaluetype valuetype; ! /*flags are never set in the database; used at runtime only*/ ! byte fltmpdata: 1; /*set when value data is handle to original, and needs duplication*/ ! byte fltmpstack: 1; /*set when value data is in the temp stack, and is volatile*/ ! byte flformalval: 1; /*set when value is set as default by function header*/ ! byte fldiskval: 1; /*set when value data points to disk block of actual value*/ ! tyvaluedata data; ! } tyvaluerecord; typedef struct tytreenode { + tytreetype nodetype; /*add, subtract, if, etc.*/ + tyvaluerecord nodeval; /*the value stored at this level of the tree*/ + struct tytreenode **link; /*links parameter lists, statement lists*/ + unsigned long lnum; /*which line number in the source was this node generated from?*/ + byte charnum; /*at what character offset? max is 255*/ + byte ctparams; /*number of params actually allocated, max is 4*/ /*param1 - param4 must be at the end of the record - see newtreenode*/ ! struct tytreenode **param1, **param2, **param3, **param4; } tytreenode, *ptrtreenode, **hdltreenode; Index: frontierdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v retrieving revision 1.7 retrieving revision 1.7.6.1 diff -C2 -d -r1.7 -r1.7.6.1 *** frontierdefs.h 11 Jan 2005 22:48:01 -0000 1.7 --- frontierdefs.h 31 Jan 2006 16:40:09 -0000 1.7.6.1 *************** *** 81,84 **** --- 81,86 ---- #undef fltracklocaladdresses /*2004-12-08 aradke: disable [buggy] code for tracking deleted local addresses*/ + // kw 2006-01-27 --- make new data types + #define LONGINT_LONGDATE 1 #ifdef MACVERSION |