fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2000-07-30 14:32 UTC+0100 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-07-30 12:50:35 +00:00
parent 2f43451c9d
commit d8ee9cee66
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
harbour/ChangeLog
View File

@@ -1,6 +1,7 @@
2000-07-30 14:32 UTC+0100 Victor Szakats <info@szelvesz.hu>
* source/compiler/harbour.l
* source/compiler/hbpcode.c
* tests/testdecl.prg
* tests/testwarn.prg
* contrib/hbclip/hbclip.ch

10
harbour/source/compiler/harbour.l
View File

@@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -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; }

56
harbour/source/compiler/hbpcode.c
View File

@@ -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