From d8ee9cee664598713796e4ffc83fe07b3645c4c1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 30 Jul 2000 12:50:35 +0000 Subject: [PATCH] 2000-07-30 14:32 UTC+0100 Victor Szakats --- harbour/ChangeLog | 1 + harbour/source/compiler/harbour.l | 10 +++--- harbour/source/compiler/hbpcode.c | 56 +++++++++++++++---------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 78a571a318..297a7c844e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,6 +1,7 @@ 2000-07-30 14:32 UTC+0100 Victor Szakats * source/compiler/harbour.l + * source/compiler/hbpcode.c * tests/testdecl.prg * tests/testwarn.prg * contrib/hbclip/hbclip.ch diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index cc08c90222..8d9047af36 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -36,6 +36,11 @@ /* Compile using: flex -i -8 -oyylex.c harbour.l */ +/* TODO: 4 character abbreviation for strong typing keywords should be added + to be VO compatible [vszakats] */ +/* TODO: VOID strong typing keyword should be added as a new type for NIL. + [vszakats] */ + #include #include #include @@ -1378,11 +1383,6 @@ Separator {SpaceTab} } } -/* TODO: 4 character abbreviation should be added to be VO compatible - [vszakats] */ - -/* TODO: VOID should be added as a new type for NIL. [vszakats] */ - "as array" { return AS_ARRAY; } "as codeblock" { return AS_BLOCK; } "as string" { return AS_CHARACTER; } diff --git a/harbour/source/compiler/hbpcode.c b/harbour/source/compiler/hbpcode.c index e1cc1fac1a..198f46deea 100644 --- a/harbour/source/compiler/hbpcode.c +++ b/harbour/source/compiler/hbpcode.c @@ -279,9 +279,9 @@ void hb_compStrongType( int iSize ) else if ( cSubType1 == 's' ) sprintf( ( char * ) szType2, "ARRAY OF %s", pDeclared->pClass->szName ); else if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else sprintf( ( char * ) szType2, "%c", pFunc->pStack[ pFunc->iStackIndex ] ); @@ -614,9 +614,9 @@ void hb_compStrongType( int iSize ) cSubType1 = ( pFunc->pStack[ pFunc->iStackIndex - 1 ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType1, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL" ); else @@ -647,9 +647,9 @@ void hb_compStrongType( int iSize ) cSubType1 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType1, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType1, "NIL" ); else @@ -679,18 +679,18 @@ void hb_compStrongType( int iSize ) cSubType2 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType1, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL"); else sprintf( ( char * ) szType1, "%c", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); if ( cSubType2 && cSubType2 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType2 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType2, "NIL" ); else @@ -753,18 +753,18 @@ void hb_compStrongType( int iSize ) cSubType2 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType1, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL"); else sprintf( ( char * ) szType1, "%c", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); if ( cSubType2 && cSubType2 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType2 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType2, "NIL" ); else @@ -841,18 +841,18 @@ void hb_compStrongType( int iSize ) cSubType2 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - sprintf( ( char * ) szType1, "Variant.SubType\[NIL]" ); + sprintf( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL" ); else sprintf( ( char * ) szType1, "%c", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); if ( cSubType2 && cSubType2 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType2 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType2, "NIL" ); else @@ -915,18 +915,18 @@ void hb_compStrongType( int iSize ) cSubType2 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - sprintf( ( char * ) szType1, "Variant.SubType\[NIL]" ); + sprintf( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL"); else sprintf( ( char * ) szType1, "%c", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); if ( cSubType2 && cSubType2 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType2 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType2, "NIL" ); else @@ -980,9 +980,9 @@ void hb_compStrongType( int iSize ) cSubType1 = ( pFunc->pStack[ pFunc->iStackIndex - 1 ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - strcpy( ( char * ) szType1, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL" ); else @@ -1019,18 +1019,18 @@ void hb_compStrongType( int iSize ) cSubType2 = ( pFunc->pStack[ pFunc->iStackIndex ] -= VT_OFFSET_VARIANT ); if ( cSubType1 && cSubType1 == '-' ) - sprintf( ( char * ) szType1, "Variant.SubType\[NIL]" ); + sprintf( ( char * ) szType1, "Usual.SubType\[NIL]" ); else if ( cSubType1 ) - sprintf( ( char * ) szType1, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); + sprintf( ( char * ) szType1, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); else if ( pFunc->pStack[ pFunc->iStackIndex - 1 ] == '-' ) strcpy( ( char * ) szType1, "NIL"); else sprintf( ( char * ) szType1, "%c", pFunc->pStack[ pFunc->iStackIndex - 1 ] ); if ( cSubType2 && cSubType2 == '-' ) - strcpy( ( char * ) szType2, "Variant.SubType\[NIL]" ); + strcpy( ( char * ) szType2, "Usual.SubType\[NIL]" ); else if ( cSubType2 ) - sprintf( ( char * ) szType2, "Variant.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); + sprintf( ( char * ) szType2, "Usual.SubType\[%c]", pFunc->pStack[ pFunc->iStackIndex ] ); else if ( pFunc->pStack[ pFunc->iStackIndex ] == '-' ) strcpy( ( char * ) szType2, "NIL" ); else