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

2000-09-20 00:52 UTC+0200 JFL (mafact) <jfl@mafact.com>

Browse Source
This commit is contained in:
Jean-Francois Lefebvre
2000-09-19 22:57:06 +00:00
parent 40dd3e7683
commit 97f459c7d3
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
2000-09-20 00:52 UTC+0200 JFL (mafact) <jfl@mafact.com>
* source/pp/ppcore.c
corrected #command @@ => ...
#xtranslate = name{ ...
* include/hbclass.ch
supresses the (now) unneeded #xtranslate := name{ ...
as = name{... is working for the two case
2000-09-19 10:40 UTC+0800 Ron Pinkas <ron@profit-master.com>
* config/dos/djgpp.cf
+ Added support for $(L_USR)

17
harbour/include/hbclass.ch
View File

@@ -49,14 +49,14 @@
*/
DECLARE TClass ;
New( cName AS STRING, OPTIONAL SuperParams ) AS CLASS TClass ;
Create() AS OBJECT;
Instance() AS OBJECT ;
AddClsMthds( cName AS STRING, @MethodName(), nScope AS NUMERIC, n2 AS NUMERIC, n3 AS NUMERIC );
AddMultiClsData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMultiData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMethod( cName AS STRING, @MethodName(), nScope AS NUMERIC );
AddInLine( cName AS STRING, bBlock AS CODEBLOCK, nScope AS NUMERIC );
New( cName AS STRING, OPTIONAL SuperParams ) AS CLASS TClass ;
Create() AS OBJECT;
Instance() AS OBJECT ;
AddClsMthds( cName AS STRING, @MethodName(), nScope AS NUMERIC, n2 AS NUMERIC, n3 AS NUMERIC );
AddMultiClsData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMultiData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMethod( cName AS STRING, @MethodName(), nScope AS NUMERIC );
AddInLine( cName AS STRING, bBlock AS CODEBLOCK, nScope AS NUMERIC );
AddVirtual( cName AS STRING )
#ifndef HB_CLASS_CH_
@@ -197,7 +197,6 @@ DECLARE TClass ;
#ifdef HB_CLS_VO
#xtranslate ( <name>{ [<p,...>] } => ( <name>():New( <p> )
#xtranslate := <name>{ [<p,...>] } => := <name>():New( <p> )
#xtranslate = <name>{ [<p,...>] } => = <name>():New( <p> )
#xtranslate , <name>{ [<p,...>] } => , <name>():New( <p> )

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

@@ -696,7 +696,15 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra )
HB_SKIPTABSPACES( sLine );
ipos = 0;
while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<' && *sLine != '=' && ( *sLine != '(' || ipos == 0 ) )
/* JFL 2000-09-19 */
/* This was the original line as Alexander wrote it */
/* while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<' && *sLine != '=' && ( *sLine != '(' || ipos == 0 ) ) */
/* Now the line #xtranslate = name(.. => will be allowed
/* 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 ) )
{
*(cmdname+ipos++) = *sLine++;
}
@@ -728,9 +736,11 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra )
stcmd->mpatt = hb_strdup( mpatt );
stcmd->value = ( rlen > 0 ) ? hb_strdup( rpatt ) : NULL;
/* JFL */
/*
printf( "Name: %s Pat: %s Val: %s\n", stcmd->name, stcmd->mpatt, stcmd->value );
printf( "Parsecommand Name: %s Pat: %s Val: %s\n", stcmd->name, stcmd->mpatt, stcmd->value );
*/
}
else
hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_COMMAND_DEFINITION, NULL, NULL );
@@ -2518,7 +2528,11 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
case ';':
bNewLine = TRUE;
break;
case '@':
/* JFL 2000-09-19 */
/* Supressed this code wich avoid the use of #command @@ => ...
/* I'm not sure what it was intended for ... so I let it here commented */
/* case '@':
if( bNewLine && sBuffer[ *iBuffer ] != ' ' && sBuffer[ *iBuffer ] != '\t' )
{
buffer[readed++] = cha;
@@ -2526,6 +2540,8 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
cha = ' ';
}
break;
*/
/* Ron Pinkas end 2000-06-01 */
}
if( cha != ' ' && cha != ';' ) s_prevchar = cha;