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

2001-01-24 20:50 UTC-0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* source/pp/ppcore.c
     ! Fixed compilation and parsing of #command of single and bi-char operators
     ! Removed prior hack in hb_pp_RdStr() related to @[&-].

   * source/pp/pptable.c
     ! Fixed compilation of #command ?? [ <list,...> ] => QQOut( <list> )

   /* This [should] finally resolve all prior issues regarding @ and many other problems, of operators as command keys. */
This commit is contained in:
Ron Pinkas
2001-01-25 04:54:17 +00:00
parent d3abe7d275
commit 93f31e08c4
3 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -1,3 +1,13 @@
2001-01-24 20:50 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/pp/ppcore.c
! Fixed compilation and parsing of #command of single and bi-char operators
! Removed prior hack in hb_pp_RdStr() related to @[&-].
* source/pp/pptable.c
! Fixed compilation of #command ?? [ <list,...> ] => QQOut( <list> )
/* This [should] finally resolve all prior issues regarding @ and many other problems, of operators as command keys. */
2000-01-22 19:10 UTC-0800 Brian Hays <bhays@abacuslaw.com>
* harbour/include/hbsetup.h
+ added #define OS_EOL_LEN /* # of bytes in End of Line marker */

72
harbour/source/pp/ppcore.c
View File

@@ -140,6 +140,23 @@ void CloseInclude( void );
#define HB_PP_MAX_INCLUDES FOPEN_MAX - 5 - 1
/* Ron Pinkas added 2000-01-24 */
#define IS_2CHAR_OPERATOR( p ) ( p[0] && p[1] && ( strncmp( p, ":=", 2 ) == 0 || \
strncmp( p, "+=", 2 ) == 0 || \
strncmp( p, "-=", 2 ) == 0 || \
strncmp( p, "*=", 2 ) == 0 || \
strncmp( p, "/=", 2 ) == 0 || \
strncmp( p, "^=", 2 ) == 0 || \
strncmp( p, "==", 2 ) == 0 || \
strncmp( p, "<>", 2 ) == 0 || \
strncmp( p, "<=", 2 ) == 0 || \
strncmp( p, ">=", 2 ) == 0 || \
strncmp( p, "++", 2 ) == 0 || \
strncmp( p, "--", 2 ) == 0 || \
strncmp( p, "->", 2 ) == 0 ) )
/* END, Ron Pinkas added 2000-01-24 */
static int s_kolAddDefs = 0;
static int s_kolAddComs = 0;
static int s_kolAddTras = 0;
@@ -718,10 +735,32 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra )
/* I changed it to the following to allow < and = to be the first char within a translate or xtranslate */
while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && ( *sLine != '<' || ipos == 0 ) && ( *sLine != '=' || ipos == 0 ) && ( *sLine != '(' || ipos == 0 ) )
{
/* Ron Pinkas added 2000-01-24 */
if( ! ISNAME( *sLine ) )
{
if( IS_2CHAR_OPERATOR( sLine ) )
{
*(cmdname+ipos++) = *sLine++;
*(cmdname+ipos++) = *sLine++;
break;
}
else
{
*(cmdname+ipos++) = *sLine++;
break;
}
}
/* END, Ron Pinkas added 2000-01-24 */
*(cmdname+ipos++) = *sLine++;
}
*(cmdname+ipos) = '\0';
if( !ipos ) return;
if( !ipos )
{
return;
}
hb_strupr( cmdname );
HB_SKIPTABSPACES(sLine);
@@ -1077,18 +1116,37 @@ int hb_pp_ParseExpression( char * sLine, char * sOutLine )
}
else
{
/* Ron Pinkas commented 2000-01-24
i = 0;
while( *ptri != ' ' && *ptri != '\t' && *ptri != '\0' && *ptri != '\"' && *ptri != '\'' && *ptri != '(' && !ISNAME(*ptri) )
while( *ptri != ' ' && *ptri != '\t' && *ptri != '\0' && *ptri != '\"' && *ptri != '\'' && *ptri != '(' && !ISNAME(*ptri) )
{
*(sToken+i) = *ptri++;
i++;
}
*(sToken+i) = '\0';
*/
/* Ron Pinkas added 2000-01-24 */
if( IS_2CHAR_OPERATOR( ptri ) )
{
sToken[0] = *ptri++;
sToken[1] = *ptri++;
sToken[2] = '\0';
}
else
{
sToken[0] = *ptri++;
sToken[1] = '\0';
}
/* END, Ron Pinkas added 2000-01-24 */
}
HB_SKIPTABSPACES( ptri );
#if 0
printf( "Token: %s\n", sToken );
#endif
if( ( *ptri == '\0' || ( *ptri != '=' && (!IsInStr(*ptri,":/+*-%^") || *(ptri+1) != '=') &&
( *ptri != '-' || *(ptri+1) != '>' ) ) ) && ( stcmd = ComSearch(sToken,NULL) ) != NULL )
{
@@ -2669,9 +2727,11 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
int State = 0;
char cha, cLast = '\0', symbLast = '\0';
#if 0
/* Ron Pinkas added 2000-06-04 */
BOOL bNewLine = TRUE;
/* Ron Pinkas end 2000-06-04 */
#endif
HB_TRACE(HB_TR_DEBUG, ("hb_pp_RdStr(%p, %s, %d, %d, %s, %p, %p)", handl_i, buffer, maxlen, lDropSpaces, sBuffer, lenBuffer, iBuffer));
@@ -2805,19 +2865,21 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
}
break;
#if 0
/* Ron Pinkas added 2000-06-01 */
case ';':
bNewLine = TRUE;
break;
case '@':
if( bNewLine && ( sBuffer[ *iBuffer ] == '&' || sBuffer[ *iBuffer ] == '-' ) )
if( bNewLine && ( sBuffer[ *iBuffer ] == '&' || sBuffer[ *iBuffer ] == '.' || sBuffer[ *iBuffer ] == '-' ) )
{
buffer[readed++] = cha;
s_prevchar = cha;
cha = ' ';
}
break;
#endif
/* Ron Pinkas end 2000-06-01 */
}
@@ -2826,12 +2888,14 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
s_prevchar = cha;
}
#if 0
/* Ron Pinkas added 2000-06-04 */
if( cha != ' ' && cha != '\t' && cha != ';' )
{
bNewLine = FALSE;
}
/* Ron Pinkas end 2000-06-04 */
#endif
}
if( cha != ' ' && cha != '\t' )

2
harbour/source/pp/pptable.c
View File

@@ -169,7 +169,7 @@ void hb_pp_Table( void )
static COMMANDS sC___62 = {0,"SET","CURSOR \1A20ON,OFF,&>","SetCursor( if(Upper(\1A30) == 'ON', 1, 0) )",&sC___61 };
static COMMANDS sC___63 = {0,"SET","CURSOR (\1A00)","SetCursor( if(\1A00, 1, 0) )",&sC___62 };
static COMMANDS sC___64 = {0,"?","[ \1A10]","QOut( \1A00 )",&sC___63 };
static COMMANDS sC___65 = {0,"??","[ \1A10]","QQOut( \1A00 )",&sC___64 };
static COMMANDS sC___65 = {0,"?","? [ \1A10]","QQOut( \1A00 )",&sC___64 };
static COMMANDS sC___66 = {0,"EJECT","","__Eject()",&sC___65 };
static COMMANDS sC___67 = {0,"TEXT","","text QOut, QQOut",&sC___66 };
static COMMANDS sC___68 = {0,"TEXT","TO FILE \1A40","__TextSave( \1A30 ) ; text QOut, __TextRestore",&sC___67 };