From a360e087d053838fcf1ff764ff7742d5168b8bd2 Mon Sep 17 00:00:00 2001 From: Luis Krause Date: Wed, 17 Sep 2003 18:02:49 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 15 +++++++ harbour/source/common/reserved.c | 6 +++ harbour/source/rtl/tget.prg | 2 +- harbour/utils/hbdoc/genng.prg | 74 ++++++++++++++++---------------- harbour/utils/hbdoc/genrtf.prg | 32 +++++++------- 5 files changed, 75 insertions(+), 54 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 61f2f8ab26..7970b8e22a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-09-17 10:54 UTC-0800 Luis Krause Mantilla + * harbour/source/ftl/tget.prg + ! Fixed bug in unTransform() method that truncated + trailing spaces in variable when using "@R" template + Borrowed from xharbour by Andi Jahja: + * harbour/source/common/reserved.c + * harbour/utils/hbdoc/genrtf.prg + * harbour/utils/hbdoc/genng.prg + + Add option to omit reserved words by adding -DHB_RESERVED_OFF (default is ON) + + /* + This may be useful when one is working with pCode DLL where he must redefine + reserved words as dummy functions in the DLL. + */ + 2003-09-15 12:50 UTC+0300 Alexander Kresin * source/rdd/dbf1.c * source/rdd/dbfntx/dbfntx1.c diff --git a/harbour/source/common/reserved.c b/harbour/source/common/reserved.c index fcc7d04a72..cebe8f9f20 100644 --- a/harbour/source/common/reserved.c +++ b/harbour/source/common/reserved.c @@ -55,6 +55,7 @@ /* Table with reserved functions names * NOTE: THIS TABLE MUST BE SORTED ALPHABETICALLY */ +#if(!defined( HB_RESERVED_OFF )) static const char * s_szReservedFun[] = { "AADD" , "ABS" , @@ -123,9 +124,11 @@ static const char * s_szReservedFun[] = { }; #define RESERVED_FUNCTIONS sizeof( s_szReservedFun ) / sizeof( char * ) +#endif char * hb_compReservedName( char * szName ) { +#if(!defined( HB_RESERVED_OFF )) unsigned int wNum = 0; int iFound = 1; @@ -143,5 +146,8 @@ char * hb_compReservedName( char * szName ) } return iFound == 0 ? ( char * ) s_szReservedFun[ wNum - 1 ] : NULL; +#else + return NULL; +#endif } diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index 1eee9dcbb3..0ad56df5db 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -583,7 +583,7 @@ METHOD Untransform( cBuffer ) CLASS Get cBuffer := SubStr( cBuffer, 1, nFor - 1 ) + Chr( 1 ) + SubStr( cBuffer, nFor + 1 ) endif next - cBuffer := StrTran( cBuffer, Chr( 1 ), "" ) + cBuffer := PadR( StrTran( cBuffer, Chr( 1 ), "" ), Len( ::Original ) ) endif xValue := cBuffer diff --git a/harbour/utils/hbdoc/genng.prg b/harbour/utils/hbdoc/genng.prg index a1d51e6414..f4eac1d10a 100644 --- a/harbour/utils/hbdoc/genng.prg +++ b/harbour/utils/hbdoc/genng.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * GENNG support module for hbdoc document Extractor + * GENNG support module for hbdoc document Extractor * * Copyright 2000 Luiz Rafael Culik * www - http://www.harbour-project.org @@ -178,8 +178,8 @@ FUNCTION ProcessiNg() // Entry Point // // Put up information labels - @ INFILELINE, 20 SAY "Extracting: " - @ MODULELINE, 20 SAY "Documenting: " + @ INFILELINE, 20 SAY "Extracting: " + @ MODULELINE, 20 SAY "Documenting: " // loop through all of the files FOR i := 1 TO nFiles @@ -190,16 +190,16 @@ FUNCTION ProcessiNg() nCommentLen := IIF( AT( ".ASM", UPPER( aDirList[ i, F_NAME ] ) ) > 0, 2, 4 ) nReadHandle := FT_FUSE( aDirList[ i, F_NAME ] ) @ INFILELINE, 33 CLEAR TO INFILELINE, MAXCOL() - @ INFILELINE, 33 SAY PAD( aDirList[ i, F_NAME ], 47 ) + @ INFILELINE, 33 SAY PAD( aDirList[ i, F_NAME ], 47 ) @ MODULELINE, 33 CLEAR TO LINELINE, MAXCOL() - @ LINELINE, 27 SAY "Line:" + @ LINELINE, 27 SAY "Line:" nLineCnt := 0 IF nReadHandle < 0 WRITE_ERROR( "Can't open file: (Dos Error " + STR( FERROR() ) + ")",,,, aDirList[ i, F_NAME ] ) @ ERRORLINE, 0 CLEAR TO ERRORLINE, MAXCOL() - @ ERRORLINE, 20 SAY "Can't open file: (Dos Error " + STR( FERROR() ) + ") File=" + aDirList[ i, F_NAME ] + @ ERRORLINE, 20 SAY "Can't open file: (Dos Error " + STR( FERROR() ) + ") File=" + aDirList[ i, F_NAME ] LOOP ENDIF lEof := .F. @@ -214,7 +214,7 @@ FUNCTION ProcessiNg() cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) nLineCnt ++ IF nLineCnt % 10 = 0 - @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) + @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -277,9 +277,9 @@ FUNCTION ProcessiNg() cBuffer := ReadLN( @lEof ) nLineCnt ++ // Save the function name - cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) @ MODULELINE, 33 CLEAR TO MODULELINE, MAXCOL() - @ MODULELINE, 33 SAY cFuncName + @ MODULELINE, 33 SAY cFuncName nMode := D_NORMAL @@ -345,9 +345,9 @@ FUNCTION ProcessiNg() cBuffer := ReadLN( @lEof ) nLineCnt ++ // Save the function name - cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) @ MODULELINE, 33 CLEAR TO MODULELINE, MAXCOL() - @ MODULELINE, 33 SAY cFuncName + @ MODULELINE, 33 SAY cFuncName nMode := D_NORMAL // endif @@ -355,7 +355,7 @@ FUNCTION ProcessiNg() cBuffer := ReadLN( @lEof ) nLineCnt ++ // get the category - cCategory := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cCategory := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) // 3) One line description @@ -733,12 +733,12 @@ FUNCTION ProcNgiInput() FT_FUSE() NEXT - @ INFILELINE, 21 SAY "Extracting: " + @ INFILELINE, 21 SAY "Extracting: " FOR x := 1 TO LEN( afuncsam ) cFile := afuncsam[ x ] - @ INFILELINE, 33 SAY PAD( cfile, 47 ) + @ INFILELINE, 33 SAY PAD( cfile, 47 ) FT_FUSE( "ngi\" + cFile ) aAlso := {} @@ -779,7 +779,7 @@ FUNCTION ProcNgiInput() FOR x := 1 TO LEN( AFUNCSN_ ) cFile := afuncsn_[ x ] - @ INFILELINE, 33 SAY PAD( cfile, 47 ) + @ INFILELINE, 33 SAY PAD( cfile, 47 ) FT_FUSE( "ngi\" + cFile ) aAlso := {} @@ -838,7 +838,7 @@ FUNCTION ProcNgiInput() .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) <> "STRONGTYPING"; .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) <> "THEGARBAGECOLLECTOR" ; .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) <> "THEIDLESTATES" - @ INFILELINE, 33 SAY PAD( cfile, 47 ) + @ INFILELINE, 33 SAY PAD( cfile, 47 ) FT_FUSE( "ngi\" + acfiles[ x ] ) aAlso := {} @@ -1034,25 +1034,25 @@ FUNCTION GenNgTable( oNgi ) nPos := maxelem( afitable ) nPos2 := ASCAN( alensfitem, { | x | x == nPos } ) IF nNumTableItems == 2 - cMaxItem := ' ' + "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "»" + cMaxItem := ' ' + "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "»" IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( " É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 ELSE - oNgi:WritePar( "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 3 - cMaxItem := ' ' + "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "»" + cMaxItem := ' ' + "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "»" IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( " É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 ELSE - oNgi:WritePar( "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 4 - cMaxItem := ' ' + "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "»" + cMaxItem := ' ' + "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "»" IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( " É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "»", .F. ) //-4 ELSE - oNgi:WritePar( "É" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "»", .F. ) //-4 + oNgi:WritePar( "É" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "»", .F. ) //-4 ENDIF ENDIF FOR x := 1 TO LEN( asitable ) @@ -1085,22 +1085,22 @@ FUNCTION GenNgTable( oNgi ) ELSE IF nNumTableItems == 2 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "¹", .F. ) + oNgi:WritePar( " Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "¹", .F. ) ELSE - oNgi:WritePar( "Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "¹", .F. ) + oNgi:WritePar( "Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "¹", .F. ) ENDIF ELSEIF nNumTableItems == 3 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "¹", .F. ) //-4 + oNgi:WritePar( " Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "¹", .F. ) //-4 ELSE - oNgi:WritePar( "Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "¹", .F. ) //-4 + oNgi:WritePar( "Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "¹", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 4 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Î" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "¹", .F. ) //-4 + oNgi:WritePar( " Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Î" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "¹", .F. ) //-4 ELSE - oNgi:WritePar( "Ì" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Î" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "¹", .F. ) //-4 + oNgi:WritePar( "Ì" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Î" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Î" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Î" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "¹", .F. ) //-4 ENDIF ENDIF @@ -1110,24 +1110,24 @@ FUNCTION GenNgTable( oNgi ) IF nNumTableItems == 2 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( " È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "¼", .F. ) //-4 ELSE - oNgi:WritePar( "È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( "È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "¼", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 3 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( " È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "¼", .F. ) //-4 ELSE - oNgi:WritePar( " È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( " È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "¼", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 4 IF LEN( cMaxItem ) < 76 - oNgi:WritePar( " È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Ê" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( " È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Ê" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "¼", .F. ) //-4 ELSE - oNgi:WritePar( "È" + REPL( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + REPL( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + REPL( "Í", alensTitem[ nPos3 ] + 2 ) + "Ê" + REPL( "Í", alensfoitem[ nPos4 ] + 2 ) + "¼", .F. ) //-4 + oNgi:WritePar( "È" + Replicate(( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ê" + Replicate(( "Í", alensSitem[ nPos1 ] + 2 ) + "Ê" + Replicate(( "Í", alensTitem[ nPos3 ] + 2 ) + "Ê" + Replicate(( "Í", alensfoitem[ nPos4 ] + 2 ) + "¼", .F. ) //-4 ENDIF ENDIF diff --git a/harbour/utils/hbdoc/genrtf.prg b/harbour/utils/hbdoc/genrtf.prg index 52cfe1f187..7c9e171669 100644 --- a/harbour/utils/hbdoc/genrtf.prg +++ b/harbour/utils/hbdoc/genrtf.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * GENRTF support module for hbdoc document Extractor + * GENRTF support module for hbdoc document Extractor * * Copyright 2000 Luiz Rafael Culik * www - http://www.harbour-project.org @@ -113,7 +113,7 @@ FUNCTION ProcessRtf() LOCAL xAddBlank LOCAL nNumTopics := 0 LOCAL nCurTopics := 1 - LOCAL cBar := " " + REPL( ')', 80 ) + LOCAL cBar := " " + Replicate(( ')', 80 ) LOCAL nMode LOCAL cFuncName LOCAL cOneLine @@ -183,8 +183,8 @@ FUNCTION ProcessRtf() // Entry Point // // Put up information labels - @ INFILELINE, 20 SAY "Extracting: " - @ MODULELINE, 20 SAY "Documenting: " + @ INFILELINE, 20 SAY "Extracting: " + @ MODULELINE, 20 SAY "Documenting: " // loop through all of the files oRtf := tRtf():new( "rtf\Harbour.rtf" ):WriteHeader() FOR i := 1 TO nFiles @@ -194,16 +194,16 @@ FUNCTION ProcessRtf() nCommentLen := IIF( AT( ".ASM", UPPER( aDirList[ i, F_NAME ] ) ) > 0, 2, 4 ) nReadHandle := FT_FUSE( aDirList[ i, F_NAME ] ) @ INFILELINE, 33 CLEAR TO INFILELINE, MAXCOL() - @ INFILELINE, 33 SAY PAD( aDirList[ i, F_NAME ], 47 ) + @ INFILELINE, 33 SAY PAD( aDirList[ i, F_NAME ], 47 ) @ MODULELINE, 33 CLEAR TO LINELINE, MAXCOL() - @ LINELINE, 27 SAY "Line:" + @ LINELINE, 27 SAY "Line:" nLineCnt := 0 IF nReadHandle < 0 WRITE_ERROR( "Can't open file: (Dos Error " + STR( FERROR() ) + ")",,,, aDirList[ i, F_NAME ] ) @ ERRORLINE, 0 CLEAR TO ERRORLINE, MAXCOL() - @ ERRORLINE, 20 SAY "Can't open file: (Dos Error " + STR( FERROR() ) + ") File=" + aDirList[ i, F_NAME ] + @ ERRORLINE, 20 SAY "Can't open file: (Dos Error " + STR( FERROR() ) + ") File=" + aDirList[ i, F_NAME ] LOOP ENDIF lEof := .F. @@ -220,7 +220,7 @@ FUNCTION ProcessRtf() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ IF nLineCnt % 10 = 0 - @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) + @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -265,7 +265,7 @@ FUNCTION ProcessRtf() // oRtf:WriteKLink(aAlso,.f.) // else oRtf:WriteKLink(aAlso) -// endif +// endif ENDIF lDoc := .F. @@ -283,9 +283,9 @@ FUNCTION ProcessRtf() cBuffer := ReadLN( @lEof ) nLineCnt ++ // Save the function name - cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) @ MODULELINE, 33 CLEAR TO MODULELINE, MAXCOL() - @ MODULELINE, 33 SAY cFuncName + @ MODULELINE, 33 SAY cFuncName nMode := D_NORMAL @@ -349,9 +349,9 @@ FUNCTION ProcessRtf() cBuffer := ReadLN( @lEof ) nLineCnt ++ // Save the function name - cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cFuncName := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) @ MODULELINE, 33 CLEAR TO MODULELINE, MAXCOL() - @ MODULELINE, 33 SAY cFuncName + @ MODULELINE, 33 SAY cFuncName nMode := D_NORMAL @@ -362,7 +362,7 @@ FUNCTION ProcessRtf() cBuffer := ReadLN( @lEof ) nLineCnt ++ // get the category - cCategory := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) + cCategory := ALLTRIM( SUBSTR( cBuffer, nCommentLen ) ) // 3) One line description @@ -1087,11 +1087,11 @@ FUNCTION GenRtfTable( oRtf ) nPos := maxrtfelem( afitable ) nPos2 := ASCAN( alensfitem, { | x | x == nPos } ) - oRtf:WriteParBox( " " + REPL( CHR( 196 ), 80 ) ) + oRtf:WriteParBox( " " + Replicate(( CHR( 196 ), 80 ) ) FOR x := 1 TO LEN( afiTable ) ortf:WriteParFixed( IF( AT( "|", afiTable[ x ] ) > 0, STRTRAN( afiTable[ x ], "|", " " ), afiTable[ x ] ), '\fi-426\li426' ) NEXT - oRtf:WriteParBox( " " + REPL( CHR( 196 ), 80 ) ) + oRtf:WriteParBox( " " + Replicate(( CHR( 196 ), 80 ) ) // oRtf:WritePar( "" ) afiTable := {}