diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 80bd6be4e0..bfc368615d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-08-02 14:10 UTC+0800 Ron Pinkas + * source/compiler/harbour.l + * Changed USUAL to ANYTYPE + 2000-08-02 14:05 UTC+0800 Ron Pinkas * source/compiler/harbour.slx * Changed VARIANT to ANYTYPE as it appear to be the prefered choice. diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index 1a39d2f281..e006ea640a 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -36,9 +36,9 @@ /* Compile using: flex -i -8 -oyylex.c harbour.l */ -/* TODO: 4 character abbreviation for strong typing keywords should be added +/* 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. +/* TODO: VOID strong typing keyword should be added as a new type for NIL. [vszakats] */ #include @@ -127,8 +127,8 @@ Separator {SpaceTab} ' BEGIN STRING1; \" BEGIN STRING2; -\[ { - if( (hb_comp_iState == OPERATOR) || +\[ { + if( (hb_comp_iState == OPERATOR) || (hb_comp_iState == LSEPARATOR) || (hb_comp_iState == LARRAY) || (hb_comp_iState == IF) || @@ -388,7 +388,7 @@ Separator {SpaceTab} /* ************************************************************************ */ %} -"decl"|"decla"|"declar"|"declare" { +"decl"|"decla"|"declar"|"declare" { BEGIN DECLARE_; yylval.string = hb_compIdentifierNew( hb_strupr( yytext ), TRUE ); } @@ -408,14 +408,14 @@ Separator {SpaceTab} hb_comp_iState = IDENTIFIER; return IDENTIFIER; } - + ({Identifier}|{MacroTxt}){Separator}*[\n\,\[\:\;] { /* variable declaration */ BEGIN 0; yyless(0); hb_comp_iState = PRIVATE; return PRIVATE; -} -.|\n { +} +.|\n { BEGIN 0; unput( yytext[ yyleng-1 ] ); hb_comp_iState = DECLARE; @@ -508,7 +508,7 @@ Separator {SpaceTab} {Separator}+"while" { /* DO WHILE found -move it to WHILE state */ /* NOTE: we cannot decide here if it is DO WHILE * or DO while [WITH ] - */ + */ BEGIN 0; hb_comp_iState =DO; yyless( yyleng-5 ); @@ -1435,9 +1435,9 @@ Separator {SpaceTab} "as logical" { return AS_LOGICAL; } "as numeric" { return AS_NUMERIC; } "as object" { return AS_OBJECT; } -"as usual" { return AS_VARIANT; } +"as anytype" { return AS_VARIANT; } -"as array of usual" { return AS_ARRAY; } +"as array of anytype" { return AS_ARRAY; } "as array of array" { return AS_ARRAY_ARRAY; } "as array of codeblock" { return AS_BLOCK_ARRAY; } "as array of string" { return AS_CHARACTER_ARRAY; }