diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b67d93c5aa..337c32d2b8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,40 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-20 10:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbmzip/hbmzip.c + * contrib/hbmzip/readme.txt + ! Typos. + + * utils/hbdoc/rtf.prg + * utils/hbdoc/fclass1.prg + * utils/hbdoc/genos2.prg + * utils/hbdoc/genng.prg + * utils/hbdoc/genasc.prg + * utils/hbdoc/genchm.prg + * utils/hbdoc/os2.prg + * utils/hbdoc/html.prg + * utils/hbdoc/genhpc.prg + * utils/hbdoc/ng.prg + * utils/hbdoc/ffile1.prg + * utils/hbdoc/ft_funcs.prg + * utils/hbdoc/hbdoc.prg + * utils/hbdoc/troff.prg + * utils/hbdoc/genhtm.prg + * utils/hbdoc/genpdf1.prg + * utils/hbdoc/gentrf.prg + * utils/hbdoc/genrtf.prg + * utils/hbmake/fclass1.prg + * utils/hbmake/tmake.prg + * utils/hbmake/ffile1.prg + * utils/hbmake/ft_funcs.prg + * utils/hbmake/pickarry.prg + * utils/hbmake/pickfile.prg + * utils/hbmake/hbmutils.prg + * utils/hbmake/hbmake.prg + ! Fixed problems reported by Bill Robertson. (Thanks) + * Some general code cleanups. + 2008-08-19 17:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/en/string.txt * doc/en/rddord.txt diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c index 3f8502518d..b9a7923ef9 100644 --- a/harbour/contrib/hbmzip/hbmzip.c +++ b/harbour/contrib/hbmzip/hbmzip.c @@ -908,7 +908,7 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, const char* szFileName, c ulLen = strlen( szName ); /* Test shows that files in subfolders can be stored to zip file without - explicitly adding folder. So, let's create a requred path */ + explicitly adding folder. So, let's create a required path */ ulPos = 1; while( ulPos < ulLen ) diff --git a/harbour/contrib/hbmzip/readme.txt b/harbour/contrib/hbmzip/readme.txt index a255c77cb6..7eb2bc1fd3 100644 --- a/harbour/contrib/hbmzip/readme.txt +++ b/harbour/contrib/hbmzip/readme.txt @@ -72,7 +72,7 @@ HB_UnzipFileInfo( hUnzip, @cZipName, @dDate, @cTime, HB_UnzipFileOpen( hUnzip, [ cPassword ] ) --> nError HB_UnzipFileRead( hUnzip, @cBuf [, nLen ] ) --> nRead HB_UnzipFileClose( hUnzip ) --> nError -HB_UnzipExtractCurrentFile( hZip, [ cFileName ], [ cPassword ] ) --> nError +HB_UnzipExtractCurrentFile( hUnzip, [ cFileName ], [ cPassword ] ) --> nError HB_ZipDeleteFile( cZipFile, cFileMask ) --> nError diff --git a/harbour/utils/hbdoc/fclass1.prg b/harbour/utils/hbdoc/fclass1.prg index 8fbf04eaba..57f13842bd 100644 --- a/harbour/utils/hbdoc/fclass1.prg +++ b/harbour/utils/hbdoc/fclass1.prg @@ -51,8 +51,8 @@ */ #include "hbclass.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" *+-------------------------------------------------------------------- *+ diff --git a/harbour/utils/hbdoc/ffile1.prg b/harbour/utils/hbdoc/ffile1.prg index 758ee96b7c..14a5ff60ab 100644 --- a/harbour/utils/hbdoc/ffile1.prg +++ b/harbour/utils/hbdoc/ffile1.prg @@ -51,8 +51,8 @@ */ #include "hbclass.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" *+-------------------------------------------------------------------- *+ @@ -365,7 +365,7 @@ METHOD goBottom() CLASS FileBase lWithCRLF := pTRUE ENDIF cBuffer := SUBSTR( cBuffer, RAT( pCRLF, cBuffer ) + 2 ) - ::nSkipLength := LEN( cBuffer ) + IF( lWithCRLF, 2, 0 ) + ::nSkipLength := LEN( cBuffer ) + iif( lWithCRLF, 2, 0 ) ::nposition := FSEEK( Self:nDosHandle, - ( LEN( cBuffer ) ), 2 ) IF lWithCRLF ::nposition := FSEEK( Self:nDosHandle, - 2, 1 ) @@ -445,7 +445,7 @@ METHOD WRITE( cChar ) CLASS FileBase IF !lForward nRead := FSEEK( Self:nDosHandle, ; - - ( IF( ::nposition < pBUFFER_LENGTH, ; + - ( iif( ::nposition < pBUFFER_LENGTH, ; ::nposition, ; pBUFFER_LENGTH ) ), ; 1 ) // rewind backwards @@ -462,7 +462,7 @@ METHOD WRITE( cChar ) CLASS FileBase ELSE cBuffer := SPACE( pBUFFER_LENGTH ) nRead := FREAD( Self:nDosHandle, @cBuffer, pBUFFER_LENGTH ) - FSEEK( Self:nDosHandle, - ( IF( nRead < pBUFFER_LENGTH, nRead, ; + FSEEK( Self:nDosHandle, - ( iif( nRead < pBUFFER_LENGTH, nRead, ; pBUFFER_LENGTH ) ), 1 ) // Rewind // Now, parse the string. and file @@ -611,7 +611,7 @@ METHOD BufferGet( lForward ) CLASS FileBase IF !lForward nRead := FSEEK( Self:nDosHandle, ; - - ( IF( ::nposition < pBUFFER_LENGTH, ; + - ( iif( ::nposition < pBUFFER_LENGTH, ; ::nposition, ; pBUFFER_LENGTH ) ), ; 1 ) // rewind backwards @@ -628,7 +628,7 @@ METHOD BufferGet( lForward ) CLASS FileBase ELSE cBuffer := SPACE( pBUFFER_LENGTH ) nRead := FREAD( Self:nDosHandle, @cBuffer, pBUFFER_LENGTH ) - FSEEK( Self:nDosHandle, - ( IF( nRead < pBUFFER_LENGTH, nRead, ; + FSEEK( Self:nDosHandle, - ( iif( nRead < pBUFFER_LENGTH, nRead, ; pBUFFER_LENGTH ) ), 1 ) // Rewind // Now, parse the string. and file diff --git a/harbour/utils/hbdoc/ft_funcs.prg b/harbour/utils/hbdoc/ft_funcs.prg index de5557fc5c..34e6f43e8d 100644 --- a/harbour/utils/hbdoc/ft_funcs.prg +++ b/harbour/utils/hbdoc/ft_funcs.prg @@ -52,8 +52,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' -#include 'common.ch' +#include "hbdocdef.ch" +#include "common.ch" #define xReadBuffer 4096 DECLARE FT_FUSE(CFILE AS STRING,NMODE AS NUMERIC) AS NUMERIC @@ -153,11 +153,11 @@ RETURN cLine *+ FUNCTION FT_FReadLn() - LOCAL cBuffer AS STRING := '' + LOCAL cBuffer AS STRING := "" cBuffer := FReadLn( @cBuffer ) - cBuffer := STRTRAN( cBuffer, CHR( 13 ), '' ) + cBuffer := STRTRAN( cBuffer, CHR( 13 ), "" ) RETURN cBuffer @@ -224,13 +224,13 @@ FUNCTION StrPos( cBuffer AS STRING) .AND. cChar <= CHR( 122 ) .OR. cChar >= CHR( 48 ) .AND. cChar <= CHR( 57 ) ; .OR. cChar == CHR( 60 ) .OR. cchar == CHR( ASC( "-" ) ) ; .OR. cchar == CHR( ASC( "(" ) ) .OR. cchar == CHR( ASC( "|" ) ) .OR. ; - cchar == CHR( ASC( '.' ) ) .OR. cchar == CHR( ASC( '*' ) ) .OR. ; - cchar == CHR( ASC( '#' ) ) .OR. cchar == CHR( ASC( '"' ) ) .OR. ; - cchar == CHR( ASC( '/' ) ) .OR. cchar == CHR( ASC( "@" ) ) ; - .OR. cchar == CHR( ASC( "=" ) ) .OR. cchar == CHR( ASC( 'Ä' ) ) ; - .OR. cchar == CHR( ASC( '?' ) ) .OR. cchar == CHR( ASC( '!' ) ) ; - .OR. cchar == CHR( ASC( "<" ) ) .OR. cchar == CHR( ASC( '>' ) ) ; - .OR. cchar == CHR( ASC( '!' ) ) .OR. cchar == CHR( ASC( '+' ) ) + cchar == CHR( ASC( "." ) ) .OR. cchar == CHR( ASC( "*" ) ) .OR. ; + cchar == CHR( ASC( "#" ) ) .OR. cchar == CHR( ASC( '"' ) ) .OR. ; + cchar == CHR( ASC( "/" ) ) .OR. cchar == CHR( ASC( "@" ) ) ; + .OR. cchar == CHR( ASC( "=" ) ) .OR. cchar == CHR( ASC( "Ä" ) ) ; + .OR. cchar == CHR( ASC( "?" ) ) .OR. cchar == CHR( ASC( "!" ) ) ; + .OR. cchar == CHR( ASC( "<" ) ) .OR. cchar == CHR( ASC( ">" ) ) ; + .OR. cchar == CHR( ASC( "!" ) ) .OR. cchar == CHR( ASC( "+" ) ) nPos := x @@ -262,7 +262,7 @@ FUNCTION GetNumberofTableItems( cBuffer ) IF AT( SPACE( 3 ), cBuffer ) == 0 nItem ++ ELSE - cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, '' ) ) + cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, "" ) ) nItem ++ ENDIF ENDDO @@ -288,7 +288,7 @@ FUNCTION FREADline( nH as Numeric, cB AS STRING, nMaxLine as Numeric) LOCAL nNumRead AS NUMERIC LOCAL lReturn as Logical cLine := SPACE( nMaxLine ) - cB := '' + cB := "" nSavePos := FSEEK( nH, 0, FS_RELATIVE ) nNumRead := FREAD( nH, @cLine, nMaxLine ) IF ( nEol := AT( EOL, SUBSTR( cLine, 1, nNumRead ) ) ) == 0 diff --git a/harbour/utils/hbdoc/genasc.prg b/harbour/utils/hbdoc/genasc.prg index 2c34466f85..f610ba4a71 100644 --- a/harbour/utils/hbdoc/genasc.prg +++ b/harbour/utils/hbdoc/genasc.prg @@ -151,12 +151,12 @@ FUNCTION ASCIIFiles() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM LOCAL cFileNameOri #define D_NORMAL 1 diff --git a/harbour/utils/hbdoc/genchm.prg b/harbour/utils/hbdoc/genchm.prg index e59f0d8615..eee390fd31 100644 --- a/harbour/utils/hbdoc/genchm.prg +++ b/harbour/utils/hbdoc/genchm.prg @@ -57,8 +57,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' -#include 'common.ch' +#include "hbdocdef.ch" +#include "common.ch" // output lines on the screen #define INFILELINE 10 @@ -85,7 +85,7 @@ STATIC aCurDoc := {} STATIC nCurDoc := 1 STATIC lWasTestExamples := .F. -STATIC aColorTable := { 'aqua', 'black', 'fuchia', 'grey', 'green', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow' } +STATIC aColorTable := { "aqua", "black", "fuchia", "grey", "green", "lime", "maroon", "navy", "olive", "purple", "red", "silver", "teal", "white", "yellow" } // Static variables added for the chm2 addition STATIC nArrayItem := 1 // Index used to loop through the array of the array @@ -171,19 +171,19 @@ FUNCTION ProcessChm() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM // // Entry Point @@ -224,7 +224,7 @@ FUNCTION ProcessChm() // Read a line cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - cBuffer := STRTRAN( cBuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) nLineCnt ++ IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) @@ -367,11 +367,11 @@ FUNCTION ProcessChm() ENDDO cFileName := LEFT( cFileName, 36 ) + ".htm" IF lDoc - oChm := THTML():NewChm( 'chm\' + cFileName ,,cFuncName) + oChm := THTML():NewChm( "chm\" + cFileName ,,cFuncName) ENDIF IF lFirstPass .AND. lClassDoc lFirstPass := .F. - oChm := THTML():NewChm( 'chm\' + cFileName ,,cFuncName) + oChm := THTML():NewChm( "chm\" + cFileName ,,cFuncName) ENDIF IF oChm:nHandle < 1 ? "Error creating", cFileName, ".htm" @@ -409,11 +409,11 @@ FUNCTION ProcessChm() lEndDesc := .F. ENDIF - oChm:WriteText( '
' ) - oChm:WriteText( '
' ) - oChm:Writetext( '
' ) - oChm:WriteText( '
' ) - oChm:WriteText( '
' ) + oChm:WriteText( "
" ) + oChm:WriteText( "
" ) + oChm:Writetext( "
" ) + oChm:WriteText( "
" ) + oChm:WriteText( "
" ) oChm:WriteText( "" ) @@ -457,7 +457,7 @@ FUNCTION ProcessChm() IF AT( cSyn, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oChm:WriteParBold( " Syntax", .F., .F. ) - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) nMode := D_SYNTAX lAddBlank := .T. lEndSyntax := .T. @@ -465,7 +465,7 @@ end ELSEIF AT( cConstruct, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oChm:WriteParBold( " Constructor syntax", .F., .F. ) - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) nMode := D_SYNTAX lAddBlank := .T. lEndSyntax := .T. @@ -473,7 +473,7 @@ end ELSEIF AT( cArg, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oChm:WriteParBold( " Arguments" ) - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) nMode := D_ARG lAddBlank := .T. @@ -486,7 +486,7 @@ end ENDIF oChm:WriteParBold( " Returns" ) - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) nMode := D_ARG lAddBlank := .T. lEndReturns := .T. @@ -498,7 +498,7 @@ end ENDIF oChm:WriteParBold( " Description" ) - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) nMode := D_DESCRIPTION lAddBlank := .T. @@ -662,7 +662,7 @@ oChm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) IF lBlankLine - oChm:WriteText( '
' ) + oChm:WriteText( "
" ) lAddBlank := .F. ENDIF @@ -696,8 +696,8 @@ oChm:writeText("
") //:endpar() lAddBlank := .F. ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) - oChm:WriteText( "

" + cBuffer + '
' ) - oChm:writetext('

') + oChm:WriteText( "
" + cBuffer + "
" ) + oChm:writetext("

") ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; @@ -709,8 +709,8 @@ oChm:writeText("
") //:endpar() ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) ) if !lBlankline - oChm:WriteText( "
" + cBuffer + '
' ) - oChm:writetext('

') + oChm:WriteText( "
" + cBuffer + "
" ) + oChm:writetext("

") endif ELSEIF nMode == D_INCLUDE @@ -729,7 +729,7 @@ oChm:writeText("
") //:endpar() lAddBlank := .F. ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) - oChm:WriteText( "" + cBuffer + '' ) + oChm:WriteText( "" + cBuffer + "" ) ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE @@ -741,7 +741,7 @@ oChm:writeText("
") //:endpar() lAddBlank := .F. ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) ) - oChm:WriteText( "" + cBuffer + '' ) + oChm:WriteText( "" + cBuffer + "" ) ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE @@ -782,7 +782,7 @@ oChm:writeText("
") //:endpar() IF !lClassDoc .AND. lEof IF VALTYPE( oChm ) == "O" - oChm:WriteText( '

' ) + oChm:WriteText( "

" ) oChm:Close() ENDIF @@ -895,7 +895,7 @@ FUNCTION ProcessChm2() // Add the file extension cFileName := LEFT( cFileName, 36 ) + ".htm" - oHtmClass := THTML():New( 'chm\' + cFileName ) + oHtmClass := THTML():New( "chm\" + cFileName ) // If file creation was successful IF oHtmClass:nHandle > 0 @@ -969,7 +969,7 @@ FUNCTION ProcessChm2() // Create new HTML for the properties and methods IF LEN(aCurDoc) > 1 cFileName := LEFT(cFileName, LEN(cFileName) - 4) + "_content.htm" - oHtmClassContent := THTML():New( 'chm\' + cFileName ) + oHtmClassContent := THTML():New( "chm\" + cFileName ) IF oHtmClassContent:nHandle > 0 // Add a title to the HTML @@ -1120,7 +1120,7 @@ RETURN NIL FUNCTION ReadFromTop3(nh) - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL aTempArray := {} DO WHILE FReadLine(nH, @cBuffer, 4096) @@ -1315,7 +1315,7 @@ RETURN cPar FUNCTION ProcChmAlso( nWriteHandle, cSeeAlso ) LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" LOCAL xTemp LOCAL nLen LOCAL xPos @@ -1413,25 +1413,25 @@ RETURN nil *+ FUNCTION FormatChmBuff( cBuffer, cStyle ) - LOCAL creturn := '' - LOCAL cline := '' - LOCAL cOldLine := '' - LOCAL cBuffend := '' + LOCAL creturn := "" + LOCAL cline := "" + LOCAL cOldLine := "" + LOCAL cBuffend := "" LOCAL lEndBuffer := .F. LOCAL lArgBold := .F. LOCAL npos //LOCAL nposend // Variable not used in fucntion, it may be deleted? - creturn := cBuffer + ' ' - IF AT( '', creturn ) > 0 .OR. EMPTY( cBuffer ) + creturn := cBuffer + " " + IF AT( "", creturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - creturn := '' + creturn := "" ENDIF RETURN creturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuffer := .T. ENDIF @@ -1446,24 +1446,24 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) - cReturn := '' + cReturn + ' ' + cReturn := "" + cReturn + " " - ELSEIF cStyle == 'Syntax' + ELSEIF cStyle == "Syntax" cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "<", "<" ) cReturn := STRTRAN( cReturn, ">", ">" ) cReturn := AllTrim(cReturn) - creturn := '' + creturn + ' ' - ELSEIF cStyle == 'Arguments' + creturn := "" + creturn + " " + ELSEIF cStyle == "Arguments" nPos := 0 - IF AT( "", cReturn ) > 0 .and. at('',cReturn)=0 + IF AT( "", cReturn ) > 0 .and. at("",cReturn)=0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) cReturn := ALLTRIM( cReturn ) @@ -1475,11 +1475,11 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) cOldLine := STRTRAN( cOldLine, ">", ">" ) lArgBold := .T. ENDIF - elseif AT( "", cReturn ) > 0 .and. at('',cReturn)>0 + elseif AT( "", cReturn ) > 0 .and. at("",cReturn)>0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) cReturn := ALLTRIM( cReturn ) - nPos := AT( '', cReturn ) + nPos := AT( "", cReturn ) cOldLine := LEFT( cReturn, nPos + 3 ) cReturn := STRTRAN( cReturn, cOldLine, "" ) IF AT( "@", cOldLine ) > 0 .OR. AT( "()", cOldLine ) > 0 .OR. AT( "<", cOldLine ) > 0 .OR. AT( "_", cOldLine ) > 0 @@ -1510,7 +1510,7 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) @@ -1522,9 +1522,9 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) cOldLine := STRTRAN( cOldLine, ">", ">" ) IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF // ENDIF lArgBold := .F. @@ -1560,7 +1560,7 @@ FUNC checkChmcolor( cbuffer, ncolorpos ) cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd ) nreturn := ASCAN( acolortable, { | x | UPPER( x ) == UPPER( ccolor ) } ) IF nreturn > 0 - creturn := '' + creturn := "" ENDIF cBuffer := STRTRAN( cBuffer, cOldColorString, cReturn ) ENDDO @@ -1578,16 +1578,16 @@ RETURN cbuffer *+ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) - LOCAL cOldLine := '' + LOCAL cOldLine := "" LOCAL npos LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL creturn := '' + LOCAL ccolor := "" + LOCAL creturn := "" LOCAL nIdentLevel LOCAL lHasFixed := .F. LOCAL lEndPar := .F. - LOCAL cLine := '' + LOCAL cLine := "" LOCAL lEndFixed := .F. LOCAL lArgBold := .F. LOCAL LFstTableItem := .T. @@ -1595,8 +1595,8 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) LOCAL lEndBuffer := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) @@ -1624,9 +1624,9 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDIF IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -1637,10 +1637,10 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', ' ' ) - nColorPos := AT( '", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", " " ) + nColorPos := AT( " 0 checkChmcolor( @cbuffer, ncolorpos ) ENDIF @@ -1648,7 +1648,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) IF cStyle == "Description" .OR. cStyle == "Compliance" nIdentLevel := 6 nPos := 0 - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1666,7 +1666,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ELSEIF cStyle == "Arguments" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1675,7 +1675,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDIF ELSEIF cStyle == "Syntax" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF @@ -1686,7 +1686,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDIF ELSEIF cStyle == "Default" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1697,9 +1697,9 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) - if AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + if AT( "", cBuffer ) > 0 lHasFixed:=.T. else lHasFixed:=.F. @@ -1719,7 +1719,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) cOldLine := ALLTRIM(STRTRAN( cOldLine, "", "" )) ENDIF IF AT( DELIM, cOldLine ) == 0 - cReturn += ALLTRIM( cOldLine ) + ' ' + cReturn += ALLTRIM( cOldLine ) + " " ENDIF IF AT( DELIM, cOldLine ) > 0 FT_FSKIP( - 1 ) @@ -1733,7 +1733,7 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) ENDDO // oChm:WriteText( "
" ) END - IF AT( '', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 @@ -1787,15 +1787,15 @@ FUNCTION ProcChmTable( cBuffer, nNum ) cBuffer := STRTRAN( cbuffer, "", "" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos ] ENDIF IF EMPTY( cBuffer ) - citem := '' - citem2 := '' - citem3 := '' - citem4 := '' + citem := "" + citem2 := "" + citem3 := "" + citem4 := "" ELSE cBuffer := STRTRAN( cBuffer, "<", "<" ) cBuffer := STRTRAN( cBuffer, ">", ">" ) @@ -1818,20 +1818,20 @@ FUNCTION ProcChmTable( cBuffer, nNum ) ENDIF ENDIF IF cColor != NIL - AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) - AADD( asiTable, "" + cItem2 + '' ) + AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + "" ) + AADD( asiTable, "" + cItem2 + "" ) ELSE AADD( afiTable, RTRIM( LTRIM( cItem ) ) ) AADD( asiTable, cItem2 ) ENDIF IF cColor != NIL - AADD( atiTable, "" + cItem3 + '' ) + AADD( atiTable, "" + cItem3 + "" ) ELSE AADD( atiTable, cItem3 ) ENDIF IF cColor != NIL - AADD( afoiTable, "" + cItem4 + '' ) + AADD( afoiTable, "" + cItem4 + "" ) ELSE AADD( afoiTable, cItem4 ) ENDIF @@ -1853,19 +1853,19 @@ FUNCTION GenChmTable( oChm ) LOCAL x /* oChm:WriteText( "
" ) oChm:WriteText( "
" )*/ - oChm:WriteText( '' ) //-4 + oChm:WriteText( "
" ) //-4 FOR x := 1 TO LEN( asitable ) IF !EMPTY( asitable[ x ] ) IF nNumTableItems == 2 - oChm:WriteText( ' ' ) + oChm:WriteText( " " ) ELSEIF nNumTableItems == 3 - oChm:WriteText( ' ' ) + oChm:WriteText( " " ) ELSEIF nNumTableItems == 4 - oChm:WriteText( ' ' ) + oChm:WriteText( " " ) ENDIF ELSE - oChm:WriteText( ' ' ) + oChm:WriteText( " " ) ENDIF NEXT @@ -1884,7 +1884,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) diff --git a/harbour/utils/hbdoc/genhpc.prg b/harbour/utils/hbdoc/genhpc.prg index 2abeb3f7a5..69ae667bb3 100644 --- a/harbour/utils/hbdoc/genhpc.prg +++ b/harbour/utils/hbdoc/genhpc.prg @@ -157,12 +157,12 @@ FUNCTION ProcessFiles() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM // // Entry Point @@ -334,9 +334,9 @@ FUNCTION ProcessFiles() nMode := D_ONELINE // Now start writing out what we know - FWRITE( nWriteHandle, '.topic ' + CheckTop( PAD( cFuncName, 20 ) ) + CRLF ) + FWRITE( nWriteHandle, ".topic " + CheckTop( PAD( cFuncName, 20 ) ) + CRLF ) // FWRITE(nWriteHandle,"!short: "+PAD(cFuncName,17)+cOneLine+CRLF) - FWRITE( nWriteHandle, '.title ' + cFuncName + CRLF ) + FWRITE( nWriteHandle, ".title " + cFuncName + CRLF ) // FWRITE(nWriteHandle," "+cFuncName+CRLF) FWRITE( nWriteHandle, ".par font 6 size 12 align center " + CRLF + cOneLine + CRLF + ".endpar" + CRLF ) FWRITE( nWriteHandle, HB_OEMTOANSI( cBar ) ) @@ -552,7 +552,7 @@ RETURN NIL FUNCTION Proccalso( nWriteHandle, cSeeAlso ) LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" LOCAL xTemp LOCAL nLen LOCAL xPos @@ -573,7 +573,7 @@ FUNCTION Proccalso( nWriteHandle, cSeeAlso ) xPos := AT( " ", xTemp ) IF xPos > 0 nLen -= LEN( xTemp ) + 3 - xTemp += "~" + SUBSTR( xTemp, 1, xPos - 1 ) + '_' + SUBSTR( xTemp, xPos + 1 ) + "~ " + xTemp += "~" + SUBSTR( xTemp, 1, xPos - 1 ) + "_" + SUBSTR( xTemp, xPos + 1 ) + "~ " cTemp := "~" + xTemp ELSE nLen -= LEN( xTemp ) + 2 @@ -596,7 +596,7 @@ FUNCTION Proccalso( nWriteHandle, cSeeAlso ) xPos := AT( " ", xTemp ) IF xPos > 0 nLen -= LEN( xTemp ) + 3 - xTemp += "~" + SUBSTR( xTemp, 1, xPos - 1 ) + '_' + SUBSTR( xTemp, xPos + 1 ) + "~" + xTemp += "~" + SUBSTR( xTemp, 1, xPos - 1 ) + "_" + SUBSTR( xTemp, xPos + 1 ) + "~" cTemp := "~" + xTemp ELSE nLen -= LEN( xTemp ) + 2 @@ -652,7 +652,7 @@ FUNCTION CheckTop( cTop ) cTop := RTRIM( cTop ) nPos := AT( " ", cTop ) IF nPos > 0 - cTemp := SUBSTR( cTop, 1, nPos - 1 ) + '_' + SUBSTR( cTop, nPos + 1 ) + cTemp := SUBSTR( cTop, 1, nPos - 1 ) + "_" + SUBSTR( cTop, nPos + 1 ) ELSE cTemp := cTop ENDIF diff --git a/harbour/utils/hbdoc/genhtm.prg b/harbour/utils/hbdoc/genhtm.prg index d7e1e36302..1e8a711ed3 100644 --- a/harbour/utils/hbdoc/genhtm.prg +++ b/harbour/utils/hbdoc/genhtm.prg @@ -57,8 +57,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' -#include 'common.ch' +#include "hbdocdef.ch" +#include "common.ch" // output lines on the screen #define INFILELINE 10 @@ -85,7 +85,7 @@ static cLastText := "" Static clastBuffer := "" STATIC nCurDoc := 1 STATIC lWasTestExamples := .F. -STATIC aColorTable := { 'aqua', 'black', 'fuchia', 'grey', 'green', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow' } +STATIC aColorTable := { "aqua", "black", "fuchia", "grey", "green", "lime", "maroon", "navy", "olive", "purple", "red", "silver", "teal", "white", "yellow" } // Static variables added for the htm2 addition STATIC cDocType := "" @@ -172,19 +172,19 @@ FUNCTION ProcessWww() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM LOCAL nDocs:=0 // @@ -245,7 +245,7 @@ FUNCTION ProcessWww() // Read a line cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - cBuffer := STRTRAN( cBuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) nLineCnt ++ IF nLineCnt % 10 == 0 @@ -400,11 +400,11 @@ FUNCTION ProcessWww() cFileName := LEFT( cFileName, 36 ) + ".htm" IF lDoc - oHtm := THTML():New( 'htm\' + cFileName ) + oHtm := THTML():New( "htm\" + cFileName ) ENDIF IF lFirstPass .AND. lClassDoc lFirstPass := .F. - oHtm := THTML():New( 'htm\' + cFileName ) + oHtm := THTML():New( "htm\" + cFileName ) ENDIF IF ohtm:nHandle < 1 ? "Error creating", cFileName, ".htm" @@ -441,11 +441,11 @@ FUNCTION ProcessWww() endif ENDIF - ohtm:WriteText( '
' ) - ohtm:WriteText( '
' ) - ohtm:Writetext( '
' ) - ohtm:WriteText( '
' ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) + ohtm:WriteText( "
" ) + ohtm:Writetext( "
" ) + ohtm:WriteText( "
" ) + ohtm:WriteText( "
" ) oHtm:WriteText( "" ) @@ -489,7 +489,7 @@ FUNCTION ProcessWww() IF AT( cSyn, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oHtm:WriteParBold( " Syntax", .F., .F. ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) nMode := D_SYNTAX lAddBlank := .T. lEndSyntax := .T. @@ -497,7 +497,7 @@ end ELSEIF AT( cConstruct, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oHtm:WriteParBold( " Constructor syntax", .F., .F. ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) nMode := D_SYNTAX lAddBlank := .T. lEndSyntax := .T. @@ -505,7 +505,7 @@ end ELSEIF AT( cArg, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) oHtm:WriteParBold( " Arguments" ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) nMode := D_ARG lAddBlank := .T. @@ -518,7 +518,7 @@ end ENDIF oHtm:WriteParBold( " Returns" ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) nMode := D_ARG lAddBlank := .T. lEndReturns := .T. @@ -530,7 +530,7 @@ end ENDIF oHtm:WriteParBold( " Description" ) - ohtm:WriteText( '
' ) + ohtm:WriteText( "
" ) nMode := D_DESCRIPTION lAddBlank := .T. @@ -693,7 +693,7 @@ oHtm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) IF lBlankLine - oHtm:WriteText( '
' ) + oHtm:WriteText( "
" ) lAddBlank := .F. ENDIF @@ -733,8 +733,8 @@ oHtm:writeText("
") //:endpar() lAddBlank := .F. ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) - ohtm:WriteText( "
" + cBuffer + '
' ) - ohtm:writetext('

') + ohtm:WriteText( "
" + cBuffer + "
" ) + ohtm:writetext("

") ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; @@ -746,8 +746,8 @@ oHtm:writeText("
") //:endpar() ENDIF cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) ) if !lBlankline - ohtm:WriteText( "
" + cBuffer + '
' ) - ohtm:writetext('

') + ohtm:WriteText( "
" + cBuffer + "
" ) + ohtm:writetext("

") endif ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE @@ -787,7 +787,7 @@ oHtm:writeText("
") //:endpar() IF !lClassDoc .AND. lEof IF VALTYPE( oHtm ) == "O" - oHtm:WriteText( '

' ) + oHtm:WriteText( "

" ) oHtm:Close() ENDIF @@ -900,7 +900,7 @@ FUNCTION ProcessWww2() // Add the file extension cFileName := LEFT( cFileName, 36 ) + ".htm" - oHtmClass := THTML():New( 'htm\' + cFileName ) + oHtmClass := THTML():New( "htm\" + cFileName ) // If file creation was successful IF oHtmClass:nHandle > 0 @@ -975,7 +975,7 @@ FUNCTION ProcessWww2() // Create new HTML for the properties and methods IF LEN(aCurDoc) > 1 cFileName := LEFT(cFileName, LEN(cFileName) - 4) + "_content.htm" - oHtmClassContent := THTML():New( 'htm\' + cFileName ) + oHtmClassContent := THTML():New( "htm\" + cFileName ) IF oHtmClassContent:nHandle > 0 // Add a title to the HTML @@ -1117,7 +1117,7 @@ RETURN NIL FUNCTION ReadFromTop2(nh) - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL aTempArray := {} DO WHILE FReadLine(nH, @cBuffer, 4096) @@ -1310,7 +1310,7 @@ RETURN cPar FUNCTION ProcWwwAlso( nWriteHandle, cSeeAlso ) LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" LOCAL xTemp LOCAL nLen LOCAL xPos @@ -1408,24 +1408,24 @@ RETURN nil *+ FUNCTION FormatHtmBuff( cBuffer, cStyle ) - LOCAL creturn := '' - LOCAL cline := '' - LOCAL cOldLine := '' - LOCAL cBuffend := '' + LOCAL creturn := "" + LOCAL cline := "" + LOCAL cOldLine := "" + LOCAL cBuffend := "" LOCAL lEndBuffer := .F. LOCAL lArgBold := .F. LOCAL npos - creturn := cBuffer + ' ' - IF AT( '', creturn ) > 0 .OR. EMPTY( cBuffer ) + creturn := cBuffer + " " + IF AT( "", creturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - creturn := '' + creturn := "" ENDIF RETURN creturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuffer := .T. ENDIF @@ -1440,24 +1440,24 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) - cReturn := '' + cReturn + ' ' + cReturn := "" + cReturn + " " - ELSEIF cStyle == 'Syntax' + ELSEIF cStyle == "Syntax" cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "<", "<" ) cReturn := STRTRAN( cReturn, ">", ">" ) cReturn := AllTrim(cReturn) - creturn := '' + creturn + ' ' - ELSEIF cStyle == 'Arguments' + creturn := "" + creturn + " " + ELSEIF cStyle == "Arguments" nPos := 0 - IF AT( "", cReturn ) > 0 .and. at('',cReturn)=0 + IF AT( "", cReturn ) > 0 .and. at("",cReturn)=0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) cReturn := ALLTRIM( cReturn ) @@ -1469,11 +1469,11 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) cOldLine := STRTRAN( cOldLine, ">", ">" ) lArgBold := .T. ENDIF - elseif AT( "", cReturn ) > 0 .and. at('',cReturn)>0 + elseif AT( "", cReturn ) > 0 .and. at("",cReturn)>0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) cReturn := ALLTRIM( cReturn ) - nPos := AT( '', cReturn ) + nPos := AT( "", cReturn ) cOldLine := LEFT( cReturn, nPos + 3 ) cReturn := STRTRAN( cReturn, cOldLine, "" ) IF AT( "@", cOldLine ) > 0 .OR. AT( "()", cOldLine ) > 0 .OR. AT( "<", cOldLine ) > 0 .OR. AT( "_", cOldLine ) > 0 @@ -1504,7 +1504,7 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) @@ -1516,9 +1516,9 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) cOldLine := STRTRAN( cOldLine, ">", ">" ) IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF // ENDIF lArgBold := .F. @@ -1554,7 +1554,7 @@ FUNC checkhtmcolor( cbuffer, ncolorpos ) cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd ) nreturn := ASCAN( acolortable, { | x | UPPER( x ) == UPPER( ccolor ) } ) IF nreturn > 0 - creturn := '' + creturn := "" ENDIF cBuffer := STRTRAN( cBuffer, cOldColorString, cReturn ) ENDDO @@ -1572,16 +1572,16 @@ RETURN cbuffer *+ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) - LOCAL cOldLine := '' + LOCAL cOldLine := "" LOCAL npos LOCAL lHasFixed := .F. LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL creturn := '' + LOCAL ccolor := "" + LOCAL creturn := "" LOCAL nIdentLevel LOCAL lEndPar := .F. - LOCAL cLine := '' + LOCAL cLine := "" LOCAL lEndFixed := .F. LOCAL lArgBold := .F. LOCAL LFstTableItem := .T. @@ -1591,11 +1591,11 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) DEFAULT cStyle TO "Default" DEFAULT cFileName TO NIL iF cStyle == "Syntax" -// tracelog('cBuffer',cBuffer) +// tracelog("cBuffer",cBuffer) clastBuffer += cBuffer endif - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) @@ -1623,9 +1623,9 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -1636,10 +1636,10 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', ' ' ) - nColorPos := AT( '", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", " " ) + nColorPos := AT( " 0 checkhtmcolor( @cbuffer, ncolorpos ) ENDIF @@ -1647,7 +1647,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) IF cStyle == "Description" .OR. cStyle == "Compliance" nIdentLevel := 6 nPos := 0 - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1665,7 +1665,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ELSEIF cStyle == "Arguments" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1674,7 +1674,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF ELSEIF cStyle == "Syntax" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF @@ -1692,7 +1692,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF ELSEIF cStyle == "Default" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) @@ -1703,9 +1703,9 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) - if AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + if AT( "", cBuffer ) > 0 lHasFixed:=.T. else lHasFixed:=.F. @@ -1727,7 +1727,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF IF AT( DELIM, cOldLine ) == 0 - cReturn += ALLTRIM( cOldLine ) + ' ' + cReturn += ALLTRIM( cOldLine ) + " " ENDIF IF AT( DELIM, cOldLine ) > 0 FT_FSKIP( - 1 ) @@ -1742,7 +1742,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) // oHtm:WriteText( "
" ) lHasFixed:=.F. END - IF AT( '
' + afitable[ x ] + '' + asitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "
' + afitable[ x ] + '' + asitable[ x ] + '' + atitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "" + atitable[ x ] + "
' + afitable[ x ] + '' + asitable[ x ] + '' + atitable[ x ] + '' + afoitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "" + atitable[ x ] + "" + afoitable[ x ] + "
', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 @@ -1796,15 +1796,15 @@ FUNCTION ProchtmTable( cBuffer, nNum ) cBuffer := STRTRAN( cbuffer, "", "" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos ] ENDIF IF EMPTY( cBuffer ) - citem := '' - citem2 := '' - citem3 := '' - citem4 := '' + citem := "" + citem2 := "" + citem3 := "" + citem4 := "" ELSE cBuffer := STRTRAN( cBuffer, "<", "<" ) cBuffer := STRTRAN( cBuffer, ">", ">" ) @@ -1827,20 +1827,20 @@ FUNCTION ProchtmTable( cBuffer, nNum ) ENDIF ENDIF IF cColor != NIL - AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) - AADD( asiTable, "" + cItem2 + '' ) + AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + "" ) + AADD( asiTable, "" + cItem2 + "" ) ELSE AADD( afiTable, RTRIM( LTRIM( cItem ) ) ) AADD( asiTable, cItem2 ) ENDIF IF cColor != NIL - AADD( atiTable, "" + cItem3 + '' ) + AADD( atiTable, "" + cItem3 + "" ) ELSE AADD( atiTable, cItem3 ) ENDIF IF cColor != NIL - AADD( afoiTable, "" + cItem4 + '' ) + AADD( afoiTable, "" + cItem4 + "" ) ELSE AADD( afoiTable, cItem4 ) ENDIF @@ -1862,19 +1862,19 @@ FUNCTION GenhtmTable( oHtm ) LOCAL x /* oHtm:WriteText( "
" ) oHtm:WriteText( "
" )*/ - oHtm:WriteText( '' ) //-4 + oHtm:WriteText( "
" ) //-4 FOR x := 1 TO LEN( asitable ) IF !EMPTY( asitable[ x ] ) IF nNumTableItems == 2 - oHtm:WriteText( ' ' ) + oHtm:WriteText( " " ) ELSEIF nNumTableItems == 3 - oHtm:WriteText( ' ' ) + oHtm:WriteText( " " ) ELSEIF nNumTableItems == 4 - oHtm:WriteText( ' ' ) + oHtm:WriteText( " " ) ENDIF ELSE - oHtm:WriteText( ' ' ) + oHtm:WriteText( " " ) ENDIF NEXT @@ -1893,7 +1893,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) diff --git a/harbour/utils/hbdoc/genng.prg b/harbour/utils/hbdoc/genng.prg index 864c88ebec..86e4da46d0 100644 --- a/harbour/utils/hbdoc/genng.prg +++ b/harbour/utils/hbdoc/genng.prg @@ -53,8 +53,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" // output lines on the screen #define INFILELINE 10 @@ -78,7 +78,7 @@ STATIC aCurDoc := {} STATIC nCurDoc := 1 -STATIC aColorTable := { { 'aqua', '1B' }, { 'black', '10' }, { 'fuchia', '1D' }, { 'grey', '18' }, { 'green', '12' }, { 'lime', '1A' }, { 'maroon', '16' }, { 'navy', '19' }, { 'olive', '12' }, { 'purple', '15' }, { 'red', '1C' }, { 'silver', '17' }, { 'teal', '13 ' }, { 'white', '1F' }, { 'yellow', '1E' } } +STATIC aColorTable := { { "aqua", "1B" }, { "black", "10" }, { "fuchia", "1D" }, { "grey", "18" }, { "green", "12" }, { "lime", "1A" }, { "maroon", "16" }, { "navy", "19" }, { "olive", "12" }, { "purple", "15" }, { "red", "1C" }, { "silver", "17" }, { "teal", "13 " }, { "white", "1F" }, { "yellow", "1E" } } *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -150,19 +150,19 @@ FUNCTION ProcessiNg() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM lData := .F. @@ -368,9 +368,9 @@ FUNCTION ProcessiNg() nMode := D_ONELINE // Now start writing out what we know IF lData - oNgi:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) + oNgi:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) ELSEIF lMethod - oNgi:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Method " + cFuncName ) + oNgi:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, "Method " + cFuncName ) ELSE IF LEN( cFuncname ) < 22 oNgi:WriteTitle( PAD( cFuncName, 21 ) + cOneLine, cFuncName ) @@ -570,10 +570,10 @@ FUNCTION ProcessiNg() ENDIF lBlankLine := EMPTY( cBuffer ) IF AT( "", cBuffer ) > 0 - STRTRAN( cBuffer, "", '' ) - STRTRAN( cBuffer, "", '' ) + STRTRAN( cBuffer, "", "" ) + STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, SPACE( 6 ), "" ) - cbuFfer := '' + cBuffer + '' + cbuFfer := "" + cBuffer + "" ENDIF procngdesc( cbuffer, oNgi, "Syntax" ) ELSEIF nMode == D_ARG @@ -691,8 +691,8 @@ FUNCTION ProcNgiInput() LOCAL nAlso LOCAL y - LOCAL nXhandle := FCREATE( 'ngi\funcam.txt' ) - LOCAL nYhandle := FCREATE( 'ngi\funcn_.txt' ) + LOCAL nXhandle := FCREATE( "ngi\funcam.txt" ) + LOCAL nYhandle := FCREATE( "ngi\funcn_.txt" ) LOCAL xY := "!Short:" LOCAL cSee := "!seealso:" LOCAL lEof := .F. @@ -741,11 +741,11 @@ FUNCTION ProcNgiInput() aAlso := {} WHILE !lEof cBuffer := ReadLn( @lEof ) - cBuffer := STRTRAN( cbuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cbuffer, CHR( 10 ), "" ) cT := LEFT( cBuffer, 7 ) IF xY == cT cName := SUBSTR( cBuffer, 9 ) - cName := SUBSTR( cName, 1, AT( ' ', cName ) - 1 ) + cName := SUBSTR( cName, 1, AT( " ", cName ) - 1 ) ENDIF cTs := SUBSTR( cBuffer, 1, 9 ) @@ -753,7 +753,7 @@ FUNCTION ProcNgiInput() cTs := SUBSTR( cBuffer, 11 ) aAlso := procngialso2( cTs ) - cBuffer := '' + cBuffer := "" ENDIF FWRITE( nXhandle, cBuffer + pCRLF ) @@ -782,14 +782,14 @@ FUNCTION ProcNgiInput() aAlso := {} WHILE !lEof cBuffer := ReadLn( @lEof ) - cBuffer := STRTRAN( cbuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cbuffer, CHR( 10 ), "" ) cT := LEFT( cBuffer, 7 ) IF xY == cT cName := SUBSTR( cBuffer, 9 ) - cName := SUBSTR( cName, 1, AT( ' ', cName ) - 1 ) + cName := SUBSTR( cName, 1, AT( " ", cName ) - 1 ) ENDIF // if at(chr(10),cBuffer)>0 - // cBuffer:=Strtran(cbuffer,chr(10),'') + // cBuffer:=Strtran(cbuffer,chr(10),"") // endif cTs := SUBSTR( cBuffer, 1, 9 ) @@ -797,7 +797,7 @@ FUNCTION ProcNgiInput() cTs := SUBSTR( cBuffer, 11 ) aAlso := procngialso2( cTs ) - cBuffer := '' + cBuffer := "" ENDIF // cBuffer:=strtran(cBuffer,chr(10),"") FWRITE( nYhandle, cBuffer + pCRLF ) @@ -823,18 +823,18 @@ FUNCTION ProcNgiInput() FCLOSE( nYhandle ) lEof := .F. - y := FCREATE( 'ngi\comm.txt' ) + y := FCREATE( "ngi\comm.txt" ) ASORT( acfiles ) FOR x := 1 TO LEN( acfiles ) cFile := acfiles[ x ] - IF UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "LICENSE" ; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "OVERVIEW" ; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "COMPILEROPTIONS" ; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "GNULICENSE" ; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "GNULICENSEPART2"; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "STRONGTYPING"; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "THEGARBAGECOLLECTOR" ; - .AND. UPPER( LEFT( cFile, AT( '.', cFile ) - 1 ) ) != "THEIDLESTATES" + IF UPPER( LEFT( cFile, AT( ".", cFile ) - 1 ) ) != "LICENSE" ; + .AND. UPPER( LEFT( cFile, AT( ".", cFile ) - 1 ) ) != "OVERVIEW" ; + .AND. UPPER( LEFT( cFile, AT( ".", cFile ) - 1 ) ) != "COMPILEROPTIONS" ; + .AND. UPPER( LEFT( cFile, AT( ".", cFile ) - 1 ) ) != "GNULICENSE" ; + .AND. UPPER( LEFT( cFile, AT( ".", cFile ) - 1 ) ) != "GNULICENSEPART2"; + .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 ) FT_FUSE( "ngi\" + acfiles[ x ] ) @@ -842,21 +842,21 @@ FUNCTION ProcNgiInput() WHILE !lEof cBuffer := ReadLn( @lEof ) cT := LEFT( cBuffer, 7 ) - cBuffer := STRTRAN( cbuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cbuffer, CHR( 10 ), "" ) IF xY == cT cName := SUBSTR( cBuffer, 9 ) - cName := SUBSTR( cName, 1, AT( ' ', cName ) - 1 ) + cName := SUBSTR( cName, 1, AT( " ", cName ) - 1 ) ENDIF cTs := SUBSTR( cBuffer, 1, 9 ) // if at(chr(10),cBuffer)>0 - // cBuffer:=Strtran(cbuffer,chr(10),'') + // cBuffer:=Strtran(cbuffer,chr(10),"") // endif IF UPPER( cSee ) == UPPER( cTs ) cTs := SUBSTR( cBuffer, 11 ) aAlso := procngialso2( cTs ) - cBuffer := '' + cBuffer := "" ENDIF // cBuffer:=strtran(cBuffer,chr(10),"") FWRITE( y, cBuffer + pCRLF ) @@ -893,7 +893,7 @@ FUNCTION procngialso2( cSeealso ) LOCAL nPos LOCAL aAlso := {} - LOCAL cTemp := '' + LOCAL cTemp := "" LOCAL xAlso := {} LOCAL hPos := 0 aAlso := {} @@ -905,9 +905,9 @@ FUNCTION procngialso2( cSeealso ) IF cTemp >= "A" .AND. cTemp < "_" .or. cTemp >= "a" .and. cTemp <= "z" nPos := AT( "()", xAlso[ hPos ] ) IF nPos > 0 - AADD( aAlso, "funcam.ngo:" + ALLTRIM( xAlso[ hPos ] ) + ' ' ) + AADD( aAlso, "funcam.ngo:" + ALLTRIM( xAlso[ hPos ] ) + " " ) ELSEIF nPos == 0 .AND. UPPER( xAlso[ hPos ] ) != "LICENSE" .AND. UPPER( xAlso[ hPos ] ) != "OVERVIEW" .AND. !EMPTY( xAlso[ hPos ] ) - AADD( aAlso, "Comm.ngo:" + ALLTRIM( xAlso[ hPos ] ) + ' ' ) + AADD( aAlso, "Comm.ngo:" + ALLTRIM( xAlso[ hPos ] ) + " " ) ENDIF ENDIF NEXT @@ -961,7 +961,7 @@ FUNCTION GenNgTable( oNgi ) LOCAL nPos LOCAL aLensFItem := {} LOCAL aLensSItem := {} - LOCAL cMaxItem := '' + LOCAL cMaxItem := "" LOCAL nmax3 LOCAL nmax4 LOCAL npos3 @@ -1027,21 +1027,21 @@ FUNCTION GenNgTable( oNgi ) nPos := maxelem( afitable ) nPos2 := ASCAN( alensfitem, { | x | x == nPos } ) IF nNumTableItems == 2 - cMaxItem := ' ' + "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "»" + cMaxItem := " " + "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "»" IF LEN( cMaxItem ) < 76 oNgi:WritePar( " É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 ELSE oNgi:WritePar( "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "»", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 3 - cMaxItem := ' ' + "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "»" + cMaxItem := " " + "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "»" IF LEN( cMaxItem ) < 76 oNgi:WritePar( " É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 ELSE oNgi:WritePar( "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "»", .F. ) //-4 ENDIF ELSEIF nNumTableItems == 4 - cMaxItem := ' ' + "É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + Replicate( "Í", 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( " É" + Replicate( "Í", aLensFitem[ nPos2 ] + 2 ) + "Ë" + Replicate( "Í", alensSitem[ nPos1 ] + 2 ) + "Ë" + Replicate( "Í", alensTitem[ nPos3 ] + 2 ) + "Ë" + Replicate( "Í", alensfoitem[ nPos4 ] + 2 ) + "»", .F. ) //-4 ELSE @@ -1055,24 +1055,24 @@ FUNCTION GenNgTable( oNgi ) IF nNumTableItems == 2 IF LEN( cMaxItem ) < 76 - oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º" + HB_OSNEWLINE() ) ELSE - oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º" + HB_OSNEWLINE() ) ENDIF ELSEIF nNumTableItems == 3 nSpace3 := nMax3 - LEN( atitable[ x ] ) IF LEN( cMaxItem ) < 76 - oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º" + HB_OSNEWLINE() ) ELSE - oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º" + HB_OSNEWLINE() ) ENDIF ELSEIF nNumTableItems == 4 nSpace3 := nMax3 - LEN( atitable[ x ] ) nSpace4 := nMax4 - LEN( afoitable[ x ] ) IF LEN( cMaxItem ) < 76 - oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º " + afoiTable[ x ] + SPACE( nspace4 ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( " º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º " + afoiTable[ x ] + SPACE( nspace4 ) + " º" + HB_OSNEWLINE() ) ELSE - oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + IF( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º " + afoiTable[ x ] + SPACE( nspace4 ) + " º" + HB_OSNEWLINE() ) + oNgi:WriteParBox( "º " + afiTable[ x ] + SPACE( nSpace2 ) + " º " + iif( asiTable[ x ] == "|", STRTRAN( asiTable[ x ], "|", " " ), asiTable[ x ] ) + SPACE( nspace ) + " º " + atiTable[ x ] + SPACE( nspace3 ) + " º " + afoiTable[ x ] + SPACE( nspace4 ) + " º" + HB_OSNEWLINE() ) ENDIF ENDIF ELSE @@ -1144,10 +1144,10 @@ RETURN Nil FUNCTION ProcNgTable( cBuffer, nNum ) LOCAL nPos - LOCAL cItem := '' - LOCAL cItem2 := '' - LOCAL cItem3 := '' - LOCAL cItem4 := '' + LOCAL cItem := "" + LOCAL cItem2 := "" + LOCAL cItem3 := "" + LOCAL cItem4 := "" LOCAL nColorpos LOCAL cColor cBuffer := ALLTRIM( cBuffer ) @@ -1161,7 +1161,7 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cBuffer := STRTRAN( cbuffer, "", "" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos, 2 ] ENDIF @@ -1170,14 +1170,14 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cItem := SUBSTR( cBuffer, 1, AT( SPACE( 3 ), cBuffer ) - 1 ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, "" ,,1) ) else - citem:='' + citem:="" endif if nNum==2 If !empty(cBuffer) cItem2 := SUBSTR( cBuffer, 1 ) else - citem2:='' + citem2:="" endif elseif nNum ==3 If !empty(cBuffer) @@ -1185,8 +1185,8 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem2, "" ) ) cItem3 := SUBSTR( cBuffer, 1 ) else - citem2:='' - citem3:='' + citem2:="" + citem3:="" endif ELSEIF nNum > 3 @@ -1199,9 +1199,9 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cItem4 := SUBSTR( cBuffer, 1 ) else - citem2:='' - citem3:='' - citem4:='' + citem2:="" + citem3:="" + citem4:="" endif ENDIF @@ -1215,14 +1215,14 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cItem := SUBSTR( cBuffer, 1, AT( SPACE( 3 ), cBuffer ) - 1 ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, "" ) ) ELSE - citem := '' + citem := "" ENDIF IF nNum == 2 IF !EMPTY( cBuffer ) cItem2 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' + citem2 := "" ENDIF ELSEIF nNum == 3 IF !EMPTY( cBuffer ) @@ -1230,8 +1230,8 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem2, "" ) ) cItem3 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' - citem3 := '' + citem2 := "" + citem3 := "" ENDIF ELSEIF nNum > 3 @@ -1244,9 +1244,9 @@ FUNCTION ProcNgTable( cBuffer, nNum ) cItem4 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' - citem3 := '' - citem4 := '' + citem2 := "" + citem3 := "" + citem4 := "" ENDIF ENDIF @@ -1272,12 +1272,12 @@ RETURN Nil *+ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) - LOCAL cLine := '' + LOCAL cLine := "" LOCAL nPos LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL cReturn := '' + LOCAL ccolor := "" + LOCAL cReturn := "" LOCAL nIdentLevel LOCAL cOldLine LOCAL lEndPar := .F. @@ -1288,8 +1288,8 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) @@ -1318,9 +1318,9 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) // cBuffer:= strtran(cBuffer,"","") IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -1331,17 +1331,17 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', ' ^b' ) - cBuffer := STRTRAN( cBuffer, '', '^n ' ) - cBuffer := STRTRAN( cBuffer, '', '^n ' ) - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', '' ) + IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", " ^b" ) + cBuffer := STRTRAN( cBuffer, "", "^n " ) + cBuffer := STRTRAN( cBuffer, "", "^n " ) + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", "" ) - nColorPos := AT( ' 0 checkngcolor( @cbuffer, ncolorpos ) ENDIF @@ -1361,7 +1361,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 69 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1371,7 +1371,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1401,7 +1401,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 58 ) //60 - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1411,7 +1411,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1438,7 +1438,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( ALLTRIM( cBuffer ), curPos, 69 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1448,7 +1448,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1473,7 +1473,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 69 ) nPos := RAT( " ", cLine ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, "", "" ) ENDIF @@ -1482,7 +1482,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1495,8 +1495,8 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) @@ -1509,7 +1509,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) cLine := STRTRAN( cLine, "", "" ) ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ALLTRIM( cLine ) + ' ' + cReturn += ALLTRIM( cLine ) + " " ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) @@ -1522,7 +1522,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDDO END - IF AT( '
' + afitable[ x ] + '' + asitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "
' + afitable[ x ] + '' + asitable[ x ] + '' + atitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "" + atitable[ x ] + "
' + afitable[ x ] + '' + asitable[ x ] + '' + atitable[ x ] + '' + afoitable[ x ] + '
" + afitable[ x ] + "" + asitable[ x ] + "" + atitable[ x ] + "" + afoitable[ x ] + "
', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 .or. AT( "", cLine ) > 0 @@ -1544,7 +1544,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDIF ENDIF // If cStyle=="Description" .or. cStyle=="Compliance" - // oNgi:Writepar('') + // oNgi:Writepar("") // endif RETURN nil @@ -1604,7 +1604,7 @@ FUNC maxelem( a ) FOR nCount := 1 TO nSize tam := LEN( a[ nCount ] ) - max := IF( tam > max, tam, max ) + max := iif( tam > max, tam, max ) NEXT nPos := ASCAN( a, { | x | LEN( x ) == max } ) RETURN max @@ -1622,26 +1622,26 @@ RETURN max *+ FUNCTION FormatNgBuff( cBuffer, cStyle ) - LOCAL cReturn := '' - LOCAL cLine := '' - LOCAL cOldLine := '' - LOCAL cBuffEnd := '' + LOCAL cReturn := "" + LOCAL cLine := "" + LOCAL cOldLine := "" + LOCAL cBuffEnd := "" LOCAL lEndBuffer := .F. LOCAL nPos LOCAL lArgBold := .F. LOCAL LFstTableItem := .T. - cReturn := cBuffer + ' ' - IF AT( '', cReturn ) > 0 .OR. EMPTY( cBuffer ) + cReturn := cBuffer + " " + IF AT( "", cReturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - cReturn := '' + cReturn := "" ENDIF RETURN cReturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" .AND. cStyle != "Return" DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuffer := .T. ENDIF @@ -1656,21 +1656,21 @@ FUNCTION FormatNgBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) - cReturn := '' + cReturn + ' ' - ELSEIF cStyle == 'Syntax' + cReturn := "" + cReturn + " " + ELSEIF cStyle == "Syntax" cReturn := STRTRAN( cReturn, SPACE( 4 ), "" ) - cReturn := '' + cReturn + ' ' + cReturn := "" + cReturn + " " - ELSEIF cStyle == 'Arguments' .OR. cStyle == "Return" + ELSEIF cStyle == "Arguments" .OR. cStyle == "Return" nPos := 0 - cReturn := '' + cReturn + cReturn := "" + cReturn IF AT( "", cReturn ) > 0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) @@ -1699,15 +1699,15 @@ FUNCTION FormatNgBuff( cBuffer, cStyle ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) IF lArgBold - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOldLine + ' ' + cReturn + ' ' + cReturn := " " + cOldLine + " " + cReturn + " " ENDIF ENDIF lArgBold := .F. @@ -1727,7 +1727,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) cBuffer := TRIM( SUBSTR( cBuffer, nCommentLen ) ) diff --git a/harbour/utils/hbdoc/genos2.prg b/harbour/utils/hbdoc/genos2.prg index 3832f078e9..ef17fb5d15 100644 --- a/harbour/utils/hbdoc/genos2.prg +++ b/harbour/utils/hbdoc/genos2.prg @@ -58,7 +58,7 @@ #include "fileio.ch" #include "inkey.ch" #include "hbdocdef.ch" -#include 'common.ch' +#include "common.ch" // output lines on the screen #define INFILELINE 10 @@ -79,7 +79,7 @@ STATIC atiTable := {} STATIC nNumTableItems := 0 STATIC lIsTable := .F. -STATIC aColorTable := { { 'aqua', '' }, { 'black', '' }, { 'fuchia', '' }, { 'grey', '' }, { 'green', '' }, { 'lime', '' }, { 'maroon', '' }, { 'navy', '' }, { 'olive', '' }, { 'purple', '' }, { 'red', '' }, { 'silver', '' }, { 'teal', '' }, { 'white', '' }, { 'yellow', '' } } +STATIC aColorTable := { { "aqua", "" }, { "black", "" }, { "fuchia", "" }, { "grey", "" }, { "green", "" }, { "lime", "" }, { "maroon", "" }, { "navy", "" }, { "olive", "" }, { "purple", "" }, { "red", "" }, { "silver", "" }, { "teal", "" }, { "white", "" }, { "yellow", "" } } STATIC aCurDoc := {} STATIC nCurDoc := 1 @@ -154,19 +154,19 @@ FUNCTION ProcessOs2() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM LOCAL cTable := DELIM + "TABLE" + DELIM @@ -249,7 +249,7 @@ FUNCTION ProcessOs2() // Now close down this little piece lDoc := .F. IF lData .OR. lmethod - oos2:writeText( ':efn.' ) + oos2:writeText( ":efn." ) ENDIF IF .NOT. EMPTY( cSeeAlso ) oOs2:WriteText( ".br") @@ -372,9 +372,9 @@ FUNCTION ProcessOs2() nMode := D_ONELINE // Now start writing out what we know IF lData - oOs2:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) + oOs2:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) ELSEIF lMethod - oOs2:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Method " + cFuncName ) + oOs2:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, "Method " + cFuncName ) ELSE oOs2:WriteTitle( PAD( cFuncName, 40 ), cFuncName ,cCategory) @@ -556,10 +556,10 @@ end lBlankLine := EMPTY( cBuffer ) // cBuffer := oOs2:DosToOs2Text(cBuffer) IF AT( "", cBuffer ) > 0 - STRTRAN( cBuffer, "", '' ) - STRTRAN( cBuffer, "", '' ) + STRTRAN( cBuffer, "", "" ) + STRTRAN( cBuffer, "", "" ) cBuffer := ALLTRIM( cBuffer ) - cbuFfer := '' + cBuffer + '' + cbuFfer := "" + cBuffer + "" ENDIF procos2desc( cbuffer, oOs2, "Syntax" ) @@ -601,7 +601,7 @@ end ENDIF cTemp := SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( ":", cBuffer ) + 1 ) - oOs2:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cBuffer ) + oOs2:WriteJumpLink( LEFT( cfilename, AT( ".", cFilename ) - 1 ) + ALLTRIM( cTemp ), cBuffer ) ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; @@ -614,7 +614,7 @@ end cTemp := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) + 1 ) cName := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( "()", cBuffer ) + 2 ) - oOs2:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) + oOs2:WriteJumpLink( LEFT( cfilename, AT( ".", cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) @@ -734,26 +734,26 @@ RETURN aAlso *+ FUNCTION Formatos2Buff( cBuffer, cStyle ) - LOCAL cReturn := '' - LOCAL cLine := '' - LOCAL cBuffend := '' - LOCAL coline := '' + LOCAL cReturn := "" + LOCAL cLine := "" + LOCAL cBuffend := "" + LOCAL coline := "" LOCAL lEndBuff := .F. LOCAL nPos LOCAL lArgBold := .F. - cReturn := cBuffer + ' ' - IF AT( '', cReturn ) > 0 .OR. EMPTY( cBuffer ) + cReturn := cBuffer + " " + IF AT( "", cReturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - cReturn := '' + cReturn := "" ENDIF RETURN cReturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" DO WHILE !lEndBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuff := .T. ENDIF IF EMPTY( cLine ) @@ -767,18 +767,18 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) lEndBuff := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += " "+ ALLTRIM( cLine ) + ' ' + cReturn += " "+ ALLTRIM( cLine ) + " " ENDIF ENDDO creturn := STRTRAN( creturn, "", "" ) creturn := STRTRAN( creturn, "", "" ) - cReturn := '' + creturn + ' ' + cReturn := "" + creturn + " " - ELSEIF cStyle == 'Syntax' - cReturn := '' + Alltrim(cReturn) + '' + ELSEIF cStyle == "Syntax" + cReturn := "" + Alltrim(cReturn) + "" - ELSEIF cStyle == 'Arguments' + ELSEIF cStyle == "Arguments" nPos := 0 @@ -798,7 +798,7 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) DO WHILE !lEndBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuff := .T. ENDIF IF EMPTY( cLine ) @@ -810,15 +810,15 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) lEndBuff := .T. ENDIF IF AT( DELIM, cline ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO creturn := STRTRAN( creturn, "", "" ) creturn := STRTRAN( creturn, "", "" ) IF lArgBold - cReturn := '' + cOLine + ' ' + cReturn + ' ' + cReturn := "" + cOLine + " " + cReturn + " " ELSE - cReturn := '' + cOLine + ' ' + cReturn + ' ' + cReturn := "" + cOLine + " " + cReturn + " " ENDIF lArgBold := .F. @@ -883,15 +883,15 @@ FUNCTION ProcOs2Table( cBuffer , nNum ) cBuffer := STRTRAN( cbuffer, "", "" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos, 2 ] ENDIF IF EMPTY( cBuffer ) - citem := '' - citem2 := '' - citem3 := '' - citem4 := '' + citem := "" + citem2 := "" + citem3 := "" + citem4 := "" ELSE cBuffer := STRTRAN( cBuffer, "<", "<." ) cBuffer := STRTRAN( cBuffer, ">", ">." ) @@ -914,20 +914,20 @@ FUNCTION ProcOs2Table( cBuffer , nNum ) ENDIF ENDIF IF cColor != NIL - AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) - AADD( asiTable, "" + cItem2 + '' ) + AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + "" ) + AADD( asiTable, "" + cItem2 + "" ) ELSE AADD( afiTable, RTRIM( LTRIM( cItem ) ) ) AADD( asiTable, cItem2 ) ENDIF IF cColor != NIL - AADD( atiTable, "" + cItem3 + '' ) + AADD( atiTable, "" + cItem3 + "" ) ELSE AADD( atiTable, cItem3 ) ENDIF IF cColor != NIL - AADD( afoiTable, "" + cItem4 + '' ) + AADD( afoiTable, "" + cItem4 + "" ) ELSE AADD( afoiTable, cItem4 ) ENDIF @@ -950,7 +950,7 @@ FUNC maxos2elem( a ) LOCAL ncount FOR ncount := 1 TO nsize tam := LEN( a[ ncount ] ) - max := IF( tam > max, tam, max ) + max := iif( tam > max, tam, max ) NEXT nPos := ASCAN( a, { | x | LEN( x ) == max } ) RETURN max @@ -975,37 +975,37 @@ FUNCTION Genos2Table( oOs2 ) elseif nNumTableItems == 3 oos2:writeText(":table cols="+"'"+str(maxos2elem(afitable),2) + " " + str(maxos2elem(asitable),2) + " " +str(maxos2elem(atitable),2) +"'." ) elseif nNumTableItems == 4 - oos2:writeText(":table cols="+"'"+str(maxos2elem(afitable),2) + " " + str(maxos2elem(asitable),2) + " " +str(maxos2elem(atitable),2) + ' ' +str(maxos2elem(afoitable),2)+"'." ) + oos2:writeText(":table cols="+"'"+str(maxos2elem(afitable),2) + " " + str(maxos2elem(asitable),2) + " " +str(maxos2elem(atitable),2) + " " +str(maxos2elem(afoitable),2)+"'." ) endif FOR x := 1 TO LEN( asitable ) IF !EMPTY( asitable[ x ] ) IF nNumTableItems == 2 - oos2:Writetext(':row.') - oos2:Writetext(':c.' + afitable[x]) - oos2:Writetext(':c.' + asitable[x]) + oos2:Writetext(":row.") + oos2:Writetext(":c." + afitable[x]) + oos2:Writetext(":c." + asitable[x]) ELSEIF nNumTableItems == 3 - oos2:Writetext(':row.') - oos2:Writetext(':c.' + afitable[x]) - oos2:Writetext(':c.' + asitable[x]) - oos2:Writetext(':c.' + atitable[x]) + oos2:Writetext(":row.") + oos2:Writetext(":c." + afitable[x]) + oos2:Writetext(":c." + asitable[x]) + oos2:Writetext(":c." + atitable[x]) ELSEIF nNumTableItems == 4 - oos2:Writetext(':row.') - oos2:Writetext(':c.' + afitable[x]) - oos2:Writetext(':c.' + asitable[x]) - oos2:Writetext(':c.' + atitable[x]) - oos2:Writetext(':c.' + afoitable[x]) + oos2:Writetext(":row.") + oos2:Writetext(":c." + afitable[x]) + oos2:Writetext(":c." + asitable[x]) + oos2:Writetext(":c." + atitable[x]) + oos2:Writetext(":c." + afoitable[x]) ENDIF ELSE - oos2:Writetext(':row.') - oos2:Writetext(':c.') + oos2:Writetext(":row.") + oos2:Writetext(":c.") ENDIF NEXT - oOs2:Writetext( ':etable.' ) + oOs2:Writetext( ":etable." ) oos2:WriteText( ".br" ) afiTable := {} asitable := {} @@ -1025,14 +1025,14 @@ RETURN Nil *+ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) - LOCAL cLine := '' + LOCAL cLine := "" LOCAL lArgBold := .F. LOCAL lHasFixed := .F. LOCAL npos LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL creturn := '' + LOCAL ccolor := "" + LOCAL creturn := "" LOCAL NIDENTLEVEL LOCAL coline LOCAL lEndPar := .F. @@ -1042,8 +1042,8 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) DEFAULT cStyle TO "Default" lendfixed := .F. - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) oOs2:WriteText( ".br" ) @@ -1070,9 +1070,9 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) // cBuffer:= strtran(cBuffer,"","") IF lArgBold - cReturn := '' + cOLine + ' ' + cReturn + ' ' + cReturn := "" + cOLine + " " + cReturn + " " ELSE - cReturn := '' + cOLine + ' ' + cReturn + ' ' + cReturn := "" + cOLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -1085,16 +1085,16 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 - cBuffer := STRTRAN( cBuffer, '', '' ) + cBuffer := STRTRAN( cBuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, '', ':hp3. ' ) - cBuffer := STRTRAN( cBuffer, '', ':ehp3. ' ) - cBuffer := STRTRAN( cBuffer, '', ':hp1. ' ) - cBuffer := STRTRAN( cBuffer, '', ':ehp1. ' ) - cBuffer := STRTRAN( cBuffer, '', '' ) - nColorPos := AT( '", ":hp3. " ) + cBuffer := STRTRAN( cBuffer, "", ":ehp3. " ) + cBuffer := STRTRAN( cBuffer, "", ":hp1. " ) + cBuffer := STRTRAN( cBuffer, "", ":ehp1. " ) + cBuffer := STRTRAN( cBuffer, "", "" ) + nColorPos := AT( " 0 checkos2color( @cbuffer, ncolorpos ) ENDIF @@ -1117,7 +1117,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 220 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1127,7 +1127,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1135,8 +1135,8 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) IF !EMPTY( cLine ) if AT("",cLine)>0 .or. AT("",cLine)>0 - cLine := STRTRAN( cLine, '', '' ) - cLine := STRTRAN( cLine, '', '' ) + cLine := STRTRAN( cLine, "", "" ) + cLine := STRTRAN( cLine, "", "" ) oOs2:WriteParBold(cLine,.F.) Else oos2:WriteText(SPACE(nidentLevel )+ cLine ) @@ -1148,7 +1148,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) */ nIdentLevel := 6 nPos := 0 -/* IF AT( '', cBuffer ) > 0 +/* IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF*/ IF !EMPTY( cBuffer ) @@ -1161,10 +1161,10 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDIF ELSEIF cStyle == "Arguments" -/* cBuffer := STRTRAN( cBuffer, ':', "&colon." ) - cBuffer := STRTRAN( cBuffer, '', 'hp2.' ) - cBuffer := STRTRAN( cBuffer, '', 'ehp2.' ) - IF AT( '', cBuffer ) > 0 +/* cBuffer := STRTRAN( cBuffer, ":", "&colon." ) + cBuffer := STRTRAN( cBuffer, "", "hp2." ) + cBuffer := STRTRAN( cBuffer, "", "ehp2." ) + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF @@ -1172,7 +1172,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) IF !EMPTY( cBuffer ) cBuffer := SUBSTR( cBuffer, 2 ) - oos2:writetext(cbuffer+CRLF+'.br') + oos2:writetext(cbuffer+CRLF+".br") oOs2:writeText( cBuffer+CRLF+".br") ENDIF @@ -1185,20 +1185,20 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ELSEIF cStyle == "Syntax" -/* IF AT( '', cBuffer ) > 0 +/* IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF*/ IF !EMPTY( cBuffer ) /* cBuffer := SUBSTR( cBuffer, 2 ) oOs2:WriteParBold( cBuffer,.F.) - oOs2:writeText('.br') - oOs2:writeText('.br')*/ + oOs2:writeText(".br") + oOs2:writeText(".br")*/ // ? cBuffer cBuffer:=Alltrim(cBuffer) oos2:WritePar2( cBuffer,":p.","Syntax" ) ENDIF ELSEIF cStyle == "Default" -/* IF AT( '', cBuffer ) > 0 +/* IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF*/ IF !EMPTY( cBuffer ) @@ -1208,10 +1208,10 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) - if AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + if AT( "", cBuffer ) > 0 lHasFixed:=.T. else lHasFixed:=.F. @@ -1231,7 +1231,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) cLine := STRTRAN( cLine, "", "" ) ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ALLTRIM( cLine ) + ' ' + cReturn += ALLTRIM( cLine ) + " " ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) @@ -1245,7 +1245,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDDO END - IF AT( '', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 @@ -1274,7 +1274,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) diff --git a/harbour/utils/hbdoc/genpdf1.prg b/harbour/utils/hbdoc/genpdf1.prg index 87b3b01fb8..62afa9ec66 100644 --- a/harbour/utils/hbdoc/genpdf1.prg +++ b/harbour/utils/hbdoc/genpdf1.prg @@ -55,8 +55,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" // output lines on the screen #define INFILELINE 10 @@ -83,7 +83,7 @@ STATIC aCurDoc := {} STATIC nCurDoc := 1 -STATIC aColorTable := { { 'aqua', '1B' }, { 'black', '10' }, { 'fuchia', '1D' }, { 'grey', '18' }, { 'green', '12' }, { 'lime', '1A' }, { 'maroon', '16' }, { 'navy', '19' }, { 'olive', '12' }, { 'purple', '15' }, { 'red', '1C' }, { 'silver', '17' }, { 'teal', '13 ' }, { 'white', '1F' }, { 'yellow', '1E' } } +STATIC aColorTable := { { "aqua", "1B" }, { "black", "10" }, { "fuchia", "1D" }, { "grey", "18" }, { "green", "12" }, { "lime", "1A" }, { "maroon", "16" }, { "navy", "19" }, { "olive", "12" }, { "purple", "15" }, { "red", "1C" }, { "silver", "17" }, { "teal", "13 " }, { "white", "1F" }, { "yellow", "1E" } } *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -156,19 +156,19 @@ FUNCTION ProcessPdf(lMemory) LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM local hhh DEFAULT lMemory to .F. @@ -191,15 +191,15 @@ local hhh // oPdf := tPdf():new( "pdf\temp.pdf" ) HB_PDFNEW("pdf\temp.pdf",,a4_height,a4_width) - hb_pdfnewpage("Harbour Guide",'Harbour Guide') + hb_pdfnewpage("Harbour Guide","Harbour Guide") hb_pdfendpage() else -// ? 'im here' +// ? "im here" HB_PDFNEW("pdf\harbour.pdf",,a4_height,a4_width) - hb_pdfnewpage("Harbour Guide",'Harbour Guide') + hb_pdfnewpage("Harbour Guide","Harbour Guide") hb_pdfinitbook(aResult) hb_pdfendpage() - hhh:=fcreate('ssss.sss') + hhh:=fcreate("ssss.sss") endif FOR i := 1 TO nFiles @@ -644,10 +644,10 @@ local hhh ENDIF lBlankLine := EMPTY( cBuffer ) IF AT( "", cBuffer ) > 0 - STRTRAN( cBuffer, "", '' ) - STRTRAN( cBuffer, "", '' ) + STRTRAN( cBuffer, "", "" ) + STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, SPACE( 6 ), "" ) - cbuFfer := '' + cBuffer + '' + cbuFfer := "" + cBuffer + "" ENDIF ProcPdfDesc( cbuffer, oPdf, "Syntax" ) ELSEIF nMode == D_ARG @@ -696,9 +696,9 @@ local hhh // read next line ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) - hb_pdfwritetext('') + hb_pdfwritetext("") hb_pdfwriteBoldtext1( " Status" ) - hb_pdfwritetext('') + hb_pdfwritetext("") ENDIF ProcStatusPdf( oPdf, cBuffer ) @@ -725,7 +725,7 @@ local hhh /* oPdf:Close()*/ HB_PDFCLOSE() if lmemory -// ferase('pdf\temp.pdf') +// ferase("pdf\temp.pdf") endif fclose(hhh) @@ -821,10 +821,10 @@ RETURN Nil FUNCTION ProcPdfTable( cBuffer, nNum ) LOCAL nPos - LOCAL cItem := '' - LOCAL cItem2 := '' - LOCAL cItem3 := '' - LOCAL cItem4 := '' + LOCAL cItem := "" + LOCAL cItem2 := "" + LOCAL cItem3 := "" + LOCAL cItem4 := "" LOCAL nColorpos LOCAL cColor cBuffer := ALLTRIM( cBuffer ) @@ -838,7 +838,7 @@ FUNCTION ProcPdfTable( cBuffer, nNum ) cBuffer := STRTRAN( cbuffer, "", "" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos, 2 ] ENDIF @@ -846,14 +846,14 @@ FUNCTION ProcPdfTable( cBuffer, nNum ) cItem := SUBSTR( cBuffer, 1, AT( SPACE( 3 ), cBuffer ) - 1 ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, "" ) ) ELSE - citem := '' + citem := "" ENDIF IF nNum == 2 IF !EMPTY( cBuffer ) cItem2 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' + citem2 := "" ENDIF ELSEIF nNum == 3 IF !EMPTY( cBuffer ) @@ -861,8 +861,8 @@ FUNCTION ProcPdfTable( cBuffer, nNum ) cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem2, "" ) ) cItem3 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' - citem3 := '' + citem2 := "" + citem3 := "" ENDIF ELSEIF nNum > 3 @@ -875,9 +875,9 @@ FUNCTION ProcPdfTable( cBuffer, nNum ) cItem4 := SUBSTR( cBuffer, 1 ) ELSE - citem2 := '' - citem3 := '' - citem4 := '' + citem2 := "" + citem3 := "" + citem4 := "" ENDIF ENDIF @@ -898,14 +898,14 @@ RETURN Nil *+ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) - LOCAL cLine := '' + LOCAL cLine := "" LOCAL nPos - LOCAL cBold := '' - LOCAL cRemove := '' + LOCAL cBold := "" + LOCAL cRemove := "" LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL cReturn := '' + LOCAL ccolor := "" + LOCAL cReturn := "" LOCAL nIdentLevel LOCAL cOldLine LOCAL lEndPar := .F. @@ -916,8 +916,8 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) @@ -946,9 +946,9 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) // cBuffer:= strtran(cBuffer,"","") IF lArgBold - cReturn := '' + cOldLine + ' ' + cReturn + ' ' + cReturn := "" + cOldLine + " " + cReturn + " " ELSE - cReturn := '' + cOldLine + ' ' + cReturn + ' ' + cReturn := "" + cOldLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -959,8 +959,8 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 - nColorPos := AT( '", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 + nColorPos := AT( " 0 CheckPdfColor( @cbuffer, ncolorpos ) ENDIF @@ -968,7 +968,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) IF cStyle == "Description" .OR. cStyle == "Compliance" nIdentLevel := 7 nPos := 0 - cBuffer:=strtran(cbuffer,"",'') + cBuffer:=strtran(cbuffer,"","") DO WHILE !lendPar IF nPos == 0 @@ -982,7 +982,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 85 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -992,7 +992,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1011,7 +1011,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ELSEIF cStyle == "Arguments" nIdentLevel := 7 nPos := 0 - cBuffer:=strtran(cbuffer,"",'') + cBuffer:=strtran(cbuffer,"","") DO WHILE !lendPar IF nPos == 0 cLine := SUBSTR( cBuffer, 1, 85 ) @@ -1032,7 +1032,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 85 ) //60 - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1042,7 +1042,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1058,9 +1058,9 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nIdentLevel := 6 nPos := 0 - cBuffer:=strtran(cbuffer,"",'') - cBuffer:=strtran(cbuffer,"",'') - cBuffer:=strtran(cbuffer,"",'') + cBuffer:=strtran(cbuffer,"","") + cBuffer:=strtran(cbuffer,"","") + cBuffer:=strtran(cbuffer,"","") cBuffer:=alltrim(cbuffer) DO WHILE !lendPar IF nPos == 0 @@ -1074,7 +1074,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 85 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1084,7 +1084,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1099,7 +1099,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nIdentLevel := 7 nPos := 0 // hb_pdfwritetext(cbuffer) - cBuffer:=strtran(cbuffer,"",'') + cBuffer:=strtran(cbuffer,"","") DO WHILE !lendPar IF nPos == 0 @@ -1113,7 +1113,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ELSE cLine := SPACE( nidentLevel ) + SUBSTR( cBuffer, curPos, 85 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -1123,7 +1123,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) nPos -= nIdentlevel ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -1138,8 +1138,8 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) hb_pdfWriteText( cBuffer ) @@ -1151,7 +1151,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) cLine := STRTRAN( cLine, "", "" ) ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ALLTRIM( cLine ) + ' ' + cReturn += ALLTRIM( cLine ) + " " ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) @@ -1164,7 +1164,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDDO END - IF AT( '', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 .or. AT( "", cLine ) > 0 @@ -1243,7 +1243,7 @@ FUNC MaxElemPdf( a ) FOR nCount := 1 TO nSize tam := LEN( a[ nCount ] ) - max := IF( tam > max, tam, max ) + max := iif( tam > max, tam, max ) NEXT nPos := ASCAN( a, { | x | LEN( x ) == max } ) RETURN max @@ -1261,10 +1261,10 @@ RETURN max *+ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) - LOCAL cReturn := '' - LOCAL cLine := '' - LOCAL cOldLine := '' - LOCAL cBuffEnd := '' + LOCAL cReturn := "" + LOCAL cLine := "" + LOCAL cOldLine := "" + LOCAL cBuffEnd := "" LOCAL lEndBuffer := .F. LOCAL nPos LOCAL lArgBold := .F. @@ -1272,18 +1272,18 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) HB_SYMBOL_UNUSED( oPdf ) - cReturn := cBuffer + ' ' + cReturn := cBuffer + " " - IF AT( '', cReturn ) > 0 .OR. EMPTY( cBuffer ) + IF AT( "", cReturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - cReturn := '' + cReturn := "" ENDIF RETURN cReturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" .AND. cStyle != "Return" DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuffer := .T. ENDIF @@ -1298,21 +1298,21 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) - cReturn := '' + cReturn + ' ' - ELSEIF cStyle == 'Syntax' + cReturn := "" + cReturn + " " + ELSEIF cStyle == "Syntax" cReturn := STRTRAN( cReturn, SPACE( 4 ), "" ) - cReturn := '' + cReturn + ' ' + cReturn := "" + cReturn + " " - ELSEIF cStyle == 'Arguments' .OR. cStyle == "Return" + ELSEIF cStyle == "Arguments" .OR. cStyle == "Return" nPos := 0 - cReturn := '' + cReturn + cReturn := "" + cReturn IF AT( "", cReturn ) > 0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) @@ -1341,15 +1341,15 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) lEndBuffer := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) IF lArgBold - cReturn := '' + cOldLine + ' ' + cReturn + ' ' + cReturn := "" + cOldLine + " " + cReturn + " " ELSE - cReturn := '' + cOldLine + ' ' + cReturn + ' ' + cReturn := "" + cOldLine + " " + cReturn + " " ENDIF ENDIF lArgBold := .F. @@ -1369,7 +1369,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) diff --git a/harbour/utils/hbdoc/genrtf.prg b/harbour/utils/hbdoc/genrtf.prg index d766b50c71..8bfd1ca6f8 100644 --- a/harbour/utils/hbdoc/genrtf.prg +++ b/harbour/utils/hbdoc/genrtf.prg @@ -57,8 +57,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' -#include 'common.ch' +#include "hbdocdef.ch" +#include "common.ch" // output lines on the screen #define INFILELINE 10 @@ -76,7 +76,7 @@ STATIC lEof STATIC aCurDoc := {} STATIC nCurDoc := 1 -STATIC aColorTable := { { 'aqua', '\cf2 ' }, { 'black', '\cf1 ' }, { 'fuchia', '\cf3 ' }, { 'grey', '\cf4 ' }, { 'green', '\cf5 ' }, { 'lime', '\cf6 ' }, { 'maroon', '\cf7 ' }, { 'navy', '\cf8 ' }, { 'olive', '\cf9 ' }, { 'purple', '\cf10 ' }, { 'red', '\cf11 ' }, { 'silver', '\cf12 ' }, { 'teal', '\cf13 ' }, { 'white', '\cf14 ' }, { 'yellow', '\cf15 ' } } +STATIC aColorTable := { { "aqua", "\cf2 " }, { "black", "\cf1 " }, { "fuchia", "\cf3 " }, { "grey", "\cf4 " }, { "green", "\cf5 " }, { "lime", "\cf6 " }, { "maroon", "\cf7 " }, { "navy", "\cf8 " }, { "olive", "\cf9 " }, { "purple", "\cf10 " }, { "red", "\cf11 " }, { "silver", "\cf12 " }, { "teal", "\cf13 " }, { "white", "\cf14 " }, { "yellow", "\cf15 " } } *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -113,7 +113,7 @@ FUNCTION ProcessRtf() LOCAL xAddBlank LOCAL nNumTopics := 0 LOCAL nCurTopics := 1 - LOCAL cBar := " " + replicate( ')', 80 ) + LOCAL cBar := " " + replicate( ")", 80 ) LOCAL nMode LOCAL cFuncName LOCAL cOneLine @@ -151,19 +151,19 @@ FUNCTION ProcessRtf() LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM - LOCAL cConstruct := DELIM + 'CONSTRUCTOR' + DELIM - LOCAL cDatalink := DELIM + 'DATALINK' + DELIM - LOCAL cDatanolink := DELIM + 'DATANOLINK' + DELIM - LOCAL cMethodslink := DELIM + 'METHODSLINK' + DELIM - LOCAL cMethodsNolink := DELIM + 'METHODSNOLINK' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM + LOCAL cConstruct := DELIM + "CONSTRUCTOR" + DELIM + LOCAL cDatalink := DELIM + "DATALINK" + DELIM + LOCAL cDatanolink := DELIM + "DATANOLINK" + DELIM + LOCAL cMethodslink := DELIM + "METHODSLINK" + DELIM + LOCAL cMethodsNolink := DELIM + "METHODSNOLINK" + DELIM LOCAL cData := DELIM + "DATA" + DELIM - LOCAL cMethod := DELIM + 'METHOD' + DELIM + LOCAL cMethod := DELIM + "METHOD" + DELIM LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM LOCAL cTable := DELIM + "TABLE" + DELIM Local aAlso:={} @@ -174,7 +174,7 @@ FUNCTION ProcessRtf() lIsMethodLink := .F. lWrite := .F. - cTempx := '' + cTempx := "" // // Entry Point // @@ -374,9 +374,9 @@ FUNCTION ProcessRtf() nMode := D_ONELINE // Now start writing out what we know IF lData - oRtf:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) + oRtf:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, "Data " + cFuncName ) ELSEIF lMethod - oRtf:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, LEFT( cFilename, AT( '.', cFilename ) - 1 ) + ":"+cFuncName ) + oRtf:WriteJumpTitle( LEFT( cFilename, AT( ".", cFilename ) - 1 ) + cFuncName, LEFT( cFilename, AT( ".", cFilename ) - 1 ) + ":"+cFuncName ) ELSE oRtf:WriteTitle( cFuncName, cFuncName, cOneLine,cCategory) // oRtf:WriteParBold( cOneLine ) @@ -395,9 +395,9 @@ FUNCTION ProcessRtf() ENDIF oRtf:WriteParBold( " Syntax" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() nMode := D_SYNTAX - // oRtf:WritePar('') //:endpar() + // oRtf:WritePar("") //:endpar() lAddBlank := .T. END ELSEIF AT( cConstruct, cBuffer ) > 0 @@ -422,7 +422,7 @@ FUNCTION ProcessRtf() ENDIF oRtf:WriteParBold( " Arguments" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() nMode := D_ARG lAddBlank := .T. lPar := .T. @@ -441,9 +441,9 @@ FUNCTION ProcessRtf() END ELSEIF AT( cDesc, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( " Description" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() nMode := D_DESCRIPTION lAddBlank := .T. lPar := .T. @@ -507,7 +507,7 @@ oRtf:WritePar( "" ) //:endpar() IF !lBlankLine //ortf:endpar() - oRtf:WritePar('') //:endpar() + oRtf:WritePar("") //:endpar() oRtf:WriteParBold( " Examples" ) ENDIF @@ -517,9 +517,9 @@ oRtf:WritePar( "" ) //:endpar() ELSEIF AT( cTest, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) IF !lBlankLine - oRtf:WritePar('') //:endpar() + oRtf:WritePar("") //:endpar() oRtf:WriteParBold( " Tests" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() ENDIF nMode := D_EXAMPLE @@ -534,9 +534,9 @@ oRtf:WritePar( "" ) //:endpar() IF GetItem( cBuffer, nCurdoc ) IF !lBlankLine //ortf:endpar() - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( " Compliance" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() ENDIF nMode := D_COMPLIANCE @@ -547,9 +547,9 @@ oRtf:WritePar( "" ) //:endpar() IF GetItem( cBuffer, nCurdoc ) IF !lBlankLine //ortf:endpar() - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( " Platforms" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() ENDIF nMode := D_NORMAL @@ -559,9 +559,9 @@ oRtf:WritePar( "" ) //:endpar() ELSEIF AT( cFiles, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) IF !lBlankLine - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( " Files" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() ENDIF lPar := .T. @@ -571,9 +571,9 @@ oRtf:WritePar( "" ) //:endpar() ELSEIF AT( cFunction, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) IF !lBlankLine - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( " Functions" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() ENDIF nMode := D_NORMAL @@ -600,13 +600,13 @@ oRtf:WritePar( "" ) //:endpar() ENDIF lBlankLine := EMPTY( cBuffer ) IF AT( "", cBuffer ) > 0 - STRTRAN( cBuffer, "", '' ) - STRTRAN( cBuffer, "", '' ) + STRTRAN( cBuffer, "", "" ) + STRTRAN( cBuffer, "", "" ) cBuffer := ALLTRIM( cBuffer ) - cbuFfer := '' + cBuffer + '' + cbuFfer := "" + cBuffer + "" ENDIF procrtfdesc( cbuffer, oRtf, "Syntax" ) - // oRtf:WritePar('') //:endpar() + // oRtf:WritePar("") //:endpar() ELSEIF nMode == D_RETURN IF LEN( cBuffer ) > LONGLINE @@ -637,7 +637,7 @@ oRtf:WritePar( "" ) //:endpar() ENDIF cTemp := SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( ":", cBuffer ) + 1 ) - oRtf:WriteJumpLink1( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) + oRtf:WriteJumpLink1( LEFT( cfilename, AT( ".", cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; @@ -650,7 +650,7 @@ oRtf:WritePar( "" ) //:endpar() cTemp := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) + 1 ) cName := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( "()", cBuffer ) + 2 ) - oRtf:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ),ALLTRIM( cTemp ), cBuffer ) + oRtf:WriteJumpLink( LEFT( cfilename, AT( ".", cFilename ) - 1 ) + ALLTRIM( cTemp ),ALLTRIM( cTemp ), cBuffer ) ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE @@ -701,9 +701,9 @@ oRtf:WritePar( "" ) //:endpar() ENDIF ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() oRtf:WriteParBold( "Status" ) - oRtf:WritePar( '' ) //:endpar() + oRtf:WritePar( "" ) //:endpar() xaddblank := .T. ELSE oRtf:WritePar( "" ) //:endpar() @@ -747,7 +747,7 @@ RETURN oRtf:aIdh FUNCTION ProcRtfAlso( nWriteHandle, cSeeAlso ) LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" LOCAL nLen LOCAL xPos LOCAL xTemp @@ -840,12 +840,12 @@ RETURN nil *+ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) - LOCAL cLine := '' + LOCAL cLine := "" LOCAL npos LOCAL CurPos := 0 LOCAL nColorPos - LOCAL ccolor := '' - LOCAL creturn := '' + LOCAL ccolor := "" + LOCAL creturn := "" LOCAL NIDENTLEVEL LOCAL coline LOCAL lEndPar := .F. @@ -854,8 +854,8 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) LOCAL lEndTable := .F. LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" - cBuffer := '' + cBuffer + IF AT( "", cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" + cBuffer := "" + cBuffer ENDIF IF EMPTY( cBuffer ) @@ -877,7 +877,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) cOLine := LEFT( cReturn, nPos - 1 ) cReturn := STRTRAN( cReturn, coLine, "" ) if "\" $ cReturn - cReturn := Strtran( cReturn, '\', '\\') + cReturn := Strtran( cReturn, "\", "\\") // tracelog( cReturn ) endif IF AT( "@", cOLine ) > 0 .OR. AT( "()", cOLine ) > 0 .OR. AT( "<", cOLine ) > 0 .OR. AT( "_", cOLine ) > 0 @@ -888,9 +888,9 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) // cBuffer:= strtran(cBuffer,"","") IF lArgBold - cReturn := ' ' + cOLine + ' ' + cReturn + ' ' + cReturn := " " + cOLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOLine + ' ' + cReturn + ' ' + cReturn := " " + cOLine + " " + cReturn + " " ENDIF cbuffer := cReturn @@ -902,21 +902,21 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .AND. AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 if "\" $ cBuffer - cBuffer := Strtran(cBuffer, '\', '\\') + cBuffer := Strtran(cBuffer, "\", "\\") // tracelog( cBuffer ) endif - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', '\b ' ) - cBuffer := STRTRAN( cBuffer, '', '\b0 ' ) - cBuffer := STRTRAN( cBuffer, '', '\b\i ' ) - cBuffer := STRTRAN( cBuffer, '', '\b0\i0 ' ) - cBuffer := STRTRAN( cBuffer, '', '\i ' ) - cBuffer := STRTRAN( cBuffer, '', '\i0 ' ) - cBuffer := STRTRAN( cBuffer, '', '\cf1 ' ) - nColorPos := AT( '", "" ) + cBuffer := STRTRAN( cBuffer, "", "\b " ) + cBuffer := STRTRAN( cBuffer, "", "\b0 " ) + cBuffer := STRTRAN( cBuffer, "", "\b\i " ) + cBuffer := STRTRAN( cBuffer, "", "\b0\i0 " ) + cBuffer := STRTRAN( cBuffer, "", "\i " ) + cBuffer := STRTRAN( cBuffer, "", "\i0 " ) + cBuffer := STRTRAN( cBuffer, "", "\cf1 " ) + nColorPos := AT( " 0 checkrtfcolor( @cbuffer, ncolorpos ) ENDIF @@ -924,49 +924,49 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) IF cStyle == "Description" .OR. cStyle == "Compliance" nIdentLevel := 6 nPos := 0 - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) // cBuffer:=SUBSTR(cBuffer,2) cBuffeR := ALLTRIM( cBuffer ) - oRtf:WritePar( " " + cBuffer + ' ', '\fi-426\li426 ' ) + oRtf:WritePar( " " + cBuffer + " ", "\fi-426\li426 " ) ENDIF ELSEIF cStyle == "Arguments" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) cBuffeR := ALLTRIM( cBuffer ) - oRtf:WritePar( " " + cBuffer + ' ', '\fi-2272\li2272 ' ) + oRtf:WritePar( " " + cBuffer + " ", "\fi-2272\li2272 " ) ENDIF ELSEIF cStyle == "Syntax" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) // cBuffer:=SUBSTR(cBuffer,2) cBuffeR := ALLTRIM( cBuffer ) - oRtf:WritePar( cBuffer + ' ', '\fi-426\li426 ' ) + oRtf:WritePar( cBuffer + " ", "\fi-426\li426 " ) ENDIF ELSEIF cStyle == "Default" - IF AT( '', cBuffer ) > 0 + IF AT( "", cBuffer ) > 0 cBuffer := STRTRAN( cBuffer, "", "" ) ENDIF IF !EMPTY( cBuffer ) // cBuffer:=SUBSTR(cBuffer,2) cBuffeR := ALLTRIM( cBuffer ) - oRtf:WritePar( " " + cBuffer, '\fi-426\li426 ' ) + oRtf:WritePar( " " + cBuffer, "\fi-426\li426 " ) ENDIF ENDIF ENDIF - IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) + IF AT( "", cBuffer ) > 0 .OR. cStyle = "Example" + IF AT( "", cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) oRtf:WriteParFixed( cBuffer ) @@ -988,7 +988,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) ENDDO END - IF AT( '', cBuffer ) > 0 + IF AT( "
", cBuffer ) > 0 DO WHILE !lendTable cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cBuffer ) > 0 @@ -1003,7 +1003,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) ENDIF // If cStyle=="Description" .or. cStyle=="Compliance" - // oRtf:Writepar('') + // oRtf:Writepar("") // endif RETURN nil @@ -1031,14 +1031,14 @@ FUNCTION ProcRtfTable( cBuffer ) cBuffer := STRTRAN( cbuffer, "", "\cf1" ) cBuffer := STRTRAN( cbuffer, "", "" ) - cBuffer := STRTRAN( cBuffer, ccolor, '' ) + cBuffer := STRTRAN( cBuffer, ccolor, "" ) nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } ) cColor := aColortable[ nColorPos, 2 ] ENDIF IF !EMPTY( cBuffer ) cItem := cBuffer ELSE - cItem := '' + cItem := "" ENDIF IF ccolor != NIL AADD( afiTable, ccolor + cItem ) @@ -1083,7 +1083,7 @@ FUNCTION GenRtfTable( oRtf ) 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' ) + ortf:WriteParFixed( iif( AT( "|", afiTable[ x ] ) > 0, STRTRAN( afiTable[ x ], "|", " " ), afiTable[ x ] ), "\fi-426\li426" ) NEXT oRtf:WriteParBox( " " + replicate( CHR( 196 ), 80 ) ) // oRtf:WritePar( "" ) @@ -1148,7 +1148,7 @@ FUNC maxrtfelem( a ) ELSE tam := LEN( a[ ncount ] ) ENDIF - max := IF( tam > max, tam, max ) + max := iif( tam > max, tam, max ) NEXT nPos := ASCAN( a, { | x | LEN( x ) == max } ) RETURN max @@ -1163,24 +1163,24 @@ RETURN max *+ FUNCTION FormatrtfBuff( cBuffer, cStyle ) - LOCAL cReturn := '' - LOCAL cLine := '' - LOCAL cBuffend := '' - LOCAL coline := '' + LOCAL cReturn := "" + LOCAL cLine := "" + LOCAL cBuffend := "" + LOCAL coline := "" LOCAL lEndBuff := .F. LOCAL nPos LOCAL lArgBold := .F. - creturn := cBuffer + ' ' - IF AT( '', creturn ) > 0 .OR. EMPTY( cBuffer ) + creturn := cBuffer + " " + IF AT( "", creturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) - creturn := '' + creturn := "" ENDIF RETURN creturn ENDIF IF cStyle != "Syntax" .AND. cStyle != "Arguments" .AND. cStyle != "Return" DO WHILE !lendBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndBuff := .T. ENDIF @@ -1195,21 +1195,21 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) lEndBuff := .T. ENDIF IF AT( DELIM, cLine ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO creturn := STRTRAN( creturn, "", "" ) creturn := STRTRAN( creturn, "", "" ) - cReturn := '' + creturn + ' ' - ELSEIF cStyle == 'Syntax' + cReturn := "" + creturn + " " + ELSEIF cStyle == "Syntax" - cReturn := '' + cReturn + ' ' + cReturn := "" + cReturn + " " - ELSEIF cStyle == 'Arguments' .OR. cStyle == "Return" + ELSEIF cStyle == "Arguments" .OR. cStyle == "Return" nPos := 0 - cReturn := '' + creturn + cReturn := "" + creturn IF AT( "", cReturn ) > 0 cReturn := STRTRAN( cReturn, "", "" ) cReturn := STRTRAN( cReturn, "", "" ) @@ -1241,15 +1241,15 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) lEndBuff := .T. ENDIF IF AT( DELIM, cline ) == 0 - cReturn += ' ' + ALLTRIM( cLine ) + ' ' + cReturn += " " + ALLTRIM( cLine ) + " " ENDIF ENDDO creturn := STRTRAN( creturn, "", "" ) creturn := STRTRAN( creturn, "", "" ) IF lArgBold - cReturn := ' ' + cOLine + ' ' + cReturn + ' ' + cReturn := " " + cOLine + " " + cReturn + " " ELSE - cReturn := ' ' + cOLine + ' ' + cReturn + ' ' + cReturn := " " + cOLine + " " + cReturn + " " ENDIF lArgBold := .F. ENDIF @@ -1269,7 +1269,7 @@ STATIC FUNCTION ReadFromTop( nh ) LOCAL cDoc := DELIM + "DOC" + DELIM // DOC keyword LOCAL cEnd := DELIM + "END" + DELIM // END keyword LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 LOCAL aLocDoc := {} DO WHILE FREADline( nH, @cBuffer, 4096 ) diff --git a/harbour/utils/hbdoc/gentrf.prg b/harbour/utils/hbdoc/gentrf.prg index 78f312bcef..348439b42a 100644 --- a/harbour/utils/hbdoc/gentrf.prg +++ b/harbour/utils/hbdoc/gentrf.prg @@ -148,12 +148,12 @@ FUNCTION ProcessTroff LOCAL cInc := DELIM + "INCLUDE" + DELIM // INCLUDE keyword LOCAL cComm := DELIM + "COMMANDNAME" + DELIM // COMMAND keyword LOCAL cCompl := DELIM + "COMPLIANCE" + DELIM - LOCAL cTest := DELIM + 'TESTS' + DELIM - LOCAL cStatus := DELIM + 'STATUS' + DELIM - LOCAL cPlat := DELIM + 'PLATFORMS' + DELIM - LOCAL cFiles := DELIM + 'FILES' + DELIM - LOCAL cSubCode := DELIM + 'SUBCODE' + DELIM - LOCAL cFunction := DELIM + 'FUNCTION' + DELIM + LOCAL cTest := DELIM + "TESTS" + DELIM + LOCAL cStatus := DELIM + "STATUS" + DELIM + LOCAL cPlat := DELIM + "PLATFORMS" + DELIM + LOCAL cFiles := DELIM + "FILES" + DELIM + LOCAL cSubCode := DELIM + "SUBCODE" + DELIM + LOCAL cFunction := DELIM + "FUNCTION" + DELIM // // Entry Point @@ -227,7 +227,7 @@ FUNCTION ProcessTroff // Now close down this little piece lDoc := .F. IF .NOT. EMPTY( cSeeAlso ) - oTroff:WriteText( '.ft B' + CRLF + "See Also:" + CRLF + '.ft R' ) + oTroff:WriteText( ".ft B" + CRLF + "See Also:" + CRLF + ".ft R" ) FOR nAlso := 1 TO LEN( aAlso ) IF nAlso == 1 diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 0f80a377cb..9407f041d4 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -115,7 +115,7 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' +#include "hbdocdef.ch" // output lines on the screen #define INFILELINE 10 @@ -150,7 +150,7 @@ MEMVAR lTroff MEMVAR aResult MEMVAR theHandle -STATIC cTitle:='' +STATIC cTitle:="" /* */ @@ -171,7 +171,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) LOCAL cLast LOCAL nItem LOCAL nHpj - LOCAL cItem:='' + LOCAL cItem:="" LOCAL cFName LOCAL cLName LOCAL aName @@ -544,22 +544,22 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) NEXT ELSEIF lRtf - nHpj := FCREATE( 'harbour.hpj' ) - FWRITE( nHpj, '[OPTIONS]' + CRLF ) - FWRITE( nHpj, 'HCW=1' + CRLF ) - FWRITE( nHpj, 'COMPRESS=60 Hall Zeck' + CRLF ) - FWRITE( nHpj, 'LCID=0x416 0x0 0x0 ;Português (brasileiro)' + CRLF ) - FWRITE( nHpj, 'REPORT=Yes' + CRLF ) - FWRITE( nHpj, 'CONTENTS=IDH_OVERVIEW' + CRLF ) - FWRITE( nHpj, 'TITLE='+cTitle + CRLF ) - FWRITE( nHpj, 'COPYRIGHT=Copyright (c) http://www.harbour-project.org/' + CRLF ) - FWRITE( nHpj, 'HLP=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) - FWRITE( nHpj, 'ROOT=\' + CURDIR() + "\RTF" + CRLF ) - FWRITE( nHpj, 'CNT=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".cnt"+ CRLF ) - FWRITE( nHpj, '[FILES]' + CRLF ) + nHpj := FCREATE( "harbour.hpj" ) + FWRITE( nHpj, "[OPTIONS]" + CRLF ) + FWRITE( nHpj, "HCW=1" + CRLF ) + FWRITE( nHpj, "COMPRESS=60 Hall Zeck" + CRLF ) + FWRITE( nHpj, "LCID=0x416 0x0 0x0 ;Português (brasileiro)" + CRLF ) + FWRITE( nHpj, "REPORT=Yes" + CRLF ) + FWRITE( nHpj, "CONTENTS=IDH_OVERVIEW" + CRLF ) + FWRITE( nHpj, "TITLE="+cTitle + CRLF ) + FWRITE( nHpj, "COPYRIGHT=Copyright (c) http://www.harbour-project.org/" + CRLF ) + FWRITE( nHpj, "HLP=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) + FWRITE( nHpj, "ROOT=\" + CURDIR() + "\RTF" + CRLF ) + FWRITE( nHpj, "CNT=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".cnt"+ CRLF ) + FWRITE( nHpj, "[FILES]" + CRLF ) FWRITE( nHpj, "harbour.rtf" + CRLF ) - FWRITE( nHpj, '[CONFIG]' + CRLF + 'contents()' + CRLF + 'prev()' + CRLF + 'next()' + CRLF + 'BrowseButtons()' + CRLF ) - FWRITE( nHpj, '[WINDOWS]' + CRLF + 'Commands="Harbour Commands",(653,102,360,600),20736,(r14876671),(r12632256),f2' +; + FWRITE( nHpj, "[CONFIG]" + CRLF + "contents()" + CRLF + "prev()" + CRLF + "next()" + CRLF + "BrowseButtons()" + CRLF ) + FWRITE( nHpj, "[WINDOWS]" + CRLF + 'Commands="Harbour Commands",(653,102,360,600),20736,(r14876671),(r12632256),f2' +; CRLF +'API="Harbour Commands",(653,102,360,600),20736,(r14876671),(r12632256),f2' + CRLF +; 'Error="Harbour Run Time Errors",(653,102,360,600),20736,(r14876671),(r12632256),f2' + CRLF +; 'Tools="Harbour Tools",(653,102,360,600),20736,(r14876671),(r12632256),f2' + CRLF +; @@ -567,39 +567,39 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) 'Funca="Harbour Run Time Functions A-M",(653,102,360,600),20736,(r14876671),(r12632256),f2' + CRLF +; 'Funcn="Harbour Run Time Functions N-_",(653,102,360,600),20736,(r14876671),(r12632256),f2' + CRLF +; 'Main="Harbour",(117,100,894,873),60672,(r14876671),(r12632256),f2' + CRLF ) - FWRITE( nHpj, '[MAP]'+CRLF) + FWRITE( nHpj, "[MAP]"+CRLF) for each ppp in aRtfid fwrite(nHpj, "#define "+ppp[1] +" " + str(ppp[2])+CRLF) next FCLOSE( nHpj ) nHpj := FCREATE( lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".cnt" ) - FWRITE( nHpj, ':Base '+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) - FWRITE( nHpj, ':Title '+cTitle+CRLF) - FWRITE( nHpj, ':Index '+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +'='+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) - FWRITE( nHpj, '1 Harbour'+CRLF) + FWRITE( nHpj, ":Base "+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) + FWRITE( nHpj, ":Title "+cTitle+CRLF) + FWRITE( nHpj, ":Index "+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +"="+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hlp"+ CRLF ) + FWRITE( nHpj, "1 Harbour"+CRLF) asort( aWww,,,{|x,y| x[3]+x[1]Main"+CRLF) + if aWww[ppp,3]=="Document" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">Main"+CRLF) endif Next asort(aWww,,,{|x,y| x[3]+x[1]Error"+CRLF) + if aWww[ppp,3]=="Run Time Errors" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">Error"+CRLF) endif Next - FWRITE( nHpj, '1 Harbour Runtime functions and Commands by Name'+CRLF) + FWRITE( nHpj, "1 Harbour Runtime functions and Commands by Name"+CRLF) asort(aWww,,,{|x,y| x[1]Funca"+CRLF) + if aWww[ppp,3]!="Run Time Errors" .and. aWww[ppp,3] !="Document" .and. aWww[ppp,3] !="The garbage collector" .and. aWww[ppp,3] !="OOP Command" .and. aWww[ppp,3] !="Command" .and. aWww[ppp,3] !="The idle states" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">Funca"+CRLF) endif Next - FWRITE( nHpj, '1 Harbour Runtime functions Category'+CRLF) + FWRITE( nHpj, "1 Harbour Runtime functions Category"+CRLF) asort(aWww,,,{|x,y| x[3]Commands"+CRLF) + if aWww[ppp,3]=="Command" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">Commands"+CRLF) endif Next - FWRITE( nHpj, '1 Harbour OOP commands'+CRLF) + FWRITE( nHpj, "1 Harbour OOP commands"+CRLF) for ppp:=1 to len(aWww) - if aWww[ppp,3]=='OOP Command' - fWrite( nHpj, '2 '+aWww[ppp,1]+"="+aWww[ppp,2]+">Class"+CRLF) + if aWww[ppp,3]=="OOP Command" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">Class"+CRLF) endif Next - FWRITE( nHpj, '1 The Garbage API'+CRLF) + FWRITE( nHpj, "1 The Garbage API"+CRLF) for ppp:=1 to len(aWww) - if aWww[ppp,3]=='The garbage collector' - fWrite( nHpj, '2 '+aWww[ppp,1]+"="+aWww[ppp,2]+">API"+CRLF) + if aWww[ppp,3]=="The garbage collector" + fWrite( nHpj, "2 "+aWww[ppp,1]+"="+aWww[ppp,2]+">API"+CRLF) endif Next @@ -640,9 +640,9 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) do while .T. citem:=adocinfo[1,1] AADD(aMetaContents,{"GENERATOR","HBDOC Harbour document Extractor"}) - aadd(aMetaContents,{'Keywords',"Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) - ohtm:=THTML():new('htm\hb'+strtran(citem," ","")+'.htm',aMetaContents) - ohtm:WriteText('

'+adocinfo[1,1]+'


') + aadd(aMetaContents,{"Keywords","Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) + ohtm:=THTML():new("htm\hb"+strtran(citem," ","")+".htm",aMetaContents) + ohtm:WriteText("

"+adocinfo[1,1]+"


") ohtm:WriteText("") for ppp:=1 to len(adocinfo) @@ -655,12 +655,12 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) citem:=adocinfo[ppp,1] aMetaContents:={} AADD(aMetaContents,{"GENERATOR","HBDOC Harbour document Extractor"}) - aadd(aMetaContents,{'Keywords',"Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) + aadd(aMetaContents,{"Keywords","Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) - ohtm:=THTML():new('htm\hb'+strtran(adocinfo[ppp,1]," ","")+'.htm',aMetaContents) + ohtm:=THTML():new("htm\hb"+strtran(adocinfo[ppp,1]," ","")+".htm",aMetaContents) -// oHtm:WriteMetaTag('Keywords',"Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem) - ohtm:WriteText('

'+adocinfo[ppp,1]+'


') +// oHtm:WriteMetaTag("Keywords","Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem) + ohtm:WriteText("

"+adocinfo[ppp,1]+"


") ohtm:WriteText("
") oHtm:WritelinkTable(adocinfo[ppp,4],adocinfo[ppp,2],adocinfo[ppp,3]) endif @@ -673,13 +673,13 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ohtm:close() aMetaContents:={} AADD(aMetaContents,{"GENERATOR","HBDOC Harbour document Extractor"}) - aadd(aMetaContents,{'Keywords',"Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) + aadd(aMetaContents,{"Keywords","Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,"+cItem}) oHtm1 := THTML():New( "htm\harbour.htm" ,aMetaContents) -// oHtm:WriteMetaTag('Keywords',"Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,Harbour Documentation") +// oHtm:WriteMetaTag("Keywords","Harbour project, Clipper, xBase, database, Free Software, GNU, compiler, cross platform, 32-bit, FiveWin,Harbour Documentation") oHtm1:WriteTitle( "Harbour Reference Guide" ) oHtm1:WriteText( "

Harbour Reference Guide

" ) - oHtm1:WriteText( "

Harbour

" + hb_osnEwline() + '
    ' ) + oHtm1:WriteText( "

    Harbour

    " + hb_osnEwline() + "
      " ) oHtm1:WriteLink( "overview", UpperLower( "Harbour Read me" ) ) oHtm1:WriteLink( "license", UpperLower( "Harbour License" ) ) oHtm1:WriteLink( "http://www.gnu.org/copyleft/gpl.html", "GNU License" ) @@ -690,46 +690,46 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ohtm1:WriteLink( "http://www.harbour-project.org","Harbour.org Web page") oHtm1:WriteText( "
    " ) oHtm1:WriteText( "

    Alphabetical list of functions by Categorie

    " ) - ohtm1:writetext('
      ') + ohtm1:writetext("
        ") nItem := len(aResult) asort(aResult,,,{|x,y| x') + ohtm1:writetext("
      ") oHtm1:WriteText( "

      Commands and Statements

      " ) - ohtm1:writetext('
        ') + ohtm1:writetext("
          ") for ppp:=1 to nItem cLast:=GetNextContent(ppp) if cLast == "Command" .or. clast =="OOP Command" .or. cLast =="Statement" - ohtm1:WriteLink('hb'+strtran(aResult[ppp]," ","")+'.htm',aResult[ppp]) + ohtm1:WriteLink("hb"+strtran(aResult[ppp]," ","")+".htm",aResult[ppp]) endif Next - ohtm1:writetext('
        ') + ohtm1:writetext("
      ") oHtm1:WriteText( "

      Classes and method

      " ) - ohtm1:writetext('
        ') + ohtm1:writetext("
          ") for ppp:=1 to nItem cLast:=GetNextContent(ppp) if "CLASS" $ UPPER(cLast) .or. "METHOD" $ UPPER(cLast) - ohtm1:WriteLink('hb'+strtran(aResult[ppp]," ","")+'.htm',aResult[ppp]) + ohtm1:WriteLink("hb"+strtran(aResult[ppp]," ","")+".htm",aResult[ppp]) endif Next - ohtm1:writetext('
        ') + ohtm1:writetext("
      ") ohtm1:close() @@ -747,7 +747,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ELSEIF lWww2 cFileName := "index.htm" - oHtmIndex := THTML():New('htm\' + cFileName) + oHtmIndex := THTML():New("htm\" + cFileName) // Add title to HTML oHtmIndex:WriteText("Harbour - Reference Guide") @@ -792,23 +792,23 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) oHtmIndex:WriteText("") ELSEIF lChm - nHpj := FCREATE( 'chm\'+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) + nHpj := FCREATE( "chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) - FWRITE( nHpj, '[OPTIONS]' + CRLF ) - FWRITE( nHpj, 'Compatibility=1.1 or later'+CRLF) - FWRITE( nHpj, 'Auto Index=Yes'+CRLF) - FWRITE( nHpj,'Full-text search=Yes'+CRLF) - FWRITE( nHpj, 'Language=0x416 Português (brasileiro)' + CRLF ) - FWRITE( nHpj, 'Contents file=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc"+ CRLF ) - FWRITE( nHpj, 'Compiled file=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".chm"+ CRLF ) - FWRITE( nHpj, 'Display compile progress=No'+CRLF) + FWRITE( nHpj, "[OPTIONS]" + CRLF ) + FWRITE( nHpj, "Compatibility=1.1 or later"+CRLF) + FWRITE( nHpj, "Auto Index=Yes"+CRLF) + FWRITE( nHpj,"Full-text search=Yes"+CRLF) + FWRITE( nHpj, "Language=0x416 Português (brasileiro)" + CRLF ) + FWRITE( nHpj, "Contents file=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc"+ CRLF ) + FWRITE( nHpj, "Compiled file=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".chm"+ CRLF ) + FWRITE( nHpj, "Display compile progress=No"+CRLF) nPos:=aScan(awww,{|x| Upper(x[1])="OVERVIEW"}) if nPos > 0 - FWRITE( nHpj,'Default topic='+ lower(awww[npos,2])+".htm"+CRLF) + FWRITE( nHpj,"Default topic="+ lower(awww[npos,2])+".htm"+CRLF) Else - FWRITE( nHpj,'Default topic='+lower(awww[1,2]) +".htm"+CRLF) + FWRITE( nHpj,"Default topic="+lower(awww[1,2]) +".htm"+CRLF) Endif - FWRITE( nHpj, '[FILES]' + CRLF ) + FWRITE( nHpj, "[FILES]" + CRLF ) For nPos:=1 to len(aWww) FWRITE( nHpj, lower(awww[npos,2])+".htm" + CRLF ) Next @@ -816,15 +816,15 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) - ohtm:=THTML():NewContent('chm\'+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") - ohtm:WriteText('') + ohtm:=THTML():NewContent("chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") + ohtm:WriteText("") ohtm:Addobject("text/site properties") oHtm:AddParam("FrameName","Ajuda") ohtm:EndObject() ohtm:WriteText("
        ") oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','Harbour') + oHTm:AddParam("Name","Harbour") ohtm:EndObject() ohtm:WriteText("
          ") writeChmContentFile(aDocinfo,"Document",oHtm) @@ -833,7 +833,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ohtm:WriteText("
            ") oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','Harbour Run Time Error') + oHTm:AddParam("Name","Harbour Run Time Error") ohtm:EndObject() ohtm:WriteText("
              ") writeChmContentFile(aDocinfo,"Run Time Errors",oHtm) @@ -842,12 +842,12 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) oHtm:WriteText( "
                " ) oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','Harbour Runtime functions and Commands by Name') + oHTm:AddParam("Name","Harbour Runtime functions and Commands by Name") ohtm:EndObject() ohtm:WriteText("
                  ") asort(aDocinfo,,,{|x,y|x[2]") oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name',cLast) + oHTm:AddParam("Name",cLast) ohtm:EndObject() ohtm:WriteText("
                    ") endif - if cLast!='Run Time Errors' .and. cLast !="Document" .and. cLast !="The garbage collector" .and. cLast !="OOP Command" .and. cLast !="Command" .and. cLast !="The idle states" + if cLast!="Run Time Errors" .and. cLast !="Document" .and. cLast !="The garbage collector" .and. cLast !="OOP Command" .and. cLast !="Command" .and. cLast !="The idle states" // oHtm:WriteText( "
                      " ) WriteChmContentFile(aDocinfo,cLast,oHtm) oHtm:WriteText( "
                    " ) @@ -892,7 +892,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) oHtm:WriteText( "
                      " ) oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','Harbour Commands') + oHTm:AddParam("Name","Harbour Commands") ohtm:EndObject() ohtm:WriteText("
                        ") asort(aDocinfo,,,{|x,y| x[2]" ) oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','Harbour OOP Commands') + oHTm:AddParam("Name","Harbour OOP Commands") ohtm:EndObject() ohtm:WriteText("
                          ") asort(aDocinfo,,,{|x,y| x[2]" ) oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHTm:AddParam('Name','The Garbage API') + oHTm:AddParam("Name","The Garbage API") ohtm:EndObject() ohtm:WriteText("
                            ") asort(aDocinfo,,,{|x,y| x[2]Harbour - Reference Guide") @@ -967,43 +967,43 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) oHtmIndex:WriteText("") oHtmIndex:WriteText("") - nHpj := FCREATE('chm\' + LOWER(SUBSTR(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) - FWRITE( nHpj, '[OPTIONS]' + CRLF ) - FWRITE( nHpj, 'Compatibility=1.1 or later'+CRLF) - FWRITE( nHpj, 'Auto Index=Yes'+CRLF) - FWRITE( nHpj, 'Full-text search=Yes'+CRLF) - FWRITE( nHpj, 'Language=0x416 Português (brasileiro)' + CRLF ) - FWRITE( nHpj, 'Contents file=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc"+ CRLF ) - FWRITE( nHpj, 'Compiled file=.\'+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".chm"+ CRLF ) - FWRITE( nHpj, 'Display compile progress=No'+CRLF) + nHpj := FCREATE("chm\" + LOWER(SUBSTR(cLinkName,1,AT(".",cLinkName)-1)) +".hhp" ) + FWRITE( nHpj, "[OPTIONS]" + CRLF ) + FWRITE( nHpj, "Compatibility=1.1 or later"+CRLF) + FWRITE( nHpj, "Auto Index=Yes"+CRLF) + FWRITE( nHpj, "Full-text search=Yes"+CRLF) + FWRITE( nHpj, "Language=0x416 Português (brasileiro)" + CRLF ) + FWRITE( nHpj, "Contents file=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc"+ CRLF ) + FWRITE( nHpj, "Compiled file=.\"+ lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".chm"+ CRLF ) + FWRITE( nHpj, "Display compile progress=No"+CRLF) //nPos := aScan(aDocInfo, {|x| Upper(x[2] + ".htm") = "OVERVIEW"}) //if nPos > 0 - FWRITE( nHpj,'Default topic=index.htm' + CRLF) + FWRITE( nHpj,"Default topic=index.htm" + CRLF) //Else - //FWRITE( nHpj,'Default topic=' + lower(aDocInfo[1,2]) + CRLF) + //FWRITE( nHpj,"Default topic=" + lower(aDocInfo[1,2]) + CRLF) //Endif - FWRITE( nHpj, '[FILES]' + CRLF ) + FWRITE( nHpj, "[FILES]" + CRLF ) For nPos:=1 to len(aDocInfo) FWRITE( nHpj, lower(aDocInfo[npos,2]) + CRLF ) Next FCLOSE( nHpj ) - oHtm:=THTML():NewContent('chm\'+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") - oHtm:WriteText('') + oHtm:=THTML():NewContent("chm\"+lower(substr(cLinkName,1,AT(".",cLinkName)-1)) +".hhc") + oHtm:WriteText("") oHtm:Addobject("text/site properties") oHtm:AddParam("FrameName","Ajuda") oHtm:EndObject() oHtm:WriteText("
                              ") oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name','Harbour Reference Guide') + oHtm:AddParam("Name","Harbour Reference Guide") oHtm:EndObject() oHtm:WriteText("
                                ") oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', 'Alphabetical list of classes') - oHtm:AddParam('Local', 'index.htm') + oHtm:AddParam("Name", "Alphabetical list of classes") + oHtm:AddParam("Local", "index.htm") oHtm:EndObject() oHtm:WriteText("
                                  ") @@ -1013,8 +1013,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][3] = "C1" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][1]) - oHtm:AddParam('Local', aDocInfo[nCount_1][2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][1]) + oHtm:AddParam("Local", aDocInfo[nCount_1][2]) oHtm:EndObject() oHtm:WriteText("
                                    ") @@ -1022,8 +1022,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF LEN(aDocInfo[nCount_1][4]) > 0 oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', "Methods") - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") + oHtm:AddParam("Name", "Methods") + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                                      ") ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) @@ -1032,8 +1032,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][4][nCount_2, 2]) - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() ENDIF @@ -1045,8 +1045,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF LEN(aDocInfo[nCount_1][4]) > 0 oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', "Properties") - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") + oHtm:AddParam("Name", "Properties") + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                                        ") ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) @@ -1055,8 +1055,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][4][nCount_2, 2]) - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() ENDIF @@ -1073,8 +1073,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // WinAPI functions oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', 'Alphabetical list of WinAPI functions') - oHtm:AddParam('Local', 'index.htm') + oHtm:AddParam("Name", "Alphabetical list of WinAPI functions") + oHtm:AddParam("Local", "index.htm") oHtm:EndObject() oHtm:WriteText("
                                          ") @@ -1084,8 +1084,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][3] = "F2" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][1]) - oHtm:AddParam('Local', aDocInfo[nCount_1][2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][1]) + oHtm:AddParam("Local", aDocInfo[nCount_1][2]) oHtm:EndObject() //oHtm:WriteText("
                                            ") @@ -1093,8 +1093,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF LEN(aDocInfo[nCount_1][4]) > 0 oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', "Methods") - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") + oHtm:AddParam("Name", "Methods") + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                                              ") ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) @@ -1103,8 +1103,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][4][nCount_2, 1] = "Method" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][4][nCount_2, 2]) - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() ENDIF @@ -1116,8 +1116,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF LEN(aDocInfo[nCount_1][4]) > 0 oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', "Properties") - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") + oHtm:AddParam("Name", "Properties") + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#methodlist") oHtm:EndObject() oHtm:WriteText("
                                                ") ASORT(aDocInfo[nCount_1][4],,, {|x, y| UPPER(x[1]) < UPPER(y[1]) .AND. UPPER(x[2]) < UPPER(y[2]) }) @@ -1126,8 +1126,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF aDocInfo[nCount_1][4][nCount_2, 1] = "Data" oHtm:ListItem() oHtm:AddObject("text/sitemap") - oHtm:AddParam('Name', aDocInfo[nCount_1][4][nCount_2, 2]) - oHtm:AddParam('Local', LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Name", aDocInfo[nCount_1][4][nCount_2, 2]) + oHtm:AddParam("Local", LEFT(aDocInfo[nCount_1][2], LEN(aDocInfo[nCount_1][2]) - 4) + "_content.htm#" + aDocInfo[nCount_1][4][nCount_2, 2]) oHtm:EndObject() ENDIF @@ -1180,21 +1180,21 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) SET ALTERNATE TO "assembl.bat" ADDITIVE SET ALTERNATE ON SET CONSOLE OFF - ? 'Copy ngi\overview.ngi .' - ? 'Copy ngi\License.ngi .' - ? 'Copy ngi\Funcam.txt .' - ? 'Copy ngi\funcn_.txt .' - ? 'copy ngi\comm.txt .' - ? 'Compiling Sources' - ? 'ngxc overview.ngi' - ? 'ngxc license.ngi' - ? 'ngxc funcam.txt' - ? 'ngxc funcn_.txt ' - ? 'ngxc comm.txt' - ? 'Linking the Guide' - ? 'ngxl '+cLinkName - ? 'del ngi\*.*' - ? 'del *.ngo' + ? "Copy ngi\overview.ngi ." + ? "Copy ngi\License.ngi ." + ? "Copy ngi\Funcam.txt ." + ? "Copy ngi\funcn_.txt ." + ? "copy ngi\comm.txt ." + ? "Compiling Sources" + ? "ngxc overview.ngi" + ? "ngxc license.ngi" + ? "ngxc funcam.txt" + ? "ngxc funcn_.txt " + ? "ngxc comm.txt" + ? "Linking the Guide" + ? "ngxl "+cLinkName + ? "del ngi\*.*" + ? "del *.ngo" ENDIF @ INFILELINE, 0 CLEAR TO INFILELINE, MAXCOL() @@ -1761,10 +1761,10 @@ RETURN cCompiler STATIC FUNCTION ReadLinkFile( cFile ) - LOCAL cBuffer := '' + LOCAL cBuffer := "" LOCAL NPOS := 0 Local cLine - Local cVer:='' + Local cVer:="" LOCAL aLocDoc := {} Local nH:=FT_FUSE(cFile) DO WHILE FREADline( nH, @cBuffer, 4096 ) @@ -1773,17 +1773,17 @@ STATIC FUNCTION ReadLinkFile( cFile ) ENDDO FT_FUSE() - frename(CFILE,substr(cfile,1,at('.',cFile)-1)+'.old') + frename(CFILE,substr(cfile,1,at(".",cFile)-1)+".old") cVer:=docver() nH:=fcreate(cfile) for nPos:=1 to len(aLocdoc) cLine:=alocdoc[nPos] if at("%HB_VERSION%",cLine)>0 - cLine:=strtran(cLine,'%HB_VERSION%',cVer) + cLine:=strtran(cLine,"%HB_VERSION%",cVer) endif IF AT("%HB_BLDDATE%",cLine)>0 SET CENTURY ON - cLine:=strtran(cLine,'%HB_BLDDATE%',DTOC(date())) + cLine:=strtran(cLine,"%HB_BLDDATE%",DTOC(date())) SET CENTURY Off endif FWRITE(nH,cLine+HB_OSNEWLINE()) @@ -1794,7 +1794,7 @@ RETURN nil FUNCTION DocVer() local cVersion:=version() -local cReturn:='' +local cReturn:="" cReturn:=substr(cVersion,9,4) RETURN cReturn @@ -1810,9 +1810,9 @@ for nCount:=1 to Len(aWww) endif Next asort(aTemp,,,{|x,y| x[2]Funca"+CRLF) + fWrite( nFile, "3 "+aTemp[nCount,1]+"="+aTemp[nCount,2]+">Funca"+CRLF) next return nil diff --git a/harbour/utils/hbdoc/html.prg b/harbour/utils/hbdoc/html.prg index b109f4cc82..0f728b8bc3 100644 --- a/harbour/utils/hbdoc/html.prg +++ b/harbour/utils/hbdoc/html.prg @@ -51,8 +51,8 @@ * */ -#include 'hbclass.ch' -#include 'common.ch' +#include "hbclass.ch" +#include "common.ch" #define CRLF HB_OSNewLine() STATIC nX := 0 @@ -110,7 +110,7 @@ RETURN Self METHOD WriteTitle( cTitle ) CLASS THTML - FWRITE( Self:nHandle, "" + CRLF + cTitle + CRLF + "" + CRLF + '' + CRLF ) + FWRITE( Self:nHandle, "" + CRLF + cTitle + CRLF + "" + CRLF + "" + CRLF ) FWRITE( Self:nHandle, "" + CRLF ) RETURN Self @@ -118,7 +118,7 @@ METHOD WritePar( cPar ) CLASS THTML // cPar:=STRTRAN(cPar,"<","<") // cPar:=STRTRAN(cPar,">",">") - FWRITE( Self:nHandle, '
                                                ' + ALLTRIM( cPar ) + '
                                                ' + CRLF ) + FWRITE( Self:nHandle, "
                                                " + ALLTRIM( cPar ) + "
                                                " + CRLF ) RETURN Self METHOD WriteText( cPar ) CLASS THTML @@ -132,13 +132,13 @@ METHOD WriteParBold( cPar, lEndDl, lPar ) CLASS THTML DEFAULT lEnddl TO .T. DEFAULT lPar TO .T. IF lEndDl .AND. lPar - FWRITE( Self:nHandle, "

                                                " + CRLF + "" + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + '

                                                ' + CRLF ) + FWRITE( Self:nHandle, "

                                                " + CRLF + "
                                                " + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + "

                                                " + CRLF ) ELSEIF !lPar .AND. !lEnddl - FWRITE( Self:nHandle, '

                                                ' + CRLF + "
                                                " + ALLTRIM( cPar ) + '

                                                ' + CRLF ) + FWRITE( Self:nHandle, "

                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + "

                                                " + CRLF ) ELSEIF !lPar .AND. lEnddl - FWRITE( Self:nHandle, "" + CRLF + "

                                                " + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + '

                                                ' + CRLF ) + FWRITE( Self:nHandle, "" + CRLF + "

                                                " + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + "

                                                " + CRLF ) ELSEIF lPar .AND. !lEnddl - FWRITE( Self:nHandle, "

                                                " + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + '

                                                ' + CRLF ) + FWRITE( Self:nHandle, "

                                                " + CRLF + "
                                                " + CRLF + "
                                                " + ALLTRIM( cPar ) + "

                                                " + CRLF ) ENDIF RETURN Self @@ -154,18 +154,18 @@ RETURN Self METHOD WriteLink( cLink, cName ) CLASS THTML LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" nPos := AT( "()", cLink ) IF nPos > 0 if AT(".htm",cLink)=0 - cTemp := SUBSTR( cLink, 1, nPos - 1 ) + '.htm' + cTemp := SUBSTR( cLink, 1, nPos - 1 ) + ".htm" else cTemp := SUBSTR( cLink, 1, nPos - 1 ) endif ELSE if AT(".htm",cLink)=0 - cTemp := ALLTRIM( cLink ) + '.htm' + cTemp := ALLTRIM( cLink ) + ".htm" else cTemp := ALLTRIM( cLink ) endif @@ -183,18 +183,18 @@ RETURN Self METHOD WriteLinkTable( cLink, cName,cInfo ) CLASS THTML LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" nPos := AT( "()", cLink ) IF nPos > 0 if AT(".htm",cLink)=0 - cTemp := SUBSTR( cLink, 1, nPos - 1 ) + '.htm' + cTemp := SUBSTR( cLink, 1, nPos - 1 ) + ".htm" else cTemp := SUBSTR( cLink, 1, nPos - 1 ) endif ELSE if AT(".htm",cLink)=0 - cTemp := ALLTRIM( cLink ) + '.htm' + cTemp := ALLTRIM( cLink ) + ".htm" else cTemp := ALLTRIM( cLink ) endif @@ -203,7 +203,7 @@ METHOD WriteLinkTable( cLink, cName,cInfo ) CLASS THTML cLink := cName ENDIF cTemp := STRTRAN( cTemp, " ", "" ) - FWRITE( Self:nHandle, "

'+ CRLF ) + FWRITE( Self:nHandle, ""+ CRLF ) RETURN Self @@ -273,18 +273,18 @@ RETURN SELF METHOD WriteChmLink( cLink, cName ) CLASS THTML LOCAL nPos - LOCAL cTemp := '' + LOCAL cTemp := "" nPos := AT( "()", cLink ) IF nPos > 0 if AT(".htm",cLink)=0 - cTemp := SUBSTR( cLink, 1, nPos - 1 ) + '.htm' + cTemp := SUBSTR( cLink, 1, nPos - 1 ) + ".htm" else cTemp := SUBSTR( cLink, 1, nPos - 1 ) endif ELSE if AT(".htm",cLink)=0 - cTemp := ALLTRIM( cLink ) + '.htm' + cTemp := ALLTRIM( cLink ) + ".htm" else cTemp := ALLTRIM( cLink ) endif diff --git a/harbour/utils/hbdoc/ng.prg b/harbour/utils/hbdoc/ng.prg index b89f844f47..08fbdabf31 100644 --- a/harbour/utils/hbdoc/ng.prg +++ b/harbour/utils/hbdoc/ng.prg @@ -52,8 +52,8 @@ #define CRLF HB_OSNewLine() -#include 'hbclass.ch' -#include 'common.ch' +#include "hbclass.ch" +#include "common.ch" *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -101,7 +101,7 @@ RETURN Self METHOD WriteParBold( cPar ) CLASS TNortonGuide Self:WritePar( "" ) - FWRITE( Self:nHandle, '^b' + HB_OEMTOANSI( cPar ) + '^b^' + CRLF ) + FWRITE( Self:nHandle, "^b" + HB_OEMTOANSI( cPar ) + "^b^" + CRLF ) Self:WritePar( "" ) RETURN Self diff --git a/harbour/utils/hbdoc/os2.prg b/harbour/utils/hbdoc/os2.prg index c5bf8cb88c..b257f9f194 100644 --- a/harbour/utils/hbdoc/os2.prg +++ b/harbour/utils/hbdoc/os2.prg @@ -52,8 +52,8 @@ #define CRLF hb_osnewline() -#include 'hbclass.ch' -#include 'common.ch' +#include "hbclass.ch" +#include "common.ch" *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -99,14 +99,14 @@ METHOD New( cFile ) CLASS TOs2 Self:nHandle := FCREATE( Self:cFile ) ENDIF - FWRITE( Self:nHandle, ':userdoc.' + CRLF ) + FWRITE( Self:nHandle, ":userdoc." + CRLF ) - FWRITE( Self:nHandle, ':docprof toc=123456.' + CRLF ) - FWRITE( Self:nHandle, ':title.' + "Harbour Reference Guide" + CRLF ) + FWRITE( Self:nHandle, ":docprof toc=123456." + CRLF ) + FWRITE( Self:nHandle, ":title." + "Harbour Reference Guide" + CRLF ) - FWRITE( Self:nHandle, '.* HBDOC generated IPF Source File.' + CRLF ) + FWRITE( Self:nHandle, ".* HBDOC generated IPF Source File." + CRLF ) - FWRITE( Self:nHandle, '.* HBDOC Document Source Extractor, (c)1999-2000 Luiz Rafael Culik.' + CRLF ) + FWRITE( Self:nHandle, ".* HBDOC Document Source Extractor, (c)1999-2000 Luiz Rafael Culik." + CRLF ) RETURN Self @@ -118,15 +118,15 @@ RETURN Self METHOD WritePar2( cBuffer,cTag,cStyle ) CLASS TOs2 Local aLines:={} - LOCAL nPos,cLine:='' + LOCAL nPos,cLine:="" Default cStyle to "Default" if at("-",cBuffer)>0 Endif - cBuffer := STRTRAN( cBuffer, '', ':hp2.' ) - cBuffer := STRTRAN( cBuffer, '', ':ehp2.' ) - cBuffer := STRTRAN( cBuffer, '', '' ) - cBuffer := STRTRAN( cBuffer, '', '' ) + cBuffer := STRTRAN( cBuffer, "", ":hp2." ) + cBuffer := STRTRAN( cBuffer, "", ":ehp2." ) + cBuffer := STRTRAN( cBuffer, "", "" ) + cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := self:DostoOs2Text(cBuffer) aLines:=FormatStringBuffer(cBuffer) @@ -171,7 +171,7 @@ endif ELSE cLine := SUBSTR( cBuffer, curPos, 231 ) - IF AT( '', cLine ) > 0 + IF AT( "", cLine ) > 0 lEndPar := .T. cLine := STRTRAN( cLine, " ", "" ) ENDIF @@ -181,7 +181,7 @@ endif nPos -= 1 ELSE IF cLine == "" - cLine := '' + cLine := "" ENDIF ENDIF @@ -210,9 +210,9 @@ RETURN Self METHOD WriteParBold( cPar ,lMarg) CLASS TOs2 DEFAULT lMarg to .T. IF lMarg - FWRITE( Self:nHandle,".br"+CRLF+ ":hp2." + SELF:DosToOs2Text( cPar ) + ':ehp2.'+CRLF +".br" + CRLF +":p."+CRLF+':lm margin=6.' +CRLF ) + FWRITE( Self:nHandle,".br"+CRLF+ ":hp2." + SELF:DosToOs2Text( cPar ) + ":ehp2."+CRLF +".br" + CRLF +":p."+CRLF+":lm margin=6." +CRLF ) Else - FWRITE( Self:nHandle,":hp2." + SELF:DosToOs2Text( cPar ) + ':ehp2.'+CRLF +".br") + FWRITE( Self:nHandle,":hp2." + SELF:DosToOs2Text( cPar ) + ":ehp2."+CRLF +".br") Endif RETURN Self @@ -233,30 +233,30 @@ METHOD WriteTitle( cTopic, cTitle ,cCategory) CLASS TOs2 ELSE // Just in case that nItem>0 so the Link is already referenced nItem := ASCAN( Self:aLinkRef, { | a | upper(a[ 1 ]) == upper(cTopic) } ) ENDIF -// FWRITE( Self:nHandle, ':h1 res=' + ALLTRIM( STR( nItem ) ) + '.' + cTopic + CRLF ) +// FWRITE( Self:nHandle, ":h1 res=" + ALLTRIM( STR( nItem ) ) + "." + cTopic + CRLF ) If Self:ScanInd(cIndCateg)==0 niItem := ASCAN( Self:aIndRef, { | a | upper(a) == upper(cIndCateg )} ) - FWRITE( Self:nHandle, ':h1 ' + ::aIndRef[niItem] + "."+ UPPER( cCategory ) + CRLF) + FWRITE( Self:nHandle, ":h1 " + ::aIndRef[niItem] + "."+ UPPER( cCategory ) + CRLF) lHead := .T. ELSE // Just in case that nItem>0 so the Link is already referenced niItem := ASCAN( Self:aIndRef, { | a | upper(a) == upper(cIndCateg) } ) ENDIF IF niItem>0 .AND. lHead - FWRITE( Self:nHandle, ':h2 '+ ' res=' + ALLTRIM( STR( nItem ) ) + '.' + cTopic + CRLF ) + FWRITE( Self:nHandle, ":h2 "+ " res=" + ALLTRIM( STR( nItem ) ) + "." + cTopic + CRLF ) elseIF niItem>0 .AND. !lHead - FWRITE( Self:nHandle, ':h2 id='+ ::aIndRef[niItem] + ' res=' + ALLTRIM( STR( nItem ) ) + '.' + cTopic + CRLF ) + FWRITE( Self:nHandle, ":h2 id="+ ::aIndRef[niItem] + " res=" + ALLTRIM( STR( nItem ) ) + "." + cTopic + CRLF ) Endif lHead:=.F. If Self:ScanRef(cRefCateg)==0 nrItem := ASCAN( Self:aHeadRef, { | a | upper(a) == upper(cRefCateg )} ) - FWRITE( Self:nHandle, ':i1 id=' + ::aHeadRef[nrItem] + "."+ UPPER( cCategory ) + CRLF) + FWRITE( Self:nHandle, ":i1 id=" + ::aHeadRef[nrItem] + "."+ UPPER( cCategory ) + CRLF) ELSE // Just in case that nItem>0 so the Link is already referenced nrItem := ASCAN( Self:aHeadRef, { | a | upper(a) == upper(cRefCateg) } ) ENDIF if nritem>0 - FWRITE( Self:nHandle, ':i2 refid=' + ::aHeadRef[nrItem] + "." + UPPER( cTopic ) + CRLF ) + FWRITE( Self:nHandle, ":i2 refid=" + ::aHeadRef[nrItem] + "." + UPPER( cTopic ) + CRLF ) Endif cTopic := ::DosToOs2Text(cTopic) cTitle := ::DosToOs2Text(cTitle) @@ -267,7 +267,7 @@ RETURN Self METHOD CLOSE() CLASS TOs2 - FWRITE( Self:nHandle, ':euserdoc.' + CRLF ) + FWRITE( Self:nHandle, ":euserdoc." + CRLF ) FCLOSE( Self:nHandle ) @@ -334,29 +334,29 @@ METHOD DosToOs2Text( cText ) CLASS TOs2 LOCAL cReturn - cReturn := STRTRAN( cText, '&', "&." ) + cReturn := STRTRAN( cText, "&", "&." ) cReturn := STRTRAN( cReturn, '"', "&cdq." ) if at(":hp2.",cReturn)==0 .or. at(":ehp2.",cReturn)==0 - cReturn := STRTRAN( cReturn, ':', "&colon." ) + cReturn := STRTRAN( cReturn, ":", "&colon." ) endif - cReturn := STRTRAN( cReturn, ',', "&comma." ) + cReturn := STRTRAN( cReturn, ",", "&comma." ) - cReturn := STRTRAN( cReturn, '_', "&us." ) - cReturn := STRTRAN( cReturn, '~', "&tilde." ) - cReturn := STRTRAN( cReturn, '|', "&splitvbar." ) + cReturn := STRTRAN( cReturn, "_", "&us." ) + cReturn := STRTRAN( cReturn, "~", "&tilde." ) + cReturn := STRTRAN( cReturn, "|", "&splitvbar." ) - cReturn := STRTRAN( cReturn, '/', "&slash." ) + cReturn := STRTRAN( cReturn, "/", "&slash." ) cReturn := STRTRAN( cReturn,"<&slash.par>","") - cReturn := STRTRAN( cReturn, ';', "&semi." ) - cReturn := STRTRAN( cReturn, ')', "&rpar." ) - cReturn := STRTRAN( cReturn, ']', "&rbrk.." ) - cReturn := STRTRAN( cReturn, '}', "&rbrc." ) - cReturn := STRTRAN( cReturn, '(', "&lpar." ) - cReturn := STRTRAN( cReturn, '[', "&lbrk." ) - cReturn := STRTRAN( cReturn, '{', "&lbrc." ) - cReturn := STRTRAN( cReturn, '=', "&eq." ) - cReturn := STRTRAN( cReturn, '$', "&dollar." ) + cReturn := STRTRAN( cReturn, ";", "&semi." ) + cReturn := STRTRAN( cReturn, ")", "&rpar." ) + cReturn := STRTRAN( cReturn, "]", "&rbrk.." ) + cReturn := STRTRAN( cReturn, "}", "&rbrc." ) + cReturn := STRTRAN( cReturn, "(", "&lpar." ) + cReturn := STRTRAN( cReturn, "[", "&lbrk." ) + cReturn := STRTRAN( cReturn, "{", "&lbrc." ) + cReturn := STRTRAN( cReturn, "=", "&eq." ) + cReturn := STRTRAN( cReturn, "$", "&dollar." ) cReturn := STRTRAN( cReturn, "-", "&minus." ) RETURN cReturn @@ -369,7 +369,7 @@ METHOD WriteJumpTitle( cTitle, cTopic ) CLASS TOs2 cTopic := ALLTRIM( HB_OEMTOANSI( cTopic ) ) - cWrite := ':fn id=' + cTopic + '.' + cWrite := ":fn id=" + cTopic + "." FWRITE( Self:nHandle, cWrite ) @@ -395,7 +395,7 @@ Return cReturn Static FUNCTION FormatStringBuffer(cBuffer) Local nLen,nPos,aLine:={} -Local cLine:='' +Local cLine:="" nLen:=Len(cBuffer) WHILE nLen>230 @@ -408,7 +408,7 @@ WHILE nLen>230 AADD(aLine,alltrim(cLine)) nLen:=Len(cBuffer) Endif - if at('&minus.',cLine)>0 .or. at('&eq.',cLine)>0 + if at("&minus.",cLine)>0 .or. at("&eq.",cLine)>0 nPos:=RAT(".",cLine) IF nPos>0 cLine:=Substr(cBuffer,1,nPos) diff --git a/harbour/utils/hbdoc/rtf.prg b/harbour/utils/hbdoc/rtf.prg index 181f4cafdf..22c10de573 100644 --- a/harbour/utils/hbdoc/rtf.prg +++ b/harbour/utils/hbdoc/rtf.prg @@ -52,8 +52,8 @@ #define CRLF HB_OSNewLine() #xtranslate UPPERLOWER() => (UPPER(SUBSTR(,1,1))+LOWER(SUBSTR(,2))) -#include 'hbclass.ch' -#include 'common.ch' +#include "hbclass.ch" +#include "common.ch" MEMVAR aWWW,aResult *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -98,42 +98,42 @@ RETURN Self METHOD WriteHeader() CLASS TRTF - LOCAL cHeader := '{\rtf1\ansi\pard\fs20' + CRLF + ; - '\deff5{\fonttbl' + CRLF + ; - '{\f0\froman Tms Rmn;}' + CRLF + ; - '{\f1\fdecor Symbol;}' + CRLF + ; - '{\f2\fswiss Helv;}' + CRLF + ; - '{\f3\fmodern LinePrinter;}' + CRLF + ; - '{\f4\froman Terminal;}' + CRLF + ; - '{\f5\froman Times New Roman;}' + CRLF + ; - '{\f6\fswiss Arial;}' + CRLF + ; - '{\f7\froman CG Times (WN);}' + CRLF + ; - '{\f8\fmodern Courier;}' + CRLF + ; - '{\f9\fmodern Modern;}' + CRLF + ; - '{\f10\fscript Script;}' + CRLF + ; - '{\f11\fswiss Univers (WN);}' + CRLF + ; - '{\f12\fnil Wingdings;}' + CRLF + ; - '{\f13\fswiss MS Sans Serif;}' + CRLF + ; - '{\f14\fmodern\fcharset2 LotusWP Box;}' + CRLF + ; - '}' + CRLF + LOCAL cHeader := "{\rtf1\ansi\pard\fs20" + CRLF + ; + "\deff5{\fonttbl" + CRLF + ; + "{\f0\froman Tms Rmn;}" + CRLF + ; + "{\f1\fdecor Symbol;}" + CRLF + ; + "{\f2\fswiss Helv;}" + CRLF + ; + "{\f3\fmodern LinePrinter;}" + CRLF + ; + "{\f4\froman Terminal;}" + CRLF + ; + "{\f5\froman Times New Roman;}" + CRLF + ; + "{\f6\fswiss Arial;}" + CRLF + ; + "{\f7\froman CG Times (WN);}" + CRLF + ; + "{\f8\fmodern Courier;}" + CRLF + ; + "{\f9\fmodern Modern;}" + CRLF + ; + "{\f10\fscript Script;}" + CRLF + ; + "{\f11\fswiss Univers (WN);}" + CRLF + ; + "{\f12\fnil Wingdings;}" + CRLF + ; + "{\f13\fswiss MS Sans Serif;}" + CRLF + ; + "{\f14\fmodern\fcharset2 LotusWP Box;}" + CRLF + ; + "}" + CRLF - LOCAL cColortable := '{\colortbl;' + CRLF + ; - '\red0\green0\blue0;' + CRLF + ; - '\red0\green255\blue255;' + CRLF + ; - '\red255\green0\blue255;' + CRLF + ; - '\red128\green128\blue128;' + CRLF + ; - '\red0\green128\blue0;' + CRLF + ; - '\red0\green255\blue0;' + CRLF + ; - '\red128\green0\blue0;' + CRLF + ; - '\red0\green0\blue128;' + CRLF + ; - '\red128\green128\blue0;' + CRLF + ; - '\red128\green0\blue128;' + CRLF + ; - '\red255\green0\blue0;' + CRLF + ; - '\red192\green192\blue192;' + CRLF + ; - '\red0\green128\blue128;' + CRLF + ; - '\red255\green255\blue255;' + CRLF + ; - '\red255\green255\blue0;' + CRLF + ; - '}' + CRLF + LOCAL cColortable := "{\colortbl;" + CRLF + ; + "\red0\green0\blue0;" + CRLF + ; + "\red0\green255\blue255;" + CRLF + ; + "\red255\green0\blue255;" + CRLF + ; + "\red128\green128\blue128;" + CRLF + ; + "\red0\green128\blue0;" + CRLF + ; + "\red0\green255\blue0;" + CRLF + ; + "\red128\green0\blue0;" + CRLF + ; + "\red0\green0\blue128;" + CRLF + ; + "\red128\green128\blue0;" + CRLF + ; + "\red128\green0\blue128;" + CRLF + ; + "\red255\green0\blue0;" + CRLF + ; + "\red192\green192\blue192;" + CRLF + ; + "\red0\green128\blue128;" + CRLF + ; + "\red255\green255\blue255;" + CRLF + ; + "\red255\green255\blue0;" + CRLF + ; + "}" + CRLF FWRITE( Self:nHandle, cHeader ) @@ -143,28 +143,28 @@ RETURN Self METHOD WritePar( cPar, cIden ) CLASS TRTF - DEFAULT ciDen TO '' + DEFAULT ciDen TO "" cPar := STRTRAN( cPar, "{", "\{" ) cPar := STRTRAN( cPar, "}", "\}" ) - FWRITE( Self:nHandle, '\par' + CRLF + '\pard\cf1\f6\fs20\b0\i0' + cIden + HB_OEMTOANSI( cPar ) + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF + "\pard\cf1\f6\fs20\b0\i0" + cIden + HB_OEMTOANSI( cPar ) + CRLF ) RETURN Self METHOD WriteParNoIndent( cPar ) CLASS TRTF cPar := STRTRAN( cPar, "{", "\{" ) cPar := STRTRAN( cPar, "}", "\}" ) - FWRITE( Self:nHandle, '\par' + CRLF + '\pard\cf1\f6\fs20\b0\i0' + HB_OEMTOANSI( cPar ) + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF + "\pard\cf1\f6\fs20\b0\i0" + HB_OEMTOANSI( cPar ) + CRLF ) RETURN Self METHOD WriteParBox( cPar ) CLASS TRTF cPar := STRTRAN( cPar, "{", "\{" ) cPar := STRTRAN( cPar, "}", "\}" ) - FWRITE( Self:nHandle, '\par' + CRLF + '\pard\cf1\f4\b0\i0\fi-426\li426' + HB_OEMTOANSI( cPar ) + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF + "\pard\cf1\f4\b0\i0\fi-426\li426" + HB_OEMTOANSI( cPar ) + CRLF ) RETURN Self METHOD WriteParFixed( cPar ) CLASS TRTF cPar := STRTRAN( cPar, "{", "\{" ) cPar := STRTRAN( cPar, "}", "\}" ) - FWRITE( Self:nHandle, '\par' + CRLF + '\pard\cf1\f8\b0\i0\keep' + cPar + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF + "\pard\cf1\f8\b0\i0\keep" + cPar + CRLF ) RETURN SELF METHOD WriteParText( cPar, lConv ) CLASS TRTF @@ -181,7 +181,7 @@ RETURN Self METHOD EndPar() CLASS TRTF - FWRITE( Self:nHandle, '\par' + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF ) RETURN Self METHOD WriteParBold( cPar, lCenter ) CLASS TRTF @@ -190,9 +190,9 @@ METHOD WriteParBold( cPar, lCenter ) CLASS TRTF cPar := STRTRAN( cPar, "{", "\{" ) cPar := STRTRAN( cPar, "}", "\}" ) IF lCenter - FWRITE( Self:nHandle, '\par \pard\qc\cf1\f6\fs30\i\b\fi-426\li426 ' + ALLTRIM( HB_OEMTOANSI( cPar ) ) + CRLF ) + FWRITE( Self:nHandle, "\par \pard\qc\cf1\f6\fs30\i\b\fi-426\li426 " + ALLTRIM( HB_OEMTOANSI( cPar ) ) + CRLF ) ELSE - FWRITE( Self:nHandle, '\par \pard\cf1\f6\fs30\i0\b\fi-426\li426 ' + ALLTRIM( HB_OEMTOANSI( cPar ) ) + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\f6\fs30\i0\b\fi-426\li426 " + ALLTRIM( HB_OEMTOANSI( cPar ) ) + CRLF ) ENDIF RETURN Self @@ -203,7 +203,7 @@ METHOD WriteParBoldText( cPar, cText ) CLASS TRTF cText := STRTRAN( cText, "{", "\{" ) cText := STRTRAN( cText, "}", "\}" ) - FWRITE( Self:nHandle, '\par \pard\cf1\f6\fs20\i\b ' + ALLTRIM( HB_OEMTOANSI( cPar ) ) + ' \b\cf1\f6\fs20\i0\b0\li300 ' + ALLTRIM( HB_OEMTOANSI( cText ) ) + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\f6\fs20\i\b " + ALLTRIM( HB_OEMTOANSI( cPar ) ) + " \b\cf1\f6\fs20\i0\b0\li300 " + ALLTRIM( HB_OEMTOANSI( cText ) ) + CRLF ) RETURN Self METHOD WriteTitle( cTitle, cTopic, cOne ,cCat) CLASS TRTF @@ -230,15 +230,15 @@ METHOD WriteTitle( cTitle, cTopic, cOne ,cCat) CLASS TRTF Aadd( ::aIdh, {"IDH_" + cTemp,::lastid++}) cWrite := CRLF + ; - ' {#{\footnote \pard\fs20 {' + "IDH_" + cTemp + ' }}}' + CRLF + ; - ' {${\footnote \pard\fs20 {' + ALLTRIM( cTopic ) + ' }}}' + CRLF + ; - ' {K{\footnote \pard\fs20 {' + UPPERLOWER(ALLTRIM( cTopic ))+";" + UPPERLOWER(ALLTRIM( cCat ))+ ' }}}' + CRLF + ; - ' {A{\footnote{A} ' + UPPERLOWER(ALLTRIM( cTopic )) +' }}' + CRLF + ; + " {#{\footnote \pard\fs20 {" + "IDH_" + cTemp + " }}}" + CRLF + ; + " {${\footnote \pard\fs20 {" + ALLTRIM( cTopic ) + " }}}" + CRLF + ; + " {K{\footnote \pard\fs20 {" + UPPERLOWER(ALLTRIM( cTopic ))+";" + UPPERLOWER(ALLTRIM( cCat ))+ " }}}" + CRLF + ; + " {A{\footnote{A} " + UPPERLOWER(ALLTRIM( cTopic )) +" }}" + CRLF + ; CRLF - /*'{\f6' + CRLF + ;*/ + /*"{\f6" + CRLF + ;*/ /*" ; " + UPPERLOWER(cCat) +" , " +UPPERLOWER(ALLTRIM( strtran(cTopic,"()","" )))+ */ aadd(aWww,{cTopic,"IDH_"+cTemp,cCat}) nPos := ascan(aResult,{|a| UPPER(a) == UPPER(cCat)}) @@ -247,9 +247,9 @@ METHOD WriteTitle( cTitle, cTopic, cOne ,cCat) CLASS TRTF endif FWRITE( Self:nHandle, cWrite ) - FWRITE( Self:nHandle, '\pard\cf1\f6\fs30\i0\b\keepn ' + ALLTRIM( HB_OEMTOANSI( cTopic ) ) + CRLF ) - FWRITE( Self:nHandle, '\par' + CRLF + '\pard\cf1\f6\fs20\b\i0\keepn' + " " + CRLF ) - FWRITE( Self:nHandle, '\par \pard\cf1\f6\fs30\i0\b\keepn ' + ALLTRIM( HB_OEMTOANSI( cOne ) ) + CRLF ) + FWRITE( Self:nHandle, "\pard\cf1\f6\fs30\i0\b\keepn " + ALLTRIM( HB_OEMTOANSI( cTopic ) ) + CRLF ) + FWRITE( Self:nHandle, "\par" + CRLF + "\pard\cf1\f6\fs20\b\i0\keepn" + " " + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\f6\fs30\i0\b\keepn " + ALLTRIM( HB_OEMTOANSI( cOne ) ) + CRLF ) RETURN Self METHOD WriteJumpTitle( cTitle, cTopic ) CLASS TRTF @@ -270,8 +270,8 @@ METHOD WriteJumpTitle( cTitle, cTopic ) CLASS TRTF cTopic := ALLTRIM( HB_OEMTOANSI( cTopic ) ) cWrite := CRLF + ; - ' #{\footnote \pard\fs20 ' + "IDH_" + cTemp + ' }' + CRLF + ; - ' ${\footnote \pard\fs20 ' + ALLTRIM( cTopic ) + ' }' + CRLF + ; + " #{\footnote \pard\fs20 " + "IDH_" + cTemp + " }" + CRLF + ; + " ${\footnote \pard\fs20 " + ALLTRIM( cTopic ) + " }" + CRLF + ; CRLF FWRITE( Self:nHandle, cWrite ) @@ -281,14 +281,14 @@ METHOD WriteJumpTitle( cTitle, cTopic ) CLASS TRTF RETURN Self METHOD EndPage() CLASS TRTF - FWRITE( Self:nHandle, "\par " + CRLF + '\page' + CRLF ) + FWRITE( Self:nHandle, "\par " + CRLF + "\page" + CRLF ) RETURN Self METHOD CLOSE() CLASS TRTF - // FWRITE( Self:nHandle, '\page' + CRLF ) + // FWRITE( Self:nHandle, "\page" + CRLF ) - FWRITE( Self:nHandle, '}' + CRLF ) + FWRITE( Self:nHandle, "}" + CRLF ) FCLOSE( Self:nHandle ) @@ -296,25 +296,25 @@ RETURN Self METHOD WriteLink( cLink ) CLASS TRTF - FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\uldb ' + ALLTRIM( HB_OEMTOANSI( cLink ) ) + '}{\v\f6 ' + "IDH_" + IF( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + '}' + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\fs20 {\f6\uldb " + ALLTRIM( HB_OEMTOANSI( cLink ) ) + "}{\v\f6 " + "IDH_" + iif( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + "}" + CRLF ) RETURN Self METHOD WriteJumpLink( cLink, cName, cText ) CLASS TRTF - FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\uldb ' + ALLTRIM( HB_OEMTOANSI( cName ) ) + '}{\v\f6 ' + "IDH_" + IF( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + '}' + cText + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\fs20 {\f6\uldb " + ALLTRIM( HB_OEMTOANSI( cName ) ) + "}{\v\f6 " + "IDH_" + iif( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + "}" + cText + CRLF ) RETURN Self METHOD WriteJumpLink1( cLink, cName, cText ) CLASS TRTF - FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\ul ' + ALLTRIM( HB_OEMTOANSI( cName ) ) + '}{\v\f6 ' + "IDH_" + IF( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + '}' + cText + CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\fs20 {\f6\ul " + ALLTRIM( HB_OEMTOANSI( cName ) ) + "}{\v\f6 " + "IDH_" + iif( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + "}" + cText + CRLF ) RETURN Self METHOD WritekLink( aLink ,lAlink) CLASS TRTF -Local cItem:=' ' +Local cItem:=" " Local nPos:=0 Local nSize:=Len(aLink) @@ -330,10 +330,10 @@ For nPos:=1 to nSize endif next cItem:=Alltrim(cItem) - FWRITE( Self:nHandle, '\par \pard\cf1\fs20 \{button , ALink('+UPPER(cItem) + ', 2) \}{\f6\uldb Related Topic }'+'{\v\f6 %!ALink(" '+cItem + '", 2) }'+ CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\fs20 \{button , ALink("+UPPER(cItem) + ", 2) \}{\f6\uldb Related Topic }"+'{\v\f6 %!ALink(" '+cItem + '", 2) }'+ CRLF ) else For nPos:=1 to nSize - FWRITE( Self:nHandle, '\par \pard\cf1\fs20 {\f6\uldb '+aLink[nPos] +' }{\v\f6 !KLink(" '+UPPERLOWER(aLink[nPos]) + '", 2) }'+ CRLF ) + FWRITE( Self:nHandle, "\par \pard\cf1\fs20 {\f6\uldb "+aLink[nPos] +' }{\v\f6 !KLink(" '+UPPERLOWER(aLink[nPos]) + '", 2) }'+ CRLF ) next endif RETURN Self diff --git a/harbour/utils/hbdoc/troff.prg b/harbour/utils/hbdoc/troff.prg index 33cb09007d..824d64cc4f 100644 --- a/harbour/utils/hbdoc/troff.prg +++ b/harbour/utils/hbdoc/troff.prg @@ -52,7 +52,7 @@ #define CRLF HB_OSNewLine() -#include 'hbclass.ch' +#include "hbclass.ch" *+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±± *+ @@ -83,29 +83,29 @@ RETURN Self METHOD WriteTitle( cTopic, cTitle ) CLASS TTROFF - LOCAL cWriteTitle := '.br' + CRLF + ; - '.ta' + CRLF + ; - '.in 0.08i' + CRLF + ; - '.ps -3' + CRLF + ; - '.vs -3' + CRLF + ; - '.sp 2' + CRLF + ; - '\fB' + cTitle + CRLF - LOCAL cWriteTopic := '.de }n' + CRLF + ; - '.bp' + CRLF + ; - '.sp .5i' + CRLF + ; - '..' + CRLF + ; - '.wh -.8i }n' + CRLF + ; - '.sp .5i' + CRLF + ; - '.po -.4i' + CRLF + ; - '.ll 7.5i' + CRLF + ; - '.ps 9' + CRLF + ; - '.vs 9' + CRLF + ; - '.in 0i' + CRLF + ; - '.ta 1.63265i' + CRLF + ; - '.sp 2' + CRLF + ; - '.ne 20' + CRLF + ; - '.ps +3' + CRLF + ; - '.vs +3' + CRLF + ; + LOCAL cWriteTitle := ".br" + CRLF + ; + ".ta" + CRLF + ; + ".in 0.08i" + CRLF + ; + ".ps -3" + CRLF + ; + ".vs -3" + CRLF + ; + ".sp 2" + CRLF + ; + "\fB" + cTitle + CRLF + LOCAL cWriteTopic := ".de }n" + CRLF + ; + ".bp" + CRLF + ; + ".sp .5i" + CRLF + ; + ".." + CRLF + ; + ".wh -.8i }n" + CRLF + ; + ".sp .5i" + CRLF + ; + ".po -.4i" + CRLF + ; + ".ll 7.5i" + CRLF + ; + ".ps 9" + CRLF + ; + ".vs 9" + CRLF + ; + ".in 0i" + CRLF + ; + ".ta 1.63265i" + CRLF + ; + ".sp 2" + CRLF + ; + ".ne 20" + CRLF + ; + ".ps +3" + CRLF + ; + ".vs +3" + CRLF + ; cTopic + CRLF LOCAL cTemp LOCAL Npos @@ -117,10 +117,10 @@ METHOD WriteTitle( cTopic, cTitle ) CLASS TTROFF cTemp := SUBSTR( cTopic, 21 ) ENDIF cWriteTemp := cTemp + CRLF + ; - '.in 0i' + CRLF + ; - '.br' + CRLF + ; + ".in 0i" + CRLF + ; + ".br" + CRLF + ; "\l'6.24i" + CRLF + ; - '.br' + CRLF + ".br" + CRLF FWRITE( Self:nHandle, cWriteTopic ) FWRITE( Self:nHandle, cWriteTitle ) FWRITE( Self:nHandle, cWriteTemp ) @@ -138,11 +138,11 @@ RETURN Self METHOD WriteParBold( cPar ) CLASS TTROFF - LOCAL cWriteBold := '.sp' + CRLF + ; - '.in 0.08i' + CRLF + ; - '\fB' + cPar + CRLF + ; - '.sp' + CRLF + ; - '.in 0.4i' + CRLF + LOCAL cWriteBold := ".sp" + CRLF + ; + ".in 0.08i" + CRLF + ; + "\fB" + cPar + CRLF + ; + ".sp" + CRLF + ; + ".in 0.4i" + CRLF FWRITE( Self:nHandle, cWriteBold ) RETURN Self diff --git a/harbour/utils/hbmake/fclass1.prg b/harbour/utils/hbmake/fclass1.prg index 047a4d3c34..3a01463a7e 100644 --- a/harbour/utils/hbmake/fclass1.prg +++ b/harbour/utils/hbmake/fclass1.prg @@ -51,8 +51,8 @@ */ #include "hbclass.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" *+-------------------------------------------------------------------- *+ diff --git a/harbour/utils/hbmake/ffile1.prg b/harbour/utils/hbmake/ffile1.prg index f8d3d79179..00a5e130e8 100644 --- a/harbour/utils/hbmake/ffile1.prg +++ b/harbour/utils/hbmake/ffile1.prg @@ -51,8 +51,8 @@ */ #include "hbclass.ch" -#include 'common.ch' -#include 'hbdocdef.ch' +#include "common.ch" +#include "hbdocdef.ch" *+-------------------------------------------------------------------- *+ @@ -365,7 +365,7 @@ METHOD goBottom() CLASS HBMake_FileBase lWithCRLF := pTRUE ENDIF cBuffer := SUBSTR( cBuffer, RAT( pCRLF, cBuffer ) + 2 ) - ::nSkipLength := LEN( cBuffer ) + IF( lWithCRLF, 2, 0 ) + ::nSkipLength := LEN( cBuffer ) + iif( lWithCRLF, 2, 0 ) ::nposition := FSEEK( Self:nDosHandle, - ( LEN( cBuffer ) ), 2 ) IF lWithCRLF ::nposition := FSEEK( Self:nDosHandle, - 2, 1 ) @@ -449,7 +449,7 @@ METHOD Buffget( lForward ) CLASS HBMake_FileBase IF !lForward nRead := FSEEK( Self:nDosHandle, ; - - ( IF( ::nposition < pBUFFER_LENGTH, ; + - ( iif( ::nposition < pBUFFER_LENGTH, ; ::nposition, ; pBUFFER_LENGTH ) ), ; 1 ) // rewind backwards @@ -466,7 +466,7 @@ METHOD Buffget( lForward ) CLASS HBMake_FileBase ELSE cBuffer := SPACE( pBUFFER_LENGTH ) nRead := FREAD( Self:nDosHandle, @cBuffer, pBUFFER_LENGTH ) - FSEEK( Self:nDosHandle, - ( IF( nRead < pBUFFER_LENGTH, nRead, ; + FSEEK( Self:nDosHandle, - ( iif( nRead < pBUFFER_LENGTH, nRead, ; pBUFFER_LENGTH ) ), 1 ) // Rewind // Now, parse the string. and file @@ -614,7 +614,7 @@ METHOD BufferGet( lForward ) CLASS HBMake_FileBase IF !lForward nRead := FSEEK( Self:nDosHandle, ; - - ( IF( ::nposition < pBUFFER_LENGTH, ; + - ( iif( ::nposition < pBUFFER_LENGTH, ; ::nposition, ; pBUFFER_LENGTH ) ), ; 1 ) // rewind backwards @@ -631,7 +631,7 @@ METHOD BufferGet( lForward ) CLASS HBMake_FileBase ELSE cBuffer := SPACE( pBUFFER_LENGTH ) nRead := FREAD( Self:nDosHandle, @cBuffer, pBUFFER_LENGTH ) - FSEEK( Self:nDosHandle, - ( IF( nRead < pBUFFER_LENGTH, nRead, ; + FSEEK( Self:nDosHandle, - ( iif( nRead < pBUFFER_LENGTH, nRead, ; pBUFFER_LENGTH ) ), 1 ) // Rewind // Now, parse the string. and file diff --git a/harbour/utils/hbmake/ft_funcs.prg b/harbour/utils/hbmake/ft_funcs.prg index 6c51a135ed..ba6445655d 100644 --- a/harbour/utils/hbmake/ft_funcs.prg +++ b/harbour/utils/hbmake/ft_funcs.prg @@ -52,8 +52,8 @@ #include "directry.ch" #include "fileio.ch" #include "inkey.ch" -#include 'hbdocdef.ch' -#include 'common.ch' +#include "hbdocdef.ch" +#include "common.ch" #define xReadBuffer 4096 DECLARE FT_FUSE(CFILE AS STRING,NMODE AS NUMERIC) AS NUMERIC @@ -151,11 +151,11 @@ RETURN cLine *+ FUNCTION FT_FReadLn() - LOCAL cBuffer AS STRING := '' + LOCAL cBuffer AS STRING := "" cBuffer := FReadLn( @cBuffer ) - cBuffer := STRTRAN( cBuffer, CHR( 13 ), '' ) + cBuffer := STRTRAN( cBuffer, CHR( 13 ), "" ) RETURN cBuffer @@ -221,14 +221,14 @@ FUNCTION StrPos( cBuffer AS STRING) IF cChar >= CHR( 64 ) .AND. cChar <= CHR( 90 ) .OR. cChar >= CHR( 97 ) ; .AND. cChar <= CHR( 122 ) .OR. cChar >= CHR( 48 ) .AND. cChar <= CHR( 57 ) ; .OR. cChar == CHR( 60 ) .OR. cchar == CHR( ASC( "-" ) ) ; - .OR. cchar == CHR( ASC( "(" ) ) .OR. cchar = CHR( ASC( "|" ) ) .OR. ; - cchar == CHR( ASC( '.' ) ) .OR. cchar == CHR( ASC( '*' ) ) .OR. ; - cchar == CHR( ASC( '#' ) ) .OR. cchar == CHR( ASC( '"' ) ) .OR. ; - cchar == CHR( ASC( '/' ) ) .OR. cchar == CHR( ASC( "@" ) ) ; - .OR. cchar == CHR( ASC( "=" ) ) .OR. cchar == CHR( ASC( 'Ä' ) ) ; - .OR. cchar == CHR( ASC( '?' ) ) .OR. cchar == CHR( ASC( '!' ) ) ; - .OR. cchar == CHR( ASC( "<" ) ) .OR. cchar == CHR( ASC( '>' ) ) ; - .OR. cchar == CHR( ASC( '!' ) ) .OR. cchar == CHR( ASC( '+' ) ) + .OR. cchar == CHR( ASC( "(" ) ) .OR. cchar == CHR( ASC( "|" ) ) .OR. ; + cchar == CHR( ASC( "." ) ) .OR. cchar == CHR( ASC( "*" ) ) .OR. ; + cchar == CHR( ASC( "#" ) ) .OR. cchar == CHR( ASC( '"' ) ) .OR. ; + cchar == CHR( ASC( "/" ) ) .OR. cchar == CHR( ASC( "@" ) ) ; + .OR. cchar == CHR( ASC( "=" ) ) .OR. cchar == CHR( ASC( "Ä" ) ) ; + .OR. cchar == CHR( ASC( "?" ) ) .OR. cchar == CHR( ASC( "!" ) ) ; + .OR. cchar == CHR( ASC( "<" ) ) .OR. cchar == CHR( ASC( ">" ) ) ; + .OR. cchar == CHR( ASC( "!" ) ) .OR. cchar == CHR( ASC( "+" ) ) nPos := x @@ -260,7 +260,7 @@ FUNCTION GetNumberofTableItems( cBuffer ) IF AT( SPACE( 3 ), cBuffer ) == 0 nItem ++ ELSE - cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, '' ) ) + cBuffer := ALLTRIM( STRTRAN( cBuffer, cItem, "" ) ) nItem ++ ENDIF ENDDO @@ -286,7 +286,7 @@ FUNCTION FREADline( nH as Numeric, cB AS STRING, nMaxLine as Numeric) LOCAL nNumRead AS NUMERIC LOCAL lReturn as Logical cLine := SPACE( nMaxLine ) - cB := '' + cB := "" nSavePos := FSEEK( nH, 0, FS_RELATIVE ) nNumRead := FREAD( nH, @cLine, nMaxLine ) IF ( nEol := AT( EOL, SUBSTR( cLine, 1, nNumRead ) ) ) == 0 diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index fedc875dd4..efc833bc01 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -204,7 +204,7 @@ FUNCTION MAIN( cFile, p1, p2, p3, p4, p5, p6 ) s_lOS2 := ( "OS/2" $ OS() ) s_lLinux := ( "LINUX" $ Upper( OS() ) ) s_lWin32 := ( "WINDOWS" $ Upper( OS() ) ) - s_lUnix := IF( ( "UNIX" $ Upper( OS() ) ) .OR. ( "HP-UX" $ Upper( OS() ) ) , .T., .F. ) + s_lUnix := iif( ( "UNIX" $ Upper( OS() ) ) .OR. ( "HP-UX" $ Upper( OS() ) ) , .T., .F. ) s_lLinux := ( "LINUX" $ Upper( OS() ) ) IF PCount() == 0 .or.; @@ -392,9 +392,9 @@ FUNCTION MAIN( cFile, p1, p2, p3, p4, p5, p6 ) IF ! ParseMakeFile( cFile ) - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile+ "> nÆo pode ser aberto. FERROR("+Ltrim(Str(FError()))+"). O HbMake ser  fechado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser abierto. FERROR("+Ltrim(Str(FError()))+"). Lo HbMake ser  cerrado." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be openned. FERROR("+Ltrim(Str(FError()))+"). The HbMake will be closed." @@ -442,7 +442,7 @@ FUNCTION MAIN( cFile, p1, p2, p3, p4, p5, p6 ) ENDIF - IF s_lasdll .or. lower(right(s_cAppName,3)) == 'dll' + IF s_lasdll .or. lower(right(s_cAppName,3)) == "dll" __Run( ReplaceMacros("implib $(HB_DIR)\lib\" + left(s_cAppName,at(".",s_cAppName)-1)+".lib " +s_cAppName )) ENDIF @@ -581,7 +581,7 @@ FUNCTION ParseMakeFile( cFile ) IF lmacrosec - IF Alltrim( Left( cTemp, 7 ) ) <> '!ifndef' .AND. Alltrim( Left( cTemp, 6 ) ) <> "!endif" .AND. Alltrim( Left( cTemp, 7 ) ) <> '!IFfile' .AND. Alltrim( Left( cTemp, 7 ) ) <> '!stdout' .AND. Alltrim( Left( cTemp, 6 ) ) <> '!ifdef' + IF Alltrim( Left( cTemp, 7 ) ) <> "!ifndef" .AND. Alltrim( Left( cTemp, 6 ) ) <> "!endif" .AND. Alltrim( Left( cTemp, 7 ) ) <> "!IFfile" .AND. Alltrim( Left( cTemp, 7 ) ) <> "!stdout" .AND. Alltrim( Left( cTemp, 6 ) ) <> "!ifdef" IF Len( aTemp ) > 1 @@ -599,11 +599,11 @@ FUNCTION ParseMakeFile( cFile ) IF aTemp[ 1 ] == "LIBFILES" .AND. ! s_lMt - aLib := ListAsArray2( aTemp[ 2 ], ' ' ) + aLib := ListAsArray2( aTemp[ 2 ], " " ) FOR each aLibx in aLib - IF At( 'mt.lib', Lower( aLibx ) ) > 0 + IF At( "mt.lib", Lower( aLibx ) ) > 0 s_lMt := .T. ENDIF @@ -639,11 +639,11 @@ FUNCTION ParseMakeFile( cFile ) ELSE IF aTemp[ 1 ] == "LIBFILES" .AND. ! s_lMt - aLib := ListAsArray2( aTemp[ 2 ], ' ' ) + aLib := ListAsArray2( aTemp[ 2 ], " " ) FOR each aLibx in aLib - IF At( 'mt.lib', Lower( aLibx ) ) > 0 + IF At( "mt.lib", Lower( aLibx ) ) > 0 s_lMt := .T. ENDIF @@ -693,11 +693,11 @@ FUNCTION ParseMakeFile( cFile ) IF aTemp[ 1 ] == "PROJECT" - IF At( '.lib', aTemp[ 2 ] ) > 0 .OR. At( '.a', aTemp[ 2 ] ) > 0 + IF At( ".lib", aTemp[ 2 ] ) > 0 .OR. At( ".a", aTemp[ 2 ] ) > 0 s_lLibrary := .T. ENDIF - s_cAppName := SubStr( aTemp[ 2 ], 1, AT( ' ', aTemp[ 2 ] ) -1 ) + s_cAppName := SubStr( aTemp[ 2 ], 1, AT( " ", aTemp[ 2 ] ) -1 ) ENDIF @@ -767,13 +767,13 @@ FUNCTION ParseMakeFile( cFile ) ELSE - IF '!ifndef' $ cTemp + IF "!ifndef" $ cTemp CheckDefine( cTemp ) - ELSEIF '!ifdef' $ cTemp + ELSEIF "!ifdef" $ cTemp CheckIFdef( cTemp ) - ELSEIF '!iffile' $ cTemp + ELSEIF "!iffile" $ cTemp CheckIFFile( cTemp ) - ELSEIF '!stdout' $ cTemp + ELSEIF "!stdout" $ cTemp CheckStdOut( cTemp ) ENDIF @@ -879,7 +879,7 @@ FUNCTION Checkdefine( cTemp ) aSet := ListAsArray2( cTemp, "=" ) nPos := AScan( s_aDefines, { | x | x[ 1 ] == aSet[ 1 ] } ) - IF nPos = 0 + IF nPos == 0 cRead := Alltrim( Strtran( aSet[ 2 ], "$(", "" ) ) cRead := Strtran( cRead, ")", "" ) nMakePos := AScan( s_aDefines, { | x | x[ 1 ] == cRead } ) @@ -958,7 +958,7 @@ FUNCTION Findmacro( cMacro, cRead ) nPos := AScan( s_aMacros, { | x | "$(" + Alltrim( x[ 1 ] ) + ")" == cMacro } ) - IF nPos = 0 + IF nPos == 0 cTemp := Strtran( cMacro, "$(", "" ) cTemp := Strtran( cTemp, ")", "" ) @@ -1028,7 +1028,7 @@ FUNCTION SetBuild() LOCAL nPos LOCAL aMacro LOCAL aTemp - LOCAL cCurrentRead := '' + LOCAL cCurrentRead := "" LOCAL cMacro LOCAL xInfo LOCAL xItem @@ -1044,7 +1044,7 @@ FUNCTION SetBuild() AAdd( s_aBuildOrder, aMacro[ 1 ] ) cRead := Strtran( cRead, "@&&!", "" ) - aMacro := ListAsArray2( cRead, '\' ) + aMacro := ListAsArray2( cRead, "\" ) AEval( aMacro, { | xMacro | IIF( "$" $ xMacro , FindMacro( xMacro, @cRead ), ) } ) @@ -1053,10 +1053,10 @@ FUNCTION SetBuild() s_cLinkCommands := cRead + " @" + s_cMakeFileName s_nMakeFileHandle := FCreate( s_cMakeFileName ) - IF s_nMakeFileHandle = F_ERROR - IF s_nLang = 1 // brazilian portuguese + IF s_nMakeFileHandle == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+s_cMakeFileName + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+s_cMakeFileName + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+s_cMakeFileName + "> cannot be created." @@ -1081,7 +1081,7 @@ FUNCTION SetBuild() FindMacro( cMacro , @cRead ) - IF At( '$(PROJECT)', cCurrentRead ) > 0 + IF At( "$(PROJECT)", cCurrentRead ) > 0 IF ! s_lGcc @@ -1099,7 +1099,7 @@ FUNCTION SetBuild() ELSEIF s_lGcc .AND. s_lLinux .OR. ( s_lGcc .AND. s_lMinGW) s_cLinkCommands += "-o " + cRead + " " - ELSEIF s_lGcc .AND. ! s_lLinux .AND. At( '.exe', cRead ) > 0 + ELSEIF s_lGcc .AND. ! s_lLinux .AND. At( ".exe", cRead ) > 0 FWrite( s_nMakeFileHandle, "-o " + cRead + CRLF ) ENDIF @@ -1153,7 +1153,7 @@ FUNCTION SetBuild() qout( HbMake_Copyright() ) IF s_lBcc .OR. s_lPocc .OR. s_lMSVcc - qout( version() + ' / '+HB_Compiler() ) + qout( version() + " / "+HB_Compiler() ) ELSE qout(s_cLinkCommands) ENDIF @@ -1175,10 +1175,10 @@ FUNCTION CompileFiles() LOCAL lEnd := .F. LOCAL xItem LOCAL lLinux := s_lLinux - LOCAL cPrg := '' + LOCAL cPrg := "" LOCAL cOrder := "" LOCAL nFile := 1 - LOCAL aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", '²' ) + LOCAL aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", "²" ) @ 4, 5 SAY "Compiling :" @@ -1205,9 +1205,9 @@ FUNCTION CompileFiles() FOR EACH cPrg IN s_aPrgs - xItem := Substr( cPrg, Rat( IIF( s_lGcc, '/', '\' ), ; + xItem := Substr( cPrg, Rat( IIF( s_lGcc, "/", "\" ), ; cPrg ) + 1 ) - nPos := AScan( s_aCFiles, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), ; + nPos := AScan( s_aCFiles, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), ; Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) IF nPos > 0 @@ -1223,7 +1223,7 @@ FUNCTION CompileFiles() setpos(9,0) __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'C2006' $ cErrText .OR. 'No code generated' $ cErrText + lEnd := "C2006" $ cErrText .OR. "No code generated" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor +" "+(s_cLog) ) @@ -1276,9 +1276,9 @@ FUNCTION CompileFiles() FOR nFiles := 1 TO Len( s_aCFiles ) - xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, '/', '\' ), ; + xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, "/", "\" ), ; s_aCFiles[ nFiles ] ) + 1 ) - nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), ; + nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), ; Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) IF nPos > 0 @@ -1287,9 +1287,9 @@ FUNCTION CompileFiles() cComm := Strtran( cComm, "o$*", "o" + s_aObjs[ nPos ] ) ELSE IF s_lMSVcc //.OR. s_lPocc - cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjs[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjs[ nPos ], "/", "\" ) ) ELSE - cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjs[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjs[ nPos ], "/", "\" ) ) ENDIF ENDIF @@ -1337,9 +1337,9 @@ FUNCTION CompileFiles() FOR nFiles := 1 TO Len( s_aCFiles ) @ 4, 16 SAY Space( 50 ) - xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, '/', '\' ), ; + xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, "/", "\" ), ; s_aCFiles[ nFiles ] ) + 1 ) - nPos := AScan( s_aObjsC, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), ; + nPos := AScan( s_aObjsC, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), ; Left( x, At( ".", x ) ) == Left( xitem, At( ".", xitem ) ) } ) IF nPos > 0 @@ -1348,9 +1348,9 @@ FUNCTION CompileFiles() cComm := Strtran( cComm, "o$*", "o" + s_aObjsC[ nPos ] ) ELSE IF s_lMSVcc //.OR. s_lPocc - cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjsC[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjsC[ nPos ], "/", "\" ) ) ELSE - cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjsC[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjsC[ nPos ], "/", "\" ) ) ENDIF ENDIF @@ -1368,7 +1368,7 @@ FUNCTION CompileFiles() endif __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'Error E' $ cErrText + lEnd := "Error E" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor + " "+(s_cLog) ) SET CURSOR ON @@ -1376,7 +1376,7 @@ FUNCTION CompileFiles() ELSE // FErase( s_cLog ) ENDIF - lEnd := 'Error F' $ cErrText + lEnd := "Error F" $ cErrText cComm := cOld @@ -1415,9 +1415,9 @@ FUNCTION CompileFiles() FOR EACH cPrg IN s_aPrgs @ 4, 16 SAY Space( 50 ) - xItem := Substr( cPrg, Rat( IIF( s_lGcc, '/', '\' ), ; + xItem := Substr( cPrg, Rat( IIF( s_lGcc, "/", "\" ), ; cPrg ) + 1 ) - nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), ; + nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), ; Left( x, At( ".", x ) ) == Left( xItem, At( ".", xitem ) ) } ) IF nPos > 0 @@ -1426,9 +1426,9 @@ FUNCTION CompileFiles() cComm := Strtran( cComm, "o$*", "o" + s_aObjs[ nPos ] ) ELSE IF s_lMSVcc //.OR. s_lPocc - cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjs[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "-Fo$*", "-Fo" + Strtran( s_aObjs[ nPos ], "/", "\" ) ) ELSE - cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjs[ nPos ], '/', '\' ) ) + cComm := Strtran( cComm, "o$*", "o" + Strtran( s_aObjs[ nPos ], "/", "\" ) ) ENDIF ENDIF @@ -1442,7 +1442,7 @@ FUNCTION CompileFiles() setpos(9,0) __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'C2006' $ cErrText .OR. 'No code generated' $ cErrText .or. "Error E" $ cErrText .or. "Error F" $ cErrText + lEnd := "C2006" $ cErrText .OR. "No code generated" $ cErrText .or. "Error E" $ cErrText .or. "Error F" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor + " "+(s_cLog) ) @@ -1515,11 +1515,11 @@ FUNCTION GetParaDefines( cTemp ) cRead := Strtran( cRead, ")", "" ) nMakePos := AScan( s_aDefines, { | x | x[ 1 ] == cRead } ) - IF nMakePos = 0 - if(aSet[1] == "MYDEFINES") - ASet[ 2 ] := Strtran( aSet[ 2 ], ",", ";" ) + IF nMakePos == 0 + if aSet[1] == "MYDEFINES" + ASet[ 2 ] := Strtran( aSet[ 2 ], ",", ";" ) else - ASet[ 2 ] := Strtran( aSet[ 2 ], ",", " " ) + ASet[ 2 ] := Strtran( aSet[ 2 ], ",", " " ) endif AAdd( s_aDefines, { aSet[ 1 ], aSet[ 2 ] } ) AAdd( s_aMacros, { aSet[ 1 ], aSet[ 2 ] } ) @@ -1633,7 +1633,7 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) LOCAL cDefLibGccLibsMt := "-lvmmt -lrtlmt -lhbpcre -lgtsln -llang -lrddmt -lrtlmt -lvmmt -lmacromt -lppmt -ldbfntxmt -ldbfcdxmt -ldbffptmt -lhsxmt -lhbsixmt -lcommon -lcodepage" LOCAL cHarbDll := "harbour.lib" LOCAL cHARso := "-lharbour -lncurses -lgpm -lslang -lpthread -lm" - LOCAL cSystemLibs := If( s_lUnix, "", "-lncurses " ) + "-lslang " + If( s_lUnix, "", "-lgpm " ) + " -lpthread -lm" + LOCAL cSystemLibs := iif( s_lUnix, "", "-lncurses " ) + "-lslang " + iif( s_lUnix, "", "-lgpm " ) + " -lpthread -lm" LOCAL cLibs := "" LOCAL citem := "" @@ -1712,19 +1712,19 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) ENDIF - IF nOption = 1 // edit makefile + IF nOption == 1 // edit makefile // Verify if "cFile" can be openned to write mode. s_nMakeFileHandle := FOpen( cFile, FO_WRITE ) - IF s_nMakeFileHandle = F_ERROR + IF s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser aberto para edi‡Æo." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser abierto para edici¢n." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be openned for edition." @@ -1835,13 +1835,13 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) // after oMake read, recreate other clean makefile to edit. s_nMakeFileHandle := FCreate(cFile) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser aberto para edi‡Æo." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser abierto para edici¢n." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be openned for edition." @@ -1858,7 +1858,7 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) s_lEditMake := .T. - ELSEIF nOption = 2 // create a new makefile + ELSEIF nOption == 2 // create a new makefile IF nLenaSrc == 0 .and. !s_lRecursive @@ -1885,13 +1885,13 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) s_nMakeFileHandle := FCreate( cFile ) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be created." @@ -1918,13 +1918,13 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) s_nMakeFileHandle := FCreate( cFile ) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be created." @@ -1947,7 +1947,7 @@ IF ! lCreateAndCompile While .t. CLS - Setcolor( 'w/b+,b+/w,w+/b,w/b+,w/b,w+/b' ) + Setcolor( "w/b+,b+/w,w+/b,w/b+,w/b,w+/b" ) @ 0, 0, Maxrow(), Maxcol() BOX( Chr( 201 ) + Chr( 205 ) + Chr( 187 ) + Chr( 186 ) + Chr( 188 ) + Chr( 205 ) + Chr( 200 ) + Chr( 186 ) + Space( 1 ) ) Attention( HbMake_Id() + space(10)+s_aLangMessages[ 27 ], 0 ) @@ -2096,7 +2096,7 @@ While .t. PICT "@S25" ENDIF - IF nOption = 2 // create a new makefile + IF nOption == 2 // create a new makefile cResName := PadR(alltrim(cResName)+iIF(!empty(cResName)," ","")+alltrim(cAllRes),200 ) ENDIF @@ -2260,7 +2260,7 @@ Endif // Create and compile cObjDir := Alltrim( cObjDir ) IF ! Empty( cObjDir ) - cObjDir += '/' + cObjDir += "/" ENDIF cTest := cObjDir @@ -2268,13 +2268,13 @@ Endif // Create and compile cObjDir := Alltrim( cObjDir ) IF ! Empty( cObjDir ) - cObjDir += '\' + cObjDir += "\" ENDIF - cTest := Upper( cObjDir ) + '\' + cTest := Upper( cObjDir ) + "\" ENDIF - AEval( s_aMacros, { | x, y | cItem := Substr( x[ 2 ], 1, Len( x[ 2 ] ) ), IIF( At( citem, cTest ) > 0, ( s_aMacros[ y, 1 ] := 'OBJ', s_aMacros[ y, 2 ] := cObjDir ), ) } ) + AEval( s_aMacros, { | x, y | cItem := Substr( x[ 2 ], 1, Len( x[ 2 ] ) ), IIF( At( citem, cTest ) > 0, ( s_aMacros[ y, 1 ] := "OBJ", s_aMacros[ y, 2 ] := cObjDir ), ) } ) IF lAutomemvar cHarbourFlags += " -a " @@ -2287,18 +2287,18 @@ Endif // Create and compile IF lDebug cHarbourFlags += " -b " - cDefaultLibs += " debug.lib " - cDefGccLibs += " -ldebug " - cDefGccLibsw += " -ldebug " - cGccLibsOs2 += " -ldebug " - cDefLibGccLibs += " -ldebug " - cDefGccLibsUnix += " -ldebug " - cDefGccLibsUnixMt+= " -ldebug " - cDefaultLibsMt += " debug.lib " - cDefGccLibsMt += " -ldebug " - cDefGccLibsMtw += " -ldebug " - cGccLibsOs2Mt += " -ldebug " - cDefLibGccLibsMt += " -ldebug " + cDefaultLibs += " hbdebug.lib " + cDefGccLibs += " -lhbdebug " + cDefGccLibsw += " -lhbdebug " + cGccLibsOs2 += " -lhbdebug " + cDefLibGccLibs += " -lhbdebug " + cDefGccLibsUnix += " -lhbdebug " + cDefGccLibsUnixMt+= " -lhbdebug " + cDefaultLibsMt += " hbdebug.lib " + cDefGccLibsMt += " -lhbdebug " + cDefGccLibsMtw += " -lhbdebug " + cGccLibsOs2Mt += " -lhbdebug " + cDefLibGccLibsMt += " -lhbdebug " ENDIF IF lSupressline @@ -2314,7 +2314,7 @@ Endif // Create and compile ENDIF if lMWvw - cHarbourFlags += ' -u+mwvw.ch ' + cHarbourFlags += " -u+mwvw.ch " endif @@ -2329,7 +2329,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$* $**" } ) ENDIF @@ -2344,7 +2344,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.o:", "gcc -I/usr/include/harbour $(CFLAG1) $(CFLAG2) -I. -g -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "harbour -n -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) ENDIF @@ -2354,7 +2354,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.o:", "$(CC_DIR)\bin\gcc -I$(HB_DIR)/include $(CFLAG1) $(CFLAG2) -I. -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) ENDIF @@ -2367,7 +2367,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\cl -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -go" + if(s_lGenCsource,"3","") + " -I$(C4W)\include" + IIF( lMediator," -I$(MEDIATOR)\include ","")+ "-o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -go" + iif(s_lGenCsource,"3","") + " -I$(C4W)\include" + IIF( lMediator," -I$(MEDIATOR)\include ","")+ "-o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) ENDIF @@ -2380,7 +2380,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$** $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+iif(s_lasdll,"1","")+" -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$** $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$** $**" } ) ENDIF @@ -2439,7 +2439,7 @@ Endif // Create and compile ENDIF - AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( ' ', aOutFiles[ y ] ) ) ) } ) + AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( " ", aOutFiles[ y ] ) ) ) } ) aOutFiles := ASort( aOutFiles ) @@ -2450,17 +2450,17 @@ Endif // Create and compile ASort( aSelFiles ) else - AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( ' ', aOutFiles[ y ] ) ) ) } ) + AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( " ", aOutFiles[ y ] ) ) ) } ) aSelFiles := aOutFiles endif - if Len( aSelFiles ) = 1 + if Len( aSelFiles ) == 1 cTopFile := aSelFiles[1] cTopFile := PadR( Left(cTopfile,At(Upper(".prg"),Upper(cTopFile))+4 ), 50) - elseif Len( aSelFiles ) = 0 + elseif Len( aSelFiles ) == 0 cTopFile := "" @@ -2492,7 +2492,7 @@ Endif // Create and compile @ 15,01 say s_cAlertMsg Get cTopFile pict "@S35" valid !empty(cTopFile) READ - if LastKey() = K_ESC + if LastKey() == K_ESC Exit endif @@ -2540,11 +2540,11 @@ Endif // Create and compile endif IF s_nLang == 1 // PT - s_cAlertMsg := ' para selecionar. para continuar o processo.' + s_cAlertMsg := " para selecionar. para continuar o processo." ELSEIF s_nLang == 2 - s_cAlertMsg := ' to select. to continue process' + s_cAlertMsg := " to select. to continue process" ELSEIF s_nLang == 3 - s_cAlertMsg := ' para seleccionar. para continuar o proceso.' + s_cAlertMsg := " para seleccionar. para continuar o proceso." ENDIF Attention( s_cAlertMsg, 22 ) @@ -2596,7 +2596,7 @@ Endif // Create and compile if ! lCreateAndCompile - AEval( aOutFiles, { | xItem | IIF( '.c' $ xItem .OR. '.C' $ xItem , AAdd( aOutc, xItem ), ) } ) + AEval( aOutFiles, { | xItem | IIF( ".c" $ xItem .OR. ".C" $ xItem , AAdd( aOutc, xItem ), ) } ) AEval( aOutc, { | x, z | cItem := x, z := AScan( aOutFiles, { | t | t = cItem } ), IIF( z > 0, aSize( aDel( aOutFiles, z ), Len( aOutFiles ) - 1 ), ) } ) @ 22,01 say space(78) @@ -2644,7 +2644,7 @@ Endif // Create and compile AEval( aOutFiles, { | xItem | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cExt := Substr( cExt, 2 ), AAdd( s_aCFiles, cObjDir + cTest + "." + Exte( cExt, 1 ) ) } ) ELSE s_aObjsC := aClone( aOutc ) - AEval( aOutc, { | xItem, x | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), IIF( ! s_lGcc, s_aObjsC[ x ] := IIF( ! Empty( cObjDir ), cObjDir, '' ) + cTest + "." + Exten( cExt, 2 ), s_aObjsC[ x ] := IIF( ! Empty( cObjDir ), cObjDir, '' ) + cTest + "." + Exten( cExt, 1 ) ) } ) + AEval( aOutc, { | xItem, x | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), IIF( ! s_lGcc, s_aObjsC[ x ] := IIF( ! Empty( cObjDir ), cObjDir, "" ) + cTest + "." + Exten( cExt, 2 ), s_aObjsC[ x ] := IIF( ! Empty( cObjDir ), cObjDir, "" ) + cTest + "." + Exten( cExt, 1 ) ) } ) ENDIF FWrite( s_nMakeFileHandle, "RECURSE=" + IIF( s_lRecursive, " YES ", " NO " ) + CRLF ) @@ -2667,7 +2667,7 @@ Endif // Create and compile ELSEIF lMiniGui FWrite( s_nMakeFileHandle, "MINIGUI = " + alltrim(cMiniPath) + CRLF ) ELSEIF lHwGui - FWrite( s_nMakeFileHandle, "HWGUI = " + if(!s_lMinGW,alltrim(cHwPath),strtran(alltrim(cHwPath),"\","/")) + CRLF ) + FWrite( s_nMakeFileHandle, "HWGUI = " + iif(!s_lMinGW,alltrim(cHwPath),strtran(alltrim(cHwPath),"\","/")) + CRLF ) ELSEIF lGtwvt FWrite( s_nMakeFileHandle, "GTWVT = " + CRLF ) ELSEIF lGtwvw @@ -2706,10 +2706,10 @@ Endif // Create and compile nPos := AScan( s_aPrgs, { | z | hb_FNAMESPLIT( z, @cPath, @cTest, @cExt, @cDrive ), cPath == citem } ) IF nPos > 0 - AEval( s_aPrgs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aPrgs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ')/', ')\' ) ), ) } ) + AEval( s_aPrgs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aPrgs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) IF ! s_aMacros[ x, 3 ] - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) s_aMacros[ x, 3 ] := .T. ENDIF @@ -2720,8 +2720,8 @@ Endif // Create and compile IF nPos > 0 IF ! s_aMacros[ x, 3 ] - AEval( s_aCFiles, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aCFiles[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + AEval( s_aCFiles, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aCFiles[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) s_aMacros[ x, 3 ] := .T. ENDIF @@ -2732,8 +2732,8 @@ Endif // Create and compile IF nPos > 0 IF ! Empty( cObjDir ) - AEval( s_aObjs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + AEval( s_aObjs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) ENDIF ENDIF @@ -2744,7 +2744,7 @@ Endif // Create and compile IF nPos > 0 IF ! Empty( cObjDir ) - AEval( s_aObjsC, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjsC[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) + AEval( s_aObjsC, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjsC[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) ENDIF ENDIF @@ -2763,7 +2763,7 @@ Endif // Create and compile FWrite( s_nMakeFileHandle, "PROJECT = " + Alltrim( Lower( cAppName ) ) + ".exe" + " $(PR) " + CRLF ) ENDIF ELSE - FWrite( s_nMakeFileHandle, "PROJECT = " + Alltrim( Lower( cAppName ) ) + if(s_lasdll,".dll",".exe" ) + " $(PR) " + CRLF ) + FWrite( s_nMakeFileHandle, "PROJECT = " + Alltrim( Lower( cAppName ) ) + iif(s_lasdll,".dll",".exe" ) + " $(PR) " + CRLF ) ENDIF @@ -2774,7 +2774,7 @@ Endif // Create and compile IF Len( s_aObjs ) < 1 FWrite( s_nMakeFileHandle, + " $(OB) " + CRLF ) ELSE - AEval( s_aObjs, { | x, i | IIF( ( i <> Len( s_aObjs ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) + AEval( s_aObjs, { | x, i | IIF( ( i <> Len( s_aObjs ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) ENDIF FWrite( s_nMakeFileHandle, "CFILES =" ) @@ -2782,7 +2782,7 @@ Endif // Create and compile IF Len( s_aCFiles ) < 1 FWrite( s_nMakeFileHandle, + " $(CF)" + CRLF ) ELSE - AEval( s_aCFiles, { | x, i | IIF( ( i <> Len( s_aCFiles ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) + AEval( s_aCFiles, { | x, i | IIF( ( i <> Len( s_aCFiles ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) ENDIF FWrite( s_nMakeFileHandle, "PRGFILE =" ) @@ -2790,7 +2790,7 @@ Endif // Create and compile IF Len( s_aPrgs ) < 1 FWrite( s_nMakeFileHandle, + " $(PS)" + CRLF ) ELSE - AEval( s_aPrgs, { | x, i | IIF( i <> Len( s_aPrgs) .AND. x <> alltrim(cTopfile) , FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) + AEval( s_aPrgs, { | x, i | IIF( i <> Len( s_aPrgs) .AND. x <> alltrim(cTopfile) , FWrite( s_nMakeFileHandle, " " + Alltrim( x ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) ENDIF ELSE @@ -2800,7 +2800,7 @@ Endif // Create and compile IF Len( s_aObjs ) < 1 FWrite( s_nMakeFileHandle, + " $(OB) " + CRLF ) ELSE - AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( ( i <> Len( s_aObjs ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) + AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( ( i <> Len( s_aObjs ) .AND. x <> alltrim(cTopfile) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) ENDIF nWriteFiles := 0 @@ -2809,7 +2809,7 @@ Endif // Create and compile IF Len( s_aPrgs ) < 1 FWrite( s_nMakeFileHandle, + " $(PS)" + CRLF ) ELSE - AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) + AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) ENDIF nWriteFiles := 0 @@ -2818,7 +2818,7 @@ Endif // Create and compile IF Len( s_aObjsC ) < 1 FWrite( s_nMakeFileHandle, + " $(OBC) " + CRLF ) ELSE - AEval( s_aObjsC, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjsC ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OBC) " + CRLF ) ) } ) + AEval( s_aObjsC, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjsC ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OBC) " + CRLF ) ) } ) ENDIF nWriteFiles := 0 @@ -2827,7 +2827,7 @@ Endif // Create and compile IF Len( s_aCFiles ) < 1 FWrite( s_nMakeFileHandle, + " $(CF)" + CRLF ) ELSE - AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) + AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % s_nFilestoAdd == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) ENDIF @@ -2906,12 +2906,12 @@ Endif // Create and compile nPos := AScan( aLibsOut, { | z | At( "html", Lower( z ) ) > 0 } ) IF nPos > 0 - cHtmlLib += "-l" + Strtran( aLibsOut[ nPos ], '.a', "" ) + cHtmlLib += "-l" + Strtran( aLibsOut[ nPos ], ".a", "" ) aDel( aLibsOut, nPos ) aSize( aLibsOut, Len( aLibsOut ) - 1 ) ENDIF - AEval( aLibsOut, { | cLib | iif( Len(aTempLibs :=ListAsArray2( cLib, " ") )> 0 ,cLibs += SetthisLibs(AtempLibs) ,cLibs += " -l" + Strtran( cLib, '.a', "" ))} ) + AEval( aLibsOut, { | cLib | iif( Len(aTempLibs :=ListAsArray2( cLib, " ") )> 0 ,cLibs += SetthisLibs(AtempLibs) ,cLibs += " -l" + Strtran( cLib, ".a", "" ))} ) nPos := AScan( aLibsOut, { | z | At( "mysql", Lower( z ) ) > 0 } ) @@ -3013,8 +3013,8 @@ Endif // Create and compile cDefaultLibs := strtran(cDefaultLibs,"gtwin.lib","gtwvt.lib") cDefaultLibsMt := strtran(cDefaultLibsMt,"gtwin.lib","gtwvt.lib") elseif lGtwvw - cDefaultLibs := if(lMWvW,'mwvw.lib ', '') + strtran(cDefaultLibs,"gtwin.lib","gtwvw.lib ") - cDefaultLibsMt := if(lMWvW,'mwvw.lib ', '') + strtran(cDefaultLibsMt,"gtwin.lib","gtwvw.lib ") + cDefaultLibs := iif(lMWvW,"mwvw.lib ", "") + strtran(cDefaultLibs,"gtwin.lib","gtwvw.lib ") + cDefaultLibsMt := iif(lMWvW,"mwvw.lib ", "") + strtran(cDefaultLibsMt,"gtwin.lib","gtwvw.lib ") endif @@ -3064,11 +3064,11 @@ Endif // Create and compile FWrite( s_nMakeFileHandle, "RFLAGS = " + CRLF ) /* added "-x" flag to LFLAGS statment to suppress creation of map file and speed up link. */ - FWrite( s_nMakeFileHandle, "LFLAGS = -L$(CC_DIR)\lib\obj;$(CC_DIR)\lib;$(HB_DIR)\lib -Gn -M -m -s -Tp"+ if(s_lasdll,"d","e") + " -x" + IIF( lFWH .or. lMiniGui .or. lWhoo .or. lHwgui .or. lGtWvt .or. lGtWvw ," -aa"," -ap") + IIF( lMinigui, " -L$(MINIGUI)\lib",IIF( lFwh, " -L$(FWH)\lib",IIF( lHwgui, " -L$(HWGUI)\lib","" ))) + CRLF ) + FWrite( s_nMakeFileHandle, "LFLAGS = -L$(CC_DIR)\lib\obj;$(CC_DIR)\lib;$(HB_DIR)\lib -Gn -M -m -s -Tp"+ iif(s_lasdll,"d","e") + " -x" + IIF( lFWH .or. lMiniGui .or. lWhoo .or. lHwgui .or. lGtWvt .or. lGtWvw ," -aa"," -ap") + IIF( lMinigui, " -L$(MINIGUI)\lib",IIF( lFwh, " -L$(FWH)\lib",IIF( lHwgui, " -L$(HWGUI)\lib","" ))) + CRLF ) FWrite( s_nMakeFileHandle, "IFLAGS = " + CRLF ) FWrite( s_nMakeFileHandle, "LINKER = ilink32" + CRLF ) FWrite( s_nMakeFileHandle, " " + CRLF ) - FWrite( s_nMakeFileHandle, "ALLOBJ = " + IIF( ( lWhoo .OR. lWhat32 .OR. lFwh .OR. lMinigui .OR. lHwgui .or. lGtWvt .or. lGtWvw .or. lXwt .or. lxHGtk ), "c0w32.obj", if(s_lAsDll,"c0d32.obj","c0x32.obj" )) + " $(OBJFILES)" + IIF( s_lExtended, " $(OBJCFILES)", " " ) + CRLF ) + FWrite( s_nMakeFileHandle, "ALLOBJ = " + IIF( ( lWhoo .OR. lWhat32 .OR. lFwh .OR. lMinigui .OR. lHwgui .or. lGtWvt .or. lGtWvw .or. lXwt .or. lxHGtk ), "c0w32.obj", iif(s_lAsDll,"c0d32.obj","c0x32.obj" )) + " $(OBJFILES)" + IIF( s_lExtended, " $(OBJCFILES)", " " ) + CRLF ) FWrite( s_nMakeFileHandle, "ALLRES = $(RESDEPEN)" + CRLF ) FWrite( s_nMakeFileHandle, "ALLLIB = $(USERLIBS) $(LIBFILES) import32.lib " + IIF( s_lMt,"cw32mt.lib", "cw32.lib" )+ CRLF ) FWrite( s_nMakeFileHandle, ".autodepend" + CRLF ) @@ -3101,16 +3101,16 @@ Endif // Create and compile ELSEIF s_lGcc - FWrite( s_nMakeFileHandle, "CFLAG1 = $(SHELL) " +IIF( !EMPTY(s_cUserInclude ) ," -I" + Alltrim( s_cUserInclude ) ,"") + IIF( "Unix" $ cOs , " -I/usr/include/harbour ", "" ) + IIF( "Linux" $ cOS, "-I/usr/include/harbour", " -I$(HB_DIR)/include" ) + " -c -Wall" + IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + if(s_lmingw, " -mno-cygwin "," " )+ CRLF ) + FWrite( s_nMakeFileHandle, "CFLAG1 = $(SHELL) " +IIF( !EMPTY(s_cUserInclude ) ," -I" + Alltrim( s_cUserInclude ) ,"") + IIF( "Unix" $ cOs , " -I/usr/include/harbour ", "" ) + IIF( "Linux" $ cOS, "-I/usr/include/harbour", " -I$(HB_DIR)/include" ) + " -c -Wall" + IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + iif(s_lmingw, " -mno-cygwin "," " )+ CRLF ) FWrite( s_nMakeFileHandle, "CFLAG2 = " + IIF( "Linux" $ cOS, "-L$(HB_LIB_INSTALL)", " -L$(HB_DIR)/lib -L$(CC_DIR)/lib" ) + IIF( "Unix" $ cOs , " -L/usr/lib/harbour ", "" ) + IIF( lHwgui, " -L$(HWGUI)\lib","" ) + CRLF ) FWrite( s_nMakeFileHandle, "RFLAGS = " + CRLF ) - FWrite( s_nMakeFileHandle, "LFLAGS = " + if(!s_lLinux," ","-Wl,--noinhibit-exec ") + IIF(lUseXhb ,IIF(lUseharbourDll,"","-static ") + if(lXwt .or. lhwgui ,"-gtcgi " , "-gtcrs "), "$(CFLAG2)") + iif(lXwt,"`pkg-config --libs gtk+-2.0` -lxwt -lxwt_gtk -lxwt","") + iif( lxHGtk, "`pkg-config --libs gtk+-2.0 libglade-2.0` -lxhgtk ","") + iif( lhwgui .and. !s_lMinGW, " `pkg-config --libs gtk+-2.0 libglade-2.0 libgnomeprint-2.2` -hwgui ","") + iif(lhwgui .and. s_lMinGW," -mwindows " ,"" )+ iif(s_lLinux .and. s_lmt ," -mt "," " ) +CRLF ) + FWrite( s_nMakeFileHandle, "LFLAGS = " + iif(!s_lLinux," ","-Wl,--noinhibit-exec ") + IIF(lUseXhb ,IIF(lUseharbourDll,"","-static ") + iif(lXwt .or. lhwgui ,"-gtcgi " , "-gtcrs "), "$(CFLAG2)") + iif(lXwt,"`pkg-config --libs gtk+-2.0` -lxwt -lxwt_gtk -lxwt","") + iif( lxHGtk, "`pkg-config --libs gtk+-2.0 libglade-2.0` -lxhgtk ","") + iif( lhwgui .and. !s_lMinGW, " `pkg-config --libs gtk+-2.0 libglade-2.0 libgnomeprint-2.2` -hwgui ","") + iif(lhwgui .and. s_lMinGW," -mwindows " ,"" )+ iif(s_lLinux .and. s_lmt ," -mt "," " ) +CRLF ) FWrite( s_nMakeFileHandle, "IFLAGS = " + CRLF ) FWrite( s_nMakeFileHandle, "LINKER = "+ IIF(lusexhb,"hblnk","gcc") + CRLF ) FWrite( s_nMakeFileHandle, " " + CRLF ) FWrite( s_nMakeFileHandle, "ALLOBJ = $(OBJFILES) " + IIF( s_lExtended, " $(OBJCFILES)", " " ) + CRLF ) FWrite( s_nMakeFileHandle, "ALLRES = $(RESDEPEN) " + CRLF ) - FWrite( s_nMakeFileHandle, "ALLLIB = $(USERLIBS) $(LIBFILES) " +if(s_lMinGW," -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32","") + CRLF ) + FWrite( s_nMakeFileHandle, "ALLLIB = $(USERLIBS) $(LIBFILES) " +iif(s_lMinGW," -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32","") + CRLF ) FWrite( s_nMakeFileHandle, ".autodepend" + CRLF ) ENDIF @@ -3122,25 +3122,25 @@ Endif // Create and compile IF lScanIncludes // Clipper/(x)Harbour sources: .prg - IF Len( s_aPrgs ) = Len( s_aObjs ) - Attention("Scanning .PRG sources...",19) + IF Len( s_aPrgs ) == Len( s_aObjs ) + Attention("Scanning .prg sources...",19) FOR nPos := 1 to Len(s_aPrgs) cIncl := ScanInclude( ReplaceMacros( s_aPrgs[ nPos ] ), lScanIncRecursive, cExcludeExts ) // Only add in list if dependencies exist IF ! Empty(cIncl) - FWrite( s_nMakeFileHandle, s_aObjs[ nPos ] + ': ' + Alltrim( cIncl ) + CRLF, "" ) + FWrite( s_nMakeFileHandle, s_aObjs[ nPos ] + ": " + Alltrim( cIncl ) + CRLF, "" ) ENDIF NEXT ENDIF // C-sources: .c - IF Len( s_aCFiles ) = Len( s_aObjsC ) + IF Len( s_aCFiles ) == Len( s_aObjsC ) Attention("Scanning .c sources...",19) FOR nPos := 1 to Len(s_aCFiles) cIncl := ScanInclude( s_aCFiles[ nPos ], lScanIncRecursive, cExcludeExts ) // Only add in list if dependencies exist IF ! Empty(cIncl) - FWrite( s_nMakeFileHandle, s_aObjsC[ nPos ] + ': ' + Alltrim( cIncl ) + CRLF, "" ) + FWrite( s_nMakeFileHandle, s_aObjsC[ nPos ] + ": " + Alltrim( cIncl ) + CRLF, "" ) ENDIF NEXT ENDIF @@ -3176,9 +3176,9 @@ Endif // Create and compile FWrite( s_nMakeFileHandle, " " + CRLF ) FWrite( s_nMakeFileHandle, "$(PROJECT): $(CFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)" + CRLF ) - IF 'Linux' $ cOS + IF "Linux" $ cOS FWrite( s_nMakeFileHandle, " $(LINKER) @&&!" + CRLF ) - ELSEIF 'Unix' $ cOS .or. "HP-UX" $ cOS + ELSEIF "Unix" $ cOS .or. "HP-UX" $ cOS FWrite( s_nMakeFileHandle, " $(LINKER) @&&!" + CRLF ) ELSE FWrite( s_nMakeFileHandle, " $(CC_DIR)\bin\$(LINKER) @&&!" + CRLF ) @@ -3314,16 +3314,16 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) // Add current file to list, making it by default the first in the list IF s_lWin32 - IF AScan(aFiles, {| x | Lower( x ) == Lower( cFnam + cExt ) } ) = 0 // Case IN-sensitive! + IF AScan(aFiles, {| x | Lower( x ) == Lower( cFnam + cExt ) } ) == 0 // Case IN-sensitive! AAdd(aFiles, cFnam + cExt) ENDIF ELSE - IF AScan(aFiles, cFnam + cExt ) = 0 // Case Sensitive! + IF AScan(aFiles, cFnam + cExt ) == 0 // Case Sensitive! AAdd(aFiles, cFnam + cExt) ENDIF ENDIF - lEof := (HB_FReadLine(nHandle,@cTemp,{chr(13)+chr(10), chr(10)}) = -1) + lEof := (HB_FReadLine(nHandle,@cTemp,{chr(13)+chr(10), chr(10)}) == -1) cTemp := LTrim( cTemp ) // Loop reading file WHILE !lEof @@ -3332,7 +3332,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) cTemp := Left( cTemp , Len( cTemp ) - 1) IF !lEof - lEof := (HB_FReadLine(nHandle,@cBuffer,{chr(13)+chr(10), chr(10)}) = -1) + lEof := (HB_FReadLine(nHandle,@cBuffer,{chr(13)+chr(10), chr(10)}) == -1) cTemp += LTrim( cBuffer) ENDIF @@ -3365,7 +3365,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) ENDIF IF Len(cInclude) > 0 .and. Len(Alltrim(cExclExtent)) > 0 HB_FNAMESPLIT( cInclude, @cPath, @cFnam, @cExt, @cDrive ) - IF lPrg .AND. Len(cExt) = 0 + IF lPrg .AND. Len(cExt) == 0 cInclude := cInclude + ".prg" // Handle set procedure to, using default extension ENDIF IF AT(Lower(cExt), Lower(cExclExtent)) > 0 @@ -3375,7 +3375,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) IF Len(cInclude) > 0 // Still Ok, add to list? IF s_lWin32 - IF AScan(aFiles, {| x | Lower( x ) == Lower( cInclude ) } ) = 0 // Case IN-sensitive! + IF AScan(aFiles, {| x | Lower( x ) == Lower( cInclude ) } ) == 0 // Case IN-sensitive! AAdd(aFiles, (cInclude) ) // recursive scanning IF lRecursive @@ -3383,7 +3383,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) ENDIF ENDIF ELSE - IF AScan(aFiles, cInclude ) = 0 // Case Sensitive! + IF AScan(aFiles, cInclude ) == 0 // Case Sensitive! AAdd(aFiles, (cInclude) ) // recursive scanning IF lRecursive @@ -3394,7 +3394,7 @@ FUNCTION ScanInclude( cFile, lRecursive, cExclExtent, aFiles) ENDIF ENDIF IF !lEof - lEof := (HB_FReadLine(nHandle,@cTemp,{chr(13)+chr(10), chr(10)}) = -1) + lEof := (HB_FReadLine(nHandle,@cTemp,{chr(13)+chr(10), chr(10)}) == -1) cTemp := LTrim( cTemp) ENDIF ENDDO @@ -3434,7 +3434,7 @@ FUNCTION CompileUpdatedFiles() LOCAL nPos1 := 0 LOCAL cDepSrc := "" #Endif - LOCAL aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", '²' ) + LOCAL aGauge := GaugeNew( 5, 5, 7, 40, "W/B", "W+/B", "²" ) @ 4,5 SAY "Compiling :" @@ -3450,9 +3450,9 @@ FUNCTION CompileUpdatedFiles() ENDIF FOR nFiles := 1 TO Len( s_aPrgs ) - xItem := Substr( s_aPrgs[ nFiles ], Rat( IIF( s_lGcc, '/', '\' ), s_aPrgs[ nFiles ] ) + 1 ) - nPos := AScan( s_aCFiles, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) - nObjPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) + xItem := Substr( s_aPrgs[ nFiles ], Rat( IIF( s_lGcc, "/", "\" ), s_aPrgs[ nFiles ] ) + 1 ) + nPos := AScan( s_aCFiles, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) + nObjPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xItem ) ) } ) #IfDef HBM_USE_DEPENDS lNewer := .F. @@ -3481,7 +3481,7 @@ FUNCTION CompileUpdatedFiles() setpos(9,0) __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'C2006' $ cErrText .OR. 'No code generated' $ cErrText + lEnd := "C2006" $ cErrText .OR. "No code generated" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor +" "+ (s_cLog) ) @@ -3528,8 +3528,8 @@ FUNCTION CompileUpdatedFiles() ENDIF FOR nFiles := 1 TO Len( aCtocompile ) - xItem := Substr( aCtocompile[ nFiles ], Rat( IIF( s_lGcc, '/', '\' ), aCtocompile[ nFiles ] ) + 1 ) - nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( aCtocompile[ nFiles ], At( ".", xItem ) ) } ) + xItem := Substr( aCtocompile[ nFiles ], Rat( IIF( s_lGcc, "/", "\" ), aCtocompile[ nFiles ] ) + 1 ) + nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( aCtocompile[ nFiles ], At( ".", xItem ) ) } ) IF nPos > 0 IF s_lMSVcc //.OR. s_lPocc @@ -3574,8 +3574,8 @@ FUNCTION CompileUpdatedFiles() FOR nFiles := 1 TO Len( s_aCFiles ) @ 4, 16 SAY Space( 50 ) - xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, '/', '\' ), s_aCFiles[ nFiles ] ) + 1 ) - nPos := AScan( s_aObjsC, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xitem, At( ".", xitem ) ) } ) + xItem := Substr( s_aCFiles[ nFiles ], Rat( IIF( s_lGcc, "/", "\" ), s_aCFiles[ nFiles ] ) + 1 ) + nPos := AScan( s_aObjsC, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xitem, At( ".", xitem ) ) } ) #IfDef HBM_USE_DEPENDS lNewer := .F. @@ -3604,7 +3604,7 @@ FUNCTION CompileUpdatedFiles() setpos(9,0) __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'Error E' $ cErrText + lEnd := "Error E" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor +" "+ (s_cLog) ) @@ -3650,8 +3650,8 @@ FUNCTION CompileUpdatedFiles() FOR EACH cPrg IN s_aPrgs @ 4, 16 SAY Space( 50 ) - xItem := Substr( cPrg, Rat( IIF( s_lGcc, '/', '\' ), cPrg ) + 1 ) - nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, '/', '\' ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xitem ) ) } ) + xItem := Substr( cPrg, Rat( IIF( s_lGcc, "/", "\" ), cPrg ) + 1 ) + nPos := AScan( s_aObjs, { | x | x := Substr( x, Rat( IIF( s_lGcc, "/", "\" ), x ) + 1 ), Left( x, At( ".", x ) ) == Left( xItem, At( ".", xitem ) ) } ) #IfDef HBM_USE_DEPENDS lNewer := .F. @@ -3675,12 +3675,12 @@ FUNCTION CompileUpdatedFiles() cComm += IIF( s_lLinux , " > "+ (s_cLog)," >>"+ (s_cLog)) @4,16 SAY cPrg GaugeUpdate( aGauge, nFile / Len( s_aPrgs ) ) - nFile ++ // moved from outside 'FOR EACH', Ath 2004-06-08 + nFile ++ // moved from outside "FOR EACH", Ath 2004-06-08 setpos(9,0) __RUN( (cComm) ) cErrText := Memoread( (s_cLog) ) - lEnd := 'C2006' $ cErrText .OR. 'No code generated' $ cErrText .or. "Error E" $ cErrText .or. "Error F" $ cErrText + lEnd := "C2006" $ cErrText .OR. "No code generated" $ cErrText .or. "Error E" $ cErrText .or. "Error F" $ cErrText IF ! s_lIgnoreErrors .AND. lEnd __run( s_cEditor +" "+ (s_cLog) ) @@ -3780,7 +3780,7 @@ FUNCTION FileInIncludePath(cFile) LOCAL cFilePath := "" LOCAL cSrcPath := "" - IF Len(s_aSrcPaths) = 0 + IF Len(s_aSrcPaths) == 0 s_aSrcPaths := ListAsArray2( GetEnv( "INCLUDE" ) , HB_OSPATHLISTSEPARATOR() ) ENDIF IF ! File(cFile) @@ -3810,7 +3810,7 @@ FUNCTION CreateLibMakeFile( cFile ) LOCAL aSrcC := Directory( "*.c" ) LOCAL cOS := IIF( s_lLinux, "Linux", "Win32") LOCAL cCompiler := IIF( s_lLinux, "GCC",IIF(s_lMSVcc,"MSVC",IIF(s_lPocc,"POCC","BCC"))) - LOCAL cLibName := Padr( Left( cFile, At( '.', cFile ) - 1 ) ,40) + LOCAL cLibName := Padr( Left( cFile, At( ".", cFile ) - 1 ) ,40) LOCAL lAutomemvar := .F. LOCAL lVarIsMemvar := .F. @@ -3829,7 +3829,7 @@ FUNCTION CreateLibMakeFile( cFile ) LOCAL cDrive := "" LOCAL cPath := "" LOCAL cTest := "" - LOCAL cLast := '' + LOCAL cLast := "" LOCAL nWriteFiles := 0 LOCAL aUserDefs LOCAL cCurrentDef := "" @@ -3870,20 +3870,20 @@ FUNCTION CreateLibMakeFile( cFile ) ENDIF - IF nOption = 1 // edit makefile + IF nOption == 1 // edit makefile // Verify if "cFile" can be openned to write mode. s_nMakeFileHandle := FOpen( cFile, FO_WRITE ) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser aberto para edi‡Æo." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser abierto para edici¢n." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be openned for edition." @@ -3967,13 +3967,13 @@ FUNCTION CreateLibMakeFile( cFile ) // after oMake read, recreate other clean makefile to edit. s_nMakeFileHandle := FCreate(cFile) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser aberto para edi‡Æo." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser abierto para edici¢n." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be openned for edition." @@ -3990,7 +3990,7 @@ FUNCTION CreateLibMakeFile( cFile ) s_lEditMake := .T. - ELSEIF nOption = 2 // create a new makefile + ELSEIF nOption == 2 // create a new makefile IF nLenaSrc == 0 .and. !s_lRecursive @@ -4017,13 +4017,13 @@ FUNCTION CreateLibMakeFile( cFile ) s_nMakeFileHandle := FCreate( cFile ) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be created." @@ -4049,13 +4049,13 @@ FUNCTION CreateLibMakeFile( cFile ) s_nMakeFileHandle := FCreate( cFile ) - if s_nMakeFileHandle = F_ERROR + if s_nMakeFileHandle == F_ERROR CLS - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+cFile + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+cFile + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+cFile + "> cannot be created." @@ -4074,7 +4074,7 @@ FUNCTION CreateLibMakeFile( cFile ) ENDIF CLS - Setcolor( 'w/b+,b+/w,w+/b,w/b+,w/b,w+/b' ) + Setcolor( "w/b+,b+/w,w+/b,w/b+,w/b,w+/b" ) @ 0, 0, Maxrow(), Maxcol() BOX( Chr( 201 ) + Chr( 205 ) + Chr( 187 ) + Chr( 186 ) + Chr( 188 ) + Chr( 205 ) + Chr( 200 ) + Chr( 186 ) + Space( 1 ) ) Attention( HbMake_Id() + space(10)+s_aLangMessages[ 27 ], 0 ) @@ -4206,21 +4206,21 @@ FUNCTION CreateLibMakeFile( cFile ) cObjDir := Alltrim( cObjDir ) IF ! Empty( cObjDir ) - cObjDir += '/' + cObjDir += "/" ENDIF - cTest := cObjDir + '/' + cTest := cObjDir + "/" ELSE cObjDir := Alltrim( cObjDir ) IF ! Empty( cObjDir ) - cObjDir += '\' + cObjDir += "\" ENDIF - cTest := cObjDir + '\' + cTest := cObjDir + "\" ENDIF - AEval( s_aMacros, { | x, y | cItem := Substr( x[ 2 ], 1, Len( x[ 2 ] ) ), IIF( At( citem, cTest ) > 0, ( s_aMacros[ y, 1 ] := 'OBJ', s_aMacros[ y, 2 ] := cObjDir ), ) } ) + AEval( s_aMacros, { | x, y | cItem := Substr( x[ 2 ], 1, Len( x[ 2 ] ) ), IIF( At( citem, cTest ) > 0, ( s_aMacros[ y, 1 ] := "OBJ", s_aMacros[ y, 2 ] := cObjDir ), ) } ) IF lAutoMemvar cHarbourFlags += " -a " @@ -4251,7 +4251,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$* $**" } ) ENDIF @@ -4265,7 +4265,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".c.o:", "gcc -I/usr/include/harbour $(CFLAG1) $(CFLAG2) -I. -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "harbour -n $(HARBOURFLAGS) -I/usr/include/harbour -I. -go" + if(s_lGenCsource,"3","") + " -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "harbour -n $(HARBOURFLAGS) -I/usr/include/harbour -I. -go" + iif(s_lGenCsource,"3","") + " -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "harbour -n $(HARBOURFLAGS) -I/usr/include/harbour -I. -o$* $**" } ) ENDIF @@ -4275,7 +4275,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".c.o:", "$(CC_DIR)\bin\gcc -I$(HB_DIR)/include $(CFLAG1) $(CFLAG2) -I. -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -n -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -n -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)/include $(HARBOURFLAGS) -o$* $**" } ) ENDIF @@ -4287,7 +4287,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\cl -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -go" + if(s_lGenCsource,"3","") + " -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -go" + iif(s_lGenCsource,"3","") + " -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) ENDIF @@ -4299,7 +4299,7 @@ FUNCTION CreateLibMakeFile( cFile ) AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$** $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -go" + iif(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$** $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(FWH)\include -o$** $**" } ) ENDIF @@ -4331,8 +4331,8 @@ FUNCTION CreateLibMakeFile( cFile ) ENDIF - AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( ' ', aOutFiles[ y ] ) ) ) } ) - AEval( aOutFiles, { | xItem | IIF( At( '.c', xItem ) > 0 .OR. At( '.C', xItem ) > 0 .OR. At( '.cpp', xItem ) > 0 .OR. At( '.CPP', xItem ) > 0, AAdd( aOutc, xitem ), ) } ) + AEval( aOutFiles, { | x, y | HB_SYMBOL_UNUSED( x ), aOutFiles[ y ] := Trim( Substr( aOutFiles[ y ], 1, At( " ", aOutFiles[ y ] ) ) ) } ) + AEval( aOutFiles, { | xItem | IIF( At( ".c", xItem ) > 0 .OR. At( ".C", xItem ) > 0 .OR. At( ".cpp", xItem ) > 0 .OR. At( ".CPP", xItem ) > 0, AAdd( aOutc, xitem ), ) } ) AEval( aOutc, { | x, z | citem := x, z := AScan( aOutFiles, { | t | t = citem } ), IIF( z > 0, aSize( aDel( aOutFiles, z ), Len( aOutFiles ) - 1 ), ) } ) aOutFiles := aSort( aOutFiles ) @@ -4357,10 +4357,10 @@ FUNCTION CreateLibMakeFile( cFile ) nPos := AScan( s_aPrgs, { | z | hb_FNAMESPLIT( z, @cPath, @cTest, @cExt, @cDrive ), cPath == citem } ) IF nPos > 0 - AEval( s_aPrgs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aPrgs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) + AEval( s_aPrgs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aPrgs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) IF ! s_aMacros[ x, 3 ] - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) s_aMacros[ x, 3 ] := .T. ENDIF @@ -4369,10 +4369,10 @@ FUNCTION CreateLibMakeFile( cFile ) nPos := AScan( s_aCFiles, { | z | hb_FNAMESPLIT( z, @cPath, @cTest, @cExt, @cDrive ), cPath == citem } ) IF nPos > 0 - AEval( s_aCFiles, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aCFiles[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) + AEval( s_aCFiles, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aCFiles[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) IF ! s_aMacros[ x, 3 ] - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) s_aMacros[ x, 3 ] := .T. ENDIF @@ -4383,8 +4383,8 @@ FUNCTION CreateLibMakeFile( cFile ) IF nPos > 0 IF ! Empty( cObjDir ) - AEval( s_aObjs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) - FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + ' = ' + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) + AEval( s_aObjs, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjs[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) + FWrite( s_nMakeFileHandle, s_aMacros[ x, 1 ] + " = " + Left( s_aMacros[ x, 2 ], Len( s_aMacros[ x, 2 ] ) - 1 ) + " " + CRLF ) ENDIF ENDIF @@ -4395,7 +4395,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF nPos > 0 IF ! Empty( cObjDir ) - AEval( s_aObjsC, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjsC[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ')\' ) ), ) } ) + AEval( s_aObjsC, { | a, b | hb_FNAMESPLIT( a, @cPath, @cTest, @cExt, @cDrive ), IIF( cPath == citem, s_aObjsC[ b ] := Strtran( a, cPath, "$(" + s_aMacros[ x, 1 ] + IIF( s_lGcc, ")/", ")\" ) ), ) } ) ENDIF ENDIF @@ -4426,7 +4426,7 @@ FUNCTION CreateLibMakeFile( cFile ) FWrite( s_nMakeFileHandle, + " $(OB) " + CRLF ) ELSE nWriteFiles := 0 - AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjs ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) + AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjs ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) ENDIF nWriteFiles := 0 @@ -4435,7 +4435,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aCFiles ) < 1 FWrite( s_nMakeFileHandle, + " $(CF)" + CRLF ) ELSE - AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) + AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) ENDIF FWrite( s_nMakeFileHandle, "PRGFILE =" ) @@ -4444,7 +4444,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aPrgs ) < 1 FWrite( s_nMakeFileHandle, + " $(PS)" + CRLF ) ELSE - AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) + AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) ENDIF ELSE /****extended moded ****/ @@ -4454,7 +4454,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aObjs ) < 1 FWrite( s_nMakeFileHandle, + " $(OB) " + CRLF ) ELSE - AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjs ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) + AEval( s_aObjs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjs ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OB) " + CRLF ) ) } ) ENDIF FWrite( s_nMakeFileHandle, "PRGFILES =" ) @@ -4463,7 +4463,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aPrgs ) < 1 FWrite( s_nMakeFileHandle, + " $(PS)" + CRLF ) ELSE - AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) + AEval( s_aPrgs, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aPrgs ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(PS) " + CRLF ) ) } ) ENDIF nWriteFiles := 0 @@ -4474,7 +4474,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aObjsC ) < 1 FWrite( s_nMakeFileHandle, + " $(OBC) " + CRLF ) ELSE - AEval( s_aObjsC, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjsC ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OBC) " + CRLF ) ) } ) + AEval( s_aObjsC, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aObjsC ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(OBC) " + CRLF ) ) } ) ENDIF ENDIF @@ -4487,7 +4487,7 @@ FUNCTION CreateLibMakeFile( cFile ) IF Len( s_aCFiles ) < 1 FWrite( s_nMakeFileHandle, + " $(CF)" + CRLF ) ELSE - AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, ' ' + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) + AEval( s_aCFiles, { | x, i | nWriteFiles ++, IIF( i <> Len( s_aCFiles ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + IIF( nWriteFiles % 10 == 0, " //" + CRLF, "" ) ), FWrite( s_nMakeFileHandle, " " + Alltrim( x ) + " $(CF) " + CRLF ) ) } ) ENDIF ENDIF @@ -4658,11 +4658,11 @@ FUNCTION SetBuildLib() s_nMakeFileHandle := FCreate( s_cMakeFileName ) - IF s_nMakeFileHandle = F_ERROR + IF s_nMakeFileHandle == F_ERROR - IF s_nLang = 1 // brazilian portuguese + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := "<"+s_cMakeFileName + "> nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := "<"+s_cMakeFileName + "> no pode ser criado." ELSE // english s_cAlertMsg := "<"+s_cMakeFileName + "> cannot be created." @@ -4683,7 +4683,7 @@ FUNCTION SetBuildLib() AAdd( s_aBuildOrder, aMacro[ 1 ] ) cRead := Strtran( cRead, "@&&!", "" ) - aMacro := ListAsArray2( cRead, '\' ) + aMacro := ListAsArray2( cRead, "\" ) AEval( aMacro, { | xMacro | Findmacro( xMacro, @cRead ) } ) IF s_lBcc .OR. s_lMSVcc .OR. s_lPocc @@ -4784,8 +4784,8 @@ FUNCTION CRLF FUNCTION CheckIFfile( cFile ) *---------------------------- - LOCAL cNextLine := '' - LOCAL cCommand := '' + LOCAL cNextLine := "" + LOCAL cCommand := "" LOCAL cTemp cTemp := Substr( cFile, At( " ", cFile ) + 1 ) @@ -4794,7 +4794,7 @@ FUNCTION CheckIFfile( cFile ) cNextLine := Trim( Substr( ReadLN( @s_lEof ), 1 ) ) IF "!" $ cNextLine - cCommand := Substr( cNextLine, At( ' ', cNextLine ) + 1 ) + cCommand := Substr( cNextLine, At( " ", cNextLine ) + 1 ) RUN( cCommand ) ENDIF @@ -4836,7 +4836,7 @@ FUNCTION CheckIFdef( cTemp ) cTemp := Strtran( cTemp, "!ifdef ", "" ) - IF '=' $ cRead + IF "=" $ cRead IF "\.." $ cRead cRead := Substr( cRead, 1, At( "\..", cRead ) - 1 ) @@ -4881,7 +4881,7 @@ FUNCTION CheckIFdef( cTemp ) ENDIF - ELSEIF '!stdout' $ cRead + ELSEIF "!stdout" $ cRead Checkstdout( cRead ) ENDIF @@ -4892,17 +4892,17 @@ RETURN NIL *------------------------- FUNCTION BuildBccCfgFile() *------------------------- -LOCAL cCfg := s_cHarbourDir + '\bin\'+s_cHarbourCFG +LOCAL cCfg := s_cHarbourDir + "\bin\"+s_cHarbourCFG LOCAL nCfg IF !File( cCfg ) .or. s_lForce nCfg := FCreate( cCfg ) - if nCfg = F_ERROR - IF s_nLang = 1 // brazilian portuguese + if nCfg == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := cCfg + " nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := cCfg + " no pode ser criado." ELSE // english s_cAlertMsg := cCfg + " cannot be created." @@ -4924,17 +4924,17 @@ RETURN NIL *------------------------- FUNCTION BuildMscCfgFile() *------------------------- - LOCAL cCfg := s_cHarbourDir + '\bin\'+s_cHarbourCFG + LOCAL cCfg := s_cHarbourDir + "\bin\"+s_cHarbourCFG LOCAL nCfg IF !File( cCfg ) .or. s_lForce nCfg := FCreate( cCfg ) - if nCfg = F_ERROR - IF s_nLang = 1 // brazilian portuguese + if nCfg == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := cCfg + " nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := cCfg + " no pode ser criado." ELSE // english s_cAlertMsg := cCfg + " cannot be created." @@ -4956,17 +4956,17 @@ RETURN NIL *------------------------- FUNCTION BuildPccCfgFile() *------------------------- - LOCAL cCfg := s_cHarbourDir + '\bin\'+s_cHarbourCFG + LOCAL cCfg := s_cHarbourDir + "\bin\"+s_cHarbourCFG LOCAL nCfg IF !File( cCfg ) .or. s_lForce nCfg := FCreate( cCfg ) - if nCfg = F_ERROR - IF s_nLang = 1 // brazilian portuguese + if nCfg == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := cCfg + " nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := cCfg + " no pode ser criado." ELSE // english s_cAlertMsg := cCfg + " cannot be created." @@ -4993,20 +4993,20 @@ FUNCTION BuildGccCfgFile() LOCAL cCfg LOCAL nCfg LOCAL cDir := s_cHarbourDir -// LOCAL cBhc := Alltrim( Strtran( ReplaceMacros( '$(HB_DIR)' ), '\', '/' ) ) +// LOCAL cBhc := Alltrim( Strtran( ReplaceMacros( "$(HB_DIR)" ), "\", "/" ) ) -// cDir := Strtran( cDir, '/', '\' ) +// cDir := Strtran( cDir, "/", "\" ) - cCfg := s_cHarbourDir + '\bin\'+s_cHarbourCFG + cCfg := s_cHarbourDir + "\bin\"+s_cHarbourCFG IF !File( cCfg ) .or. s_lForce nCfg := FCreate( cCfg ) - if nCfg = F_ERROR - IF s_nLang = 1 // brazilian portuguese + if nCfg == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := cCfg + " nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := cCfg + " no pode ser criado." ELSE // english s_cAlertMsg := cCfg + " cannot be created." @@ -5016,7 +5016,7 @@ FUNCTION BuildGccCfgFile() endif FWrite( nCfg, "CC=gcc" + CRLF ) - FWrite( nCfg, "CFLAGS= -c -DHB_DYNLIB " + ReplaceMacros( "-I" + s_cHarbourDir + "/include $(C_USR) -L" + s_cHarbourDir + "/lib" ) + if(s_lmingw ," -mno-cygwin ","" )+ CRLF ) + FWrite( nCfg, "CFLAGS= -c -DHB_DYNLIB " + ReplaceMacros( "-I" + s_cHarbourDir + "/include $(C_USR) -L" + s_cHarbourDir + "/lib" ) + iif(s_lmingw ," -mno-cygwin ","" )+ CRLF ) FWrite( nCfg, "VERBOSE=YES" + CRLF ) FWrite( nCfg, "DELTMP=YES" + CRLF ) FClose( nCfg ) @@ -5027,17 +5027,17 @@ RETURN NIL *-------------------------- FUNCTION BuildGccCfgFileL() *-------------------------- - LOCAL cCfg := '/etc/'+s_cHarbourCFG + LOCAL cCfg := "/etc/"+s_cHarbourCFG LOCAL nCfg IF !File( cCfg ) .or. s_lForce nCfg := FCreate( cCfg ) - if nCfg = F_ERROR - IF s_nLang = 1 // brazilian portuguese + if nCfg == F_ERROR + IF s_nLang == 1 // brazilian portuguese s_cAlertMsg := cCfg + " nÆo pode ser criado." - ELSEIF s_nLang = 3 // spanish + ELSEIF s_nLang == 3 // spanish s_cAlertMsg := cCfg + " no pode ser criado." ELSE // english s_cAlertMsg := cCfg + " cannot be created." @@ -5059,7 +5059,7 @@ RETURN NIL FUNCTION FindHarbourCfg( cCfg ) *------------------------------ - LOCAL cPath AS STRING := '' + LOCAL cPath AS STRING := "" LOCAL lFound AS LOGICAL := .F. LOCAL cEnv AS STRING LOCAL aEnv as Array of String @@ -5072,7 +5072,7 @@ FUNCTION FindHarbourCfg( cCfg ) FOR nPos := 1 TO Len( aEnv ) - IF File( aEnv[ nPos ] + '\'+s_cHarbourCFG ) + IF File( aEnv[ nPos ] + "\"+s_cHarbourCFG ) cPath := aEnv[ nPos ] lFound := .T. EXIT @@ -5082,16 +5082,16 @@ FUNCTION FindHarbourCfg( cCfg ) ELSE - IF File( '/etc/'+s_cHarbourCFG ) + IF File( "/etc/"+s_cHarbourCFG ) lFound := .T. - cPath := '/etc/'+s_cHarbourCFG + cPath := "/etc/"+s_cHarbourCFG ENDIF IF !lFound - IF File( '/usr/local/etc/'+s_cHarbourCFG ) + IF File( "/usr/local/etc/"+s_cHarbourCFG ) lFound := .T. - cPath := '/usr/local/etc/'+s_cHarbourCFG + cPath := "/usr/local/etc/"+s_cHarbourCFG ENDIF ENDIF @@ -5107,7 +5107,7 @@ FUNCTION TestforPrg( cFile ) *--------------------------- LOCAL aFiles AS ARRAY := {} - LOCAL cPath AS STRING := '' + LOCAL cPath AS STRING := "" LOCAL cTest AS STRING := "" LOCAL cDrive AS STRING := "" LOCAL cExt AS STRING := "" @@ -5119,7 +5119,7 @@ FUNCTION TestforPrg( cFile ) hb_FNAMESPLIT( cFile, @cPath, @cTest, @cExt, @cDrive ) cExt := Substr( cExt, 2 ) - aDir := Directory( cTest + '.*' ) + aDir := Directory( cTest + ".*" ) FOR nPos := 1 TO 7 cItem := cTest + "." + Extenprg( cExt, nPos ) @@ -5141,7 +5141,7 @@ RETURN NIL FUNCTION GetGccDir() *------------------- - LOCAL cPath AS STRING := '' + LOCAL cPath AS STRING := "" LOCAL cEnv AS STRING LOCAL aEnv AS Array of string LOCAL nPos as Numeric @@ -5154,9 +5154,9 @@ FUNCTION GetGccDir() FOR nPos := 1 TO Len( aEnv ) - IF File( aEnv[ nPos ] + '\gcc.exe' ) .OR. File( Lower( aEnv[ nPos ] ) + '\gcc.exe' ) + IF File( aEnv[ nPos ] + "\gcc.exe" ) .OR. File( Lower( aEnv[ nPos ] ) + "\gcc.exe" ) cPath := aEnv[ nPos ] - cPath := Left( cPath, Rat( '\', cPath ) - 1 ) + cPath := Left( cPath, Rat( "\", cPath ) - 1 ) EXIT ENDIF @@ -5385,7 +5385,7 @@ FUNCTION ProcessParameters( cParams ) cParams := "-D" + Strtran( cParams, "-D", ";" ) cParams := Strtran( cParams, "-D;", "-D" ) aDef := ListAsArray2( Alltrim( Substr( cParams, 3 ) ), ";" ) - AEval( aDef, { | xDef | IIF( At( '=', xDef ) > 0, GetParaDefines( xDef ), ) } ) + AEval( aDef, { | xDef | IIF( At( "=", xDef ) > 0, GetParaDefines( xDef ), ) } ) ENDIF // Build a Library @@ -5704,7 +5704,7 @@ FUNCTION GetSelFiles( aInFiles, aOutFiles ) FOR EACH cItem IN aInFiles - nPos := AScan( aOutFiles, { | x | x == Left( cItem, At( ' ', citem ) - 1 ) } ) + nPos := AScan( aOutFiles, { | x | x == Left( cItem, At( " ", citem ) - 1 ) } ) IF nPos > 0 AAdd( aRet, cItem ) @@ -5791,7 +5791,7 @@ Local n for Each n In aTempLibs c += "-l" - c += StrTran( n, '.a', "" ) + c += StrTran( n, ".a", "" ) c+= " " next diff --git a/harbour/utils/hbmake/hbmutils.prg b/harbour/utils/hbmake/hbmutils.prg index cefa0e0ee5..c90e159214 100644 --- a/harbour/utils/hbmake/hbmutils.prg +++ b/harbour/utils/hbmake/hbmutils.prg @@ -50,8 +50,9 @@ */ #include "common.ch" +#include "directry.ch" #ifndef __HARBOUR__ - #include 'hbclip.ch' + #include "hbclip.ch" #else DECLARE ExtenPrg( cExt AS STRING, nType AS NUMERIC ) AS STRING DECLARE Exten( cExt as string, nType as numeric ) as string @@ -73,8 +74,8 @@ FUNCTION GetSourceFiles( lSubDir, lGcc, cOs ) LOCAL aDirs LOCAL aRet := {} - LOCAL lLinux := AT( 'linux', LOWER( cOs ) ) > 0 .OR. lGcc - LOCAL cDir := IIF( ! lLinux, '\' + CURDIR() + '\', '/' + CURDIR() + '/' ) + LOCAL lLinux := AT( "linux", LOWER( cOs ) ) > 0 .OR. lGcc + LOCAL cDir := IIF( ! lLinux, "\" + CURDIR() + "\", "/" + CURDIR() + "/" ) LOCAL aStru := { cDir } LOCAL aData LOCAL nCounter := 0 @@ -115,30 +116,30 @@ FUNCTION GetSourceFiles( lSubDir, lGcc, cOs ) nPadr := 12 // maximum Clipper/DOS source file name length with extension. // if this lenght is greater than 12, then reset nPadr. FOR y := 1 TO nDataLen - nPadr := Max( AT('.prg', Lower( aData[ y, 1 ] ) )+3 , nPadr ) - nPadr := Max( AT('.c', Lower( aData[ y, 1 ] ) )+1 , nPadr ) - nPadr := Max( AT('.cpp', Lower( aData[ y, 1 ] ) )+3 , nPadr ) + nPadr := Max( AT(".prg", Lower( aData[ y, 1 ] ) )+3 , nPadr ) + nPadr := Max( AT(".c", Lower( aData[ y, 1 ] ) )+1 , nPadr ) + nPadr := Max( AT(".cpp", Lower( aData[ y, 1 ] ) )+3 , nPadr ) NEXT FOR y := 1 TO nDataLen - IF AT( '.PRG', UPPER( aData[ y, 1 ] ) ) > 0 .OR. AT( '.c', Lower( aData[ y, 1 ] ) ) > 0 .OR. AT( '.cpp', Lower( aData[ y, 1 ] ) ) > 0 + IF AT( ".prg", Lower( aData[ y, 1 ] ) ) > 0 .OR. AT( ".c", Lower( aData[ y, 1 ] ) ) > 0 .OR. AT( ".cpp", Lower( aData[ y, 1 ] ) ) > 0 IF lSubDir nLen := AT( " ", aData[ y, 1 ] ) + 1 - AADD( aRet, STRTRAN( aStru[ nCounter ], cDir, '' ) +; + AADD( aRet, STRTRAN( aStru[ nCounter ], cDir, "" ) +; PadR(aData[ y,1 ] ,nPadr) + ; // prg name - STR(aData[ y, 2 ] , 8 ) + ' ' + ; // prg size - DTOC(aData[ y, 3 ] ) + ' ' + ; // prg date + STR(aData[ y, 2 ] , 8 ) + " " + ; // prg size + DTOC(aData[ y, 3 ] ) + " " + ; // prg date aData[ y, 4 ] ) // prg time - ELSEIF ! lSubDir .AND. AT( IIF( lLinux, "/", "\" ), STRTRAN( aStru[ nCounter ], cDir, '' ) ) == 0 + ELSEIF ! lSubDir .AND. AT( IIF( lLinux, "/", "\" ), STRTRAN( aStru[ nCounter ], cDir, "" ) ) == 0 AADD( aRet, PadR(aData[ y, 1 ],nPadr) + ; // prg name - STR( aData[ y, 2 ], 8 ) + ' ' + ; // prg size - DTOC( aData[ y, 3 ] ) + ' ' + ; // prg date + STR( aData[ y, 2 ], 8 ) + " " + ; // prg size + DTOC( aData[ y, 3 ] ) + " " + ; // prg date aData[ y, 4 ] ) // prg time ENDIF @@ -154,8 +155,8 @@ FUNCTION GetSourceFiles( lSubDir, lGcc, cOs ) // For nCounter := 1 To Len( aRet ) FOR EACH cFile IN aRet - xItem := SUBSTR( cFile, RAT( IIF( lLinux, "/", '\' ), cFile ) + 1 ) - nPos := ASCAN( aStru, { | x | x := SUBSTR( x, RAT( IIF( lLinux, "/", '\' ), x ) + 1 ), LEFT( x, AT( ".", x ) ) == LEFT( xitem, AT( ".", xitem ) ) } ) + xItem := SUBSTR( cFile, RAT( IIF( lLinux, "/", "\" ), cFile ) + 1 ) + nPos := ASCAN( aStru, { | x | x := SUBSTR( x, RAT( IIF( lLinux, "/", "\" ), x ) + 1 ), LEFT( x, AT( ".", x ) ) == LEFT( xitem, AT( ".", xitem ) ) } ) IF nPos > 0 ADEL( aStru, nPos ) @@ -166,9 +167,9 @@ FUNCTION GetSourceFiles( lSubDir, lGcc, cOs ) FOR EACH cFile IN aStru - HB_FNAMESPLIT( LEFT( cFile, AT( ' ', cFile ) - 1 ), @cPath, @cItem, @cExt, @cDrive ) + HB_FNAMESPLIT( LEFT( cFile, AT( " ", cFile ) - 1 ), @cPath, @cItem, @cExt, @cDrive ) - IF ( cExt == '.C' ) .OR. ( cExt == ".c" ) .OR. ( cExt == '.CPP' ) .OR. ( cExt == ".cpp" ) + IF ( cExt == ".C" ) .OR. ( cExt == ".c" ) .OR. ( cExt == ".CPP" ) .OR. ( cExt == ".cpp" ) AADD( aRet, cFile ) ENDIF @@ -188,25 +189,25 @@ FUNCTION ExtenPrg( cExt, nType ) IF nPos > 0 SWITCH nType CASE 1 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'prg' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "prg" ) EXIT CASE 2 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'prG' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "prG" ) EXIT CASE 3 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'pRg' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "pRg" ) EXIT CASE 4 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'Prg' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "Prg" ) EXIT CASE 5 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'PRg' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "PRg" ) EXIT CASE 6 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'PrG' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "PrG" ) EXIT CASE 7 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'PRG' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "PRG" ) EXIT END ENDIF @@ -218,24 +219,24 @@ STATIC FUNCTION GetDirs( cPattern, lGcc ) *---------------------------------------- LOCAL aDir := {} - LOCAL lLinux := AT( 'linux', LOWER( OS() ) ) > 0 .OR. lGcc + LOCAL lLinux := AT( "linux", LOWER( OS() ) ) > 0 .OR. lGcc AEVAL( DIRECTORY( cPattern + IIF( lLinux, "*", "*.*" ), "D" ), ; - { | xItem | IIF( xItem[ 5 ] = "D" .AND. ; - ( xItem[ 1 ] != "." .AND. xItem[ 1 ] != ".." ), ; - AADD( aDir, cPattern + xItem[ 1 ] + IIF( lLinux, "/", '\' ) ), ; + { | xItem | IIF( xItem[ F_ATTR ] == "D" .AND. ; + ( !( xItem[ F_NAME ] == "." ) .AND. !( xItem[ F_NAME ] == ".." ) ), ; + AADD( aDir, cPattern + xItem[ F_NAME ] + IIF( lLinux, "/", "\" ) ), ; ) } ) -RETURN ( aDir ) +RETURN aDir *----------------------- FUNCTION GetHarbourDir() *----------------------- - LOCAL cPath := '' + LOCAL cPath := "" LOCAL cEnv := GETE( "PATH" ) LOCAL lLinux := "LINUX" $ upper(OS()) - LOCAL lUnix := If( "UNIX" $ upper(OS()) .OR. "HP-UX" $ upper(OS()), .T., .F. ) + LOCAL lUnix := iif( "UNIX" $ upper(OS()) .OR. "HP-UX" $ upper(OS()), .T., .F. ) LOCAL aEnv LOCAL cCurEnv := "" LOCAL cBar := iif( lLinux .or. lUnix, "/" , "\" ) @@ -269,16 +270,16 @@ RETURN cPath FUNCTION GetBccDir() *------------------- - LOCAL cPath := '' + LOCAL cPath := "" LOCAL cEnv := GETE( "PATH" ) LOCAL aEnv := HB_ATokens( cEnv, ";" ) LOCAL cCurEnv := "" FOR EACH cCurEnv IN aEnv - IF FILE( cCurEnv + '\bcc32.exe' ) .OR. FILE( Lower( cCurEnv ) + '\bcc32.exe' ) + IF FILE( cCurEnv + "\bcc32.exe" ) .OR. FILE( Lower( cCurEnv ) + "\bcc32.exe" ) cPath := cCurEnv - cPath := LEFT( cPath, RAT( '\', cPath ) - 1 ) + cPath := LEFT( cPath, RAT( "\", cPath ) - 1 ) EXIT ENDIF @@ -290,16 +291,16 @@ RETURN cPath FUNCTION GetVccDir() *------------------- - LOCAL cPath := '' + LOCAL cPath := "" LOCAL cEnv := GETE( "PATH" ) LOCAL aEnv := HB_ATokens( cEnv, ";" ) LOCAL cCurEnv := "" FOR EACH cCurEnv IN aEnv - IF FILE( cCurEnv + '\cl.exe' ) .OR. FILE( Lower( cCurEnv ) + '\cl.exe' ) + IF FILE( cCurEnv + "\cl.exe" ) .OR. FILE( Lower( cCurEnv ) + "\cl.exe" ) cPath := cCurEnv - cPath := LEFT( cPath, RAT( '\', cPath ) - 1 ) + cPath := LEFT( cPath, RAT( "\", cPath ) - 1 ) EXIT ENDIF @@ -311,16 +312,16 @@ RETURN cPath FUNCTION GetPoccDir() *-------------------- - LOCAL cPath := '' + LOCAL cPath := "" LOCAL cEnv := GETE( "PATH" ) LOCAL aEnv := HB_ATokens( cEnv, ";" ) LOCAL cCurEnv := "" FOR EACH cCurEnv IN aEnv - IF FILE( cCurEnv + '\pocc.exe' ) .OR. FILE( Lower( cCurEnv ) + '\pocc.exe' ) + IF FILE( cCurEnv + "\pocc.exe" ) .OR. FILE( Lower( cCurEnv ) + "\pocc.exe" ) cPath := cCurEnv - cPath := LEFT( cPath, RAT( '\', cPath ) - 1 ) + cPath := LEFT( cPath, RAT( "\", cPath ) - 1 ) EXIT ENDIF @@ -332,7 +333,7 @@ RETURN cPath FUNCTION Exten( cExt, nType ) *---------------------------- - LOCAL aExt := { 'C', 'c', "CPP", "cpp" } + LOCAL aExt := { "C", "c", "CPP", "cpp" } LOCAL nPos LOCAL cTemp := "" @@ -341,11 +342,11 @@ FUNCTION Exten( cExt, nType ) SWITCH nType CASE 1 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'o' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "o" ) EXIT CASE 2 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'obj' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "obj" ) EXIT END @@ -372,8 +373,8 @@ FUNCTION GetSourceDirMacros() *---------------------------- LOCAL aDirs - LOCAL lLinux := AT( 'linux', LOWER( OS() ) ) > 0 - LOCAL cDir := IIF( lLinux, '/' + CURDIR() + '/', '\' + CURDIR() + '\' ) + LOCAL lLinux := AT( "linux", LOWER( OS() ) ) > 0 + LOCAL cDir := IIF( lLinux, "/" + CURDIR() + "/", "\" + CURDIR() + "\" ) LOCAL aStru := { cDir } LOCAL nCounter := 0 @@ -388,7 +389,7 @@ FUNCTION GetSourceDirMacros() ENDDO FOR nCounter := 1 TO LEN( aStru ) - AADD( aMacros, { "SRC" + STRZERO( nCounter, 2, 0 ), STRTRAN( aStru[ nCounter ], cDir, '' ), .f. } ) + AADD( aMacros, { "SRC" + STRZERO( nCounter, 2, 0 ), STRTRAN( aStru[ nCounter ], cDir, "" ), .f. } ) NEXT RETURN aMacros @@ -399,7 +400,7 @@ FUNCTION HbMake_FileDate( cFileName ) LOCAL aFiles := DIRECTORY( cFileName ) -RETURN IIF( LEN( aFiles ) == 1, aFiles[ 1, 3 ], CTOD( '' ) ) +RETURN IIF( LEN( aFiles ) == 1, aFiles[ 1, 3 ], CTOD( "" ) ) *------------------------------------ FUNCTION HbMake_FileTime( cFileName ) @@ -407,12 +408,12 @@ FUNCTION HbMake_FileTime( cFileName ) LOCAL aFiles := DIRECTORY( cFileName ) -RETURN IIF( LEN( aFiles ) == 1, aFiles[ 1, 4 ], '' ) +RETURN IIF( LEN( aFiles ) == 1, aFiles[ 1, 4 ], "" ) *------------------------------ FUNCTION TD2JUL( CTIME, DDATE ) *------------------------------ -RETURN DDATE - CTOD( '01/01/1900' ) + ( PRB_INT( TTOS( CTIME ) / 100000,, 5 ) ) +RETURN DDATE - CTOD( "01/01/1900" ) + ( PRB_INT( TTOS( CTIME ) / 100000,, 5 ) ) *--------------------- STATIC FUNCTION TTOS( CTIME ) @@ -441,7 +442,7 @@ FUNCTION PRB_INT( SOMENUMBER, length, NUM_DECIMALS ) SOMESTRING := ALLTRIM( STR( SOMENUMBER ) ) - dotat := AT( '.', somestring ) + dotat := AT( ".", somestring ) DO CASE CASE NUM_DECIMALS == 0 @@ -457,7 +458,7 @@ FUNCTION PRB_INT( SOMENUMBER, length, NUM_DECIMALS ) ENDCASE IF NEGATIVE - SOMESTRING := '-' + SOMESTRING + SOMESTRING := "-" + SOMESTRING ENDIF RETURN VAL( SOMESTRING ) @@ -466,18 +467,18 @@ RETURN VAL( SOMESTRING ) FUNCTION Exte( cExt, nType ) *--------------------------- - LOCAL aExt := { 'prg', 'prG', 'pRg', 'Prg', 'PRg', 'PrG', 'PRG' } + LOCAL aExt := { "prg", "prG", "pRg", "Prg", "PRg", "PrG", "PRG" } LOCAL nPos LOCAL cTemp := "" nPos := ASCAN( aExt, { | a | a == cExt } ) IF nPos > 0 IF nType == 1 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'c' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "c" ) ELSEIF nType == 2 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'obj' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "obj" ) ELSEIF nType == 3 - cTemp := STRTRAN( cExt, aExt[ nPos ], 'o' ) + cTemp := STRTRAN( cExt, aExt[ nPos ], "o" ) ENDIF ENDIF @@ -491,11 +492,11 @@ PROCEDURE ATTENTION( CSTRING, NLINENUM, CCOLOR ) LOCAL COLDCOLOR DEFAULT NLINENUM TO 24 - DEFAULT CCOLOR TO 'GR+/R' + DEFAULT CCOLOR TO "GR+/R" COLDCOLOR := SETCOLOR( CCOLOR ) - CSTRING := ' ' + ALLTRIM( CSTRING ) + ' ' + CSTRING := " " + ALLTRIM( CSTRING ) + " " DEVPOS( NLINENUM, c( CSTRING ) ) @@ -517,8 +518,8 @@ FUNCTION ReadLN( lEof ) LOCAL cBuffer := "" cBuffer := FT_FREADLN() - cBuffer := STRTRAN( cBuffer, CHR( 13 ), '' ) - cBuffer := STRTRAN( cBuffer, CHR( 10 ), '' ) + cBuffer := STRTRAN( cBuffer, CHR( 13 ), "" ) + cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) FT_FSKIP( 1 ) lEof := ft_FEOF() @@ -537,41 +538,41 @@ FUNCTION GetInstaledLibs( clibs, lGcc ) LOCAL aDefLib := {} - aadd(aDefLib,'ace32'+ cSuffix) - aadd(aDefLib,'hbcpage'+ cSuffix) - aadd(aDefLib,'hbcommon'+ cSuffix) - aadd(aDefLib,'hbct'+cSuffix) - aadd(aDefLib,'rdddbt'+ cSuffix) - aadd(aDefLib,'rddcdx'+ cSuffix) - aadd(aDefLib,'rddfpt'+ cSuffix) - aadd(aDefLib,'rddntx'+ cSuffix) - aadd(aDefLib,'hbdebug'+ cSuffix) - aadd(aDefLib,'gtcgi'+ cSuffix) - aadd(aDefLib,'gtdos'+ cSuffix) - aadd(aDefLib,'gtpca'+ cSuffix) - aadd(aDefLib,'gtsln'+ cSuffix) - aadd(aDefLib,'gtstd'+ cSuffix) - aadd(aDefLib,'gttrm'+ cSuffix) - aadd(aDefLib,'gtwin'+ cSuffix) - aadd(aDefLib,'gtwvt'+ cSuffix) - aadd(aDefLib,'hbodbc'+ cSuffix) - aadd(aDefLib,'hbpgsql'+ cSuffix) - aadd(aDefLib,'hblang'+ cSuffix) - aadd(aDefLib,'hbmisc'+ cSuffix) - aadd(aDefLib,'hbnf'+ cSuffix) - aadd(aDefLib,'hbgt'+ cSuffix) - aadd(aDefLib,'hbmysql'+ cSuffix) - aadd(aDefLib,'hbmacro'+ cSuffix) - aadd(aDefLib,'hbnulrdd'+ cSuffix) - aadd(aDefLib,'hbpp'+ cSuffix) - aadd(aDefLib,'hbrdd'+ cSuffix) - aadd(aDefLib,'rddads'+ cSuffix) - aadd(aDefLib,'hbrtl'+ cSuffix) - aadd(aDefLib,'hbclipsm'+ cSuffix) - aadd(aDefLib,'hbtip'+cSuffix) - aadd(aDefLib,'hbw32'+cSuffix) - aadd(aDefLib,'hbvm'+ cSuffix) - aadd(aDefLib,'hbziparch'+ cSuffix) + aadd(aDefLib,"ace32"+ cSuffix) + aadd(aDefLib,"hbcpage"+ cSuffix) + aadd(aDefLib,"hbcommon"+ cSuffix) + aadd(aDefLib,"hbct"+cSuffix) + aadd(aDefLib,"rdddbt"+ cSuffix) + aadd(aDefLib,"rddcdx"+ cSuffix) + aadd(aDefLib,"rddfpt"+ cSuffix) + aadd(aDefLib,"rddntx"+ cSuffix) + aadd(aDefLib,"hbdebug"+ cSuffix) + aadd(aDefLib,"gtcgi"+ cSuffix) + aadd(aDefLib,"gtdos"+ cSuffix) + aadd(aDefLib,"gtpca"+ cSuffix) + aadd(aDefLib,"gtsln"+ cSuffix) + aadd(aDefLib,"gtstd"+ cSuffix) + aadd(aDefLib,"gttrm"+ cSuffix) + aadd(aDefLib,"gtwin"+ cSuffix) + aadd(aDefLib,"gtwvt"+ cSuffix) + aadd(aDefLib,"hbodbc"+ cSuffix) + aadd(aDefLib,"hbpgsql"+ cSuffix) + aadd(aDefLib,"hblang"+ cSuffix) + aadd(aDefLib,"hbmisc"+ cSuffix) + aadd(aDefLib,"hbnf"+ cSuffix) + aadd(aDefLib,"hbgt"+ cSuffix) + aadd(aDefLib,"hbmysql"+ cSuffix) + aadd(aDefLib,"hbmacro"+ cSuffix) + aadd(aDefLib,"hbnulrdd"+ cSuffix) + aadd(aDefLib,"hbpp"+ cSuffix) + aadd(aDefLib,"hbrdd"+ cSuffix) + aadd(aDefLib,"rddads"+ cSuffix) + aadd(aDefLib,"hbrtl"+ cSuffix) + aadd(aDefLib,"hbclipsm"+ cSuffix) + aadd(aDefLib,"hbtip"+cSuffix) + aadd(aDefLib,"hbw32"+cSuffix) + aadd(aDefLib,"hbvm"+ cSuffix) + aadd(aDefLib,"hbziparch"+ cSuffix) IF lGcc @@ -595,20 +596,20 @@ RETURN aReturnLibs FUNCTION GetLibs( lGcc, cDir ) *----------------------------- - LOCAL lLinux := AT( 'linux', LOWER( OS() ) ) > 0 + LOCAL lLinux := AT( "linux", LOWER( OS() ) ) > 0 LOCAL cEnv := GETENV( "HB_LIB_INSTALL" ) - LOCAL aInstaledLibs := GetInstaledLibs( IIF( ! lLinux, IIF( ! lGcc, cDir + "\*.lib", cDir + "\*.a" ), '/usr/lib/harbour/*.a' ), lGcc ) + LOCAL aInstaledLibs := GetInstaledLibs( IIF( ! lLinux, IIF( ! lGcc, cDir + "\*.lib", cDir + "\*.a" ), "/usr/lib/harbour/*.a" ), lGcc ) LOCAL cExt := iif(lGcc,".a",".lib") /* 1234567890123456789 */ - LOCAL aLibsDesc := { { "Harbour hbmisc lib - hbmisc" + cExt , 'hbmisc' + cExt },; - { "Harbour NanFor Lib lib - hbnf" + cExt , 'hbnf' + cExt },; - { "Harbour GT Lib lib - hbgt"+cExt , 'hbgt' + cExt },; - { "Harbour ZipArch lib - hbziparch"+cExt , 'hbziparch' + cExt + iif( lLinux, ' stdc++.a z.a', ' ' ) },; - { "Harbour ole (old) lib - hbole"+ cExt , 'hbole' + cExt + ' ole2' + cExt },; - { "Harbour MySQL lib - hbmysql" + cExt , 'hbmysql' + cExt },; - { "Harbour PostgreSQL lib - hbpgsql"+cExt , 'hbpgsql' + cExt },; - { "Harbour samples lib - hbclipsm"+cExt , 'hbclipsm' + cExt } } + LOCAL aLibsDesc := { { "Harbour hbmisc lib - hbmisc" + cExt , "hbmisc" + cExt },; + { "Harbour NanFor Lib lib - hbnf" + cExt , "hbnf" + cExt },; + { "Harbour GT Lib lib - hbgt"+cExt , "hbgt" + cExt },; + { "Harbour ZipArch lib - hbziparch"+cExt , "hbziparch" + cExt + iif( lLinux, " stdc++.a z.a", " " ) },; + { "Harbour ole (old) lib - hbole"+ cExt , "hbole" + cExt + " ole2" + cExt },; + { "Harbour MySQL lib - hbmysql" + cExt , "hbmysql" + cExt },; + { "Harbour PostgreSQL lib - hbpgsql"+cExt , "hbpgsql" + cExt },; + { "Harbour samples lib - hbclipsm"+cExt , "hbclipsm" + cExt } } AEVAL( aInstaledLibs, { | x | AAdd( aLibsDesc, { padr("Harbour contrib",19)+" lib - " + padr(x,15), x } ) } ) @@ -654,7 +655,7 @@ FUNCTION ListAsArray2( cList, cDelimiter ) LOCAL nPos LOCAL aList := {} // Define an empty array - IF cDelimiter = NIL + IF cDelimiter == NIL cDelimiter := "," ENDIF // @@ -674,11 +675,11 @@ FUNCTION CreateLink() LOCAL nHandle := FCreate("hbtemp.c") FWrite( nHandle, '#include "hbapi.h"' + HB_OsNewLine()) - FWrite( nHandle, 'extern HB_FUNC( HB_GT_CRS );' + HB_OsNewLine()) - FWrite( nHandle, 'void hb_lnk_ForceLink_build( void )' + HB_OsNewLine()) - FWrite( nHandle, '{' + HB_OsNewLine()) - FWrite( nHandle, ' HB_FUNCNAME( HB_GT_CRS )();' + HB_OsNewLine()) - FWrite( nHandle, '}' + HB_OsNewLine()) + FWrite( nHandle, "extern HB_FUNC( HB_GT_CRS );" + HB_OsNewLine()) + FWrite( nHandle, "void hb_lnk_ForceLink_build( void )" + HB_OsNewLine()) + FWrite( nHandle, "{" + HB_OsNewLine()) + FWrite( nHandle, " HB_FUNCNAME( HB_GT_CRS )();" + HB_OsNewLine()) + FWrite( nHandle, "}" + HB_OsNewLine()) FClose( nHandle ) diff --git a/harbour/utils/hbmake/pickarry.prg b/harbour/utils/hbmake/pickarry.prg index c83f06f81f..ee07151475 100644 --- a/harbour/utils/hbmake/pickarry.prg +++ b/harbour/utils/hbmake/pickarry.prg @@ -1,6 +1,8 @@ /* * $Id$ */ + +/* * xHarbour Project source code: * hbmake.prg xHarbour make utility main file * @@ -51,10 +53,11 @@ STATIC someitems STATIC lAdd := .F. -STATIC cMarkChar := '*' // 'û' // character showed when is pressed to select prgs/libs. +STATIC cMarkChar := "*" // "û" // character showed when is pressed to select prgs/libs. -#include "common.ch" #include "achoice.ch" +#include "common.ch" +#include "inkey.ch" FUNCTION PICKARRY( T, L, b, r, IN_ARRAY, OUT_ARRAY, aDefault, lAllowAll, cTitle, lLib ) @@ -79,15 +82,15 @@ DEFAULT lLib to .F. PutScreen() - Setcolor( 'gr+/rb,b+/w,w+/b,w/b+,w/b,w+/b' ) + Setcolor( "gr+/rb,b+/w,w+/b,w/b+,w/b,w+/b" ) @ T - 2, L - 1 CLEAR TO b + 1, r + 1 @ T - 2, L say cTitle @ T - 1, L - 1 TO b + 1, r + 1 double FOR x := 1 TO NUM_ELEMS - IN_ARRAY[ X ] := Padr( ' ' + IN_ARRAY[ X ], PAD_LEN ) - OUT_ARRAY[ X ] := ' ' + OUT_ARRAY[ X ] + IN_ARRAY[ X ] := Padr( " " + IN_ARRAY[ X ], PAD_LEN ) + OUT_ARRAY[ X ] := " " + OUT_ARRAY[ X ] NEXT //aTemp :=GetFiles(aitems) @@ -98,30 +101,30 @@ DEFAULT lLib to .F. FOR EACH cItem IN aDefault if !lLib - x := AScan( IN_ARRAY, { | a | SubStr( a, 4, At(' ', alltrim(a) ) - 1 ) == cItem } ) + x := AScan( IN_ARRAY, { | a | SubStr( a, 4, At(" ", alltrim(a) ) - 1 ) == cItem } ) else x := AScan( IN_ARRAY, { | a | alltrim(cItem) $ a } ) endif IF x != 0 - IN_ARRAY[ x ] := Stuff( IN_ARRAY[ x ], 2, 1, If( lIsChecked, ' ', cMarkChar ) ) - OUT_ARRAY[ x ] := Stuff( OUT_ARRAY[ x ], 1, 1, If( lIsChecked, ' ', cMarkChar ) ) + IN_ARRAY[ x ] := Stuff( IN_ARRAY[ x ], 2, 1, iif( lIsChecked, " ", cMarkChar ) ) + OUT_ARRAY[ x ] := Stuff( OUT_ARRAY[ x ], 1, 1, iif( lIsChecked, " ", cMarkChar ) ) SOMEITEMS ++ ELSE - cItem := SubStr( cItem, Rat( '\', cItem ) - 1 ) + cItem := SubStr( cItem, Rat( "\", cItem ) - 1 ) if !lLib - x := AScan( aTemp, { | a | SubStr( a, 4, At( ' ', a ) - 1 ) == cItem } ) + x := AScan( aTemp, { | a | SubStr( a, 4, At( " ", a ) - 1 ) == cItem } ) else x := AScan( IN_ARRAY, { | a | alltrim(cItem) $ a } ) endif IF x != 0 - IN_ARRAY[ x ] := Stuff( IN_ARRAY[ x ], 2, 1, If( lIsChecked, ' ', cMarkChar ) ) - OUT_ARRAY[ x ] := Stuff( OUT_ARRAY[ x ], 1, 1, If( lIsChecked, ' ', cMarkChar ) ) + IN_ARRAY[ x ] := Stuff( IN_ARRAY[ x ], 2, 1, iif( lIsChecked, " ", cMarkChar ) ) + OUT_ARRAY[ x ] := Stuff( OUT_ARRAY[ x ], 1, 1, iif( lIsChecked, " ", cMarkChar ) ) SOMEITEMS ++ ENDIF @@ -137,7 +140,7 @@ DEFAULT lLib to .F. @T,L CLEAR TO b, r - nChoice := AChoice( T, L, b, r, IN_ARRAY,, 'keys', nChoice, 1 ) + nChoice := AChoice( T, L, b, r, IN_ARRAY,, "keys", nChoice, 1 ) IF nChoice > 0 @@ -149,8 +152,8 @@ DEFAULT lLib to .F. lIsChecked := Substr( IN_ARRAY[ nChoice ], 2, 1 ) == cMarkChar - IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, If( lIsChecked, ' ', cMarkChar ) ) - OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, If( lIsChecked, ' ', cMarkChar ) ) + IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, iif( lIsChecked, " ", cMarkChar ) ) + OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, iif( lIsChecked, " ", cMarkChar ) ) IF lIsChecked SOMEITEMS -- @@ -164,8 +167,8 @@ DEFAULT lLib to .F. lIsChecked := Substr( IN_ARRAY[ nChoice ], 2, 1 ) == cMarkChar - IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, If( lIsChecked, ' ', cMarkChar ) ) - OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, If( lIsChecked, ' ', cMarkChar ) ) + IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, iif( lIsChecked, " ", cMarkChar ) ) + OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, iif( lIsChecked, " ", cMarkChar ) ) IF lIsChecked SOMEITEMS -- @@ -181,8 +184,8 @@ DEFAULT lLib to .F. lIsChecked := Substr( IN_ARRAY[ nChoice ], 2, 1 ) == cMarkChar - IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, If( lIsChecked, ' ', cMarkChar ) ) - OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, If( lIsChecked, ' ', cMarkChar ) ) + IN_ARRAY[ nChoice ] := Stuff( IN_ARRAY[ nChoice ], 2, 1, iif( lIsChecked, " ", cMarkChar ) ) + OUT_ARRAY[ nChoice ] := Stuff( OUT_ARRAY[ nChoice ], 1, 1, iif( lIsChecked, " ", cMarkChar ) ) IF lIsChecked SOMEITEMS -- @@ -218,26 +221,26 @@ LOCAL RETVAL := AC_CONT LOCAL THEKEY := Lastkey() - IF MODE = AC_HITTOP - KEYBOARD Chr( 30 ) + IF MODE == AC_HITTOP + KEYBOARD Chr( K_CTRL_PGDN ) - ELSEIF MODE = AC_HITBOTTOM - KEYBOARD Chr( 31 ) + ELSEIF MODE == AC_HITBOTTOM + KEYBOARD Chr( K_CTRL_PGUP ) - ELSEIF MODE = AC_EXCEPT + ELSEIF MODE == AC_EXCEPT - IF THEKEY = 32 // space bar to select/unselect + IF THEKEY == K_SPACE // space bar to select/unselect RETVAL := AC_SELECT - ELSEIF THEKEY == -4 // F5 (select all itens) + ELSEIF THEKEY == K_F5 // (select all itens) lAdd := !lAdd RETVAL := AC_SELECT - ELSEIF THEKEY = 27 + ELSEIF THEKEY == K_ESC RETVAL := AC_ABORT - ELSEIF THEKEY = 13 .AND. SOMEITEMS < 1 + ELSEIF THEKEY = K_ENTER .AND. SOMEITEMS < 1 RETVAL := AC_ABORT - KEYBOARD CHR( 13 ) - ELSEIF THEKEY = 13 - KEYBOARD CHR( 24 ) + KEYBOARD CHR( K_ENTER ) + ELSEIF THEKEY = K_ENTER + KEYBOARD CHR( K_DOWN ) RETVAL := AC_ABORT ENDIF @@ -254,9 +257,9 @@ LOCAL cItem := "" FOR EACH cItem IN aIn - cItem := Substr( cItem, 1, At( ' ', cItem ) - 1 ) + cItem := Substr( cItem, 1, At( " ", cItem ) - 1 ) - AAdd( aRet, Substr( cItem, 1, At( ' ', cItem ) ) ) + AAdd( aRet, Substr( cItem, 1, At( " ", cItem ) ) ) NEXT RETURN aRet diff --git a/harbour/utils/hbmake/pickfile.prg b/harbour/utils/hbmake/pickfile.prg index 4c4e1f89ae..4ba06fdd0e 100644 --- a/harbour/utils/hbmake/pickfile.prg +++ b/harbour/utils/hbmake/pickfile.prg @@ -58,12 +58,12 @@ Returns : Character file name of selected file or "" if nothing picked. - Example : yourfile := pickfile( '*.dbf' ) + Example : yourfile := pickfile( "*.dbf" ) if empty(yourfile) - ? 'You pressed Escape or No Matching File' + ? "You pressed Escape or No Matching File" else - ? 'The file you selected is: '+yourfile + ? "The file you selected is: "+yourfile endif Released to Public Domain by Author. @@ -73,7 +73,7 @@ #include "common.ch" #include "box.ch" #ifndef __HARBOUR__ -#include 'hbclip.ch' +#include "hbclip.ch" #endif #include "directry.ch" @@ -91,10 +91,10 @@ function pickfile( cFileSpec ) local cOldString := savescreen( 8, 19, 16, 61 ) local aFiles as array := directory( cFileSpec ) local aPickList := {} -local cRetVal := '' +local cRetVal := "" local sel -default cFileSpec to '*.*' +default cFileSpec to "*.*" dispbox( 8, 19, 16, 61, B_SINGLE + " ", "+W/R" ) @@ -102,13 +102,13 @@ if len( aFiles ) > 0 aeval( aFiles, { | xx | aadd( aPickList, ; pad( xx[ F_NAME ], 13 ) + ; - str( xx[ F_SIZE ], 8 ) + ' ' + ; - dtoc( xx[ F_DATE ] ) + ' ' + ; + str( xx[ F_SIZE ], 8 ) + " " + ; + dtoc( xx[ F_DATE ] ) + " " + ; xx[ F_TIME ] ) } ) sel := achoice( 9, 20, 15, 60, aPickList ) - cRetVal := iif( lastkey() == 27, '', aFiles[ sel, 1 ] ) + cRetVal := iif( lastkey() == 27, "", aFiles[ sel, 1 ] ) else @@ -124,7 +124,7 @@ function pickafile( afiles ) local cOldString := savescreen( 8, 19, 16, 61 ) local aPickList := {} -local cRetVal := '' +local cRetVal := "" local sel /*default cFileSpec to '*.*'*/ @@ -138,7 +138,7 @@ if len( aFiles ) > 0 sel := AChoice( 9, 20, 15, 60, aFiles ) - cRetVal := iif( lastkey() == 27, '', substr(aFiles[ sel ],1,at(' ',afiles[sel])-1) ) + cRetVal := iif( lastkey() == 27, "", substr(aFiles[ sel ],1,at(" ",afiles[sel])-1) ) endif diff --git a/harbour/utils/hbmake/tmake.prg b/harbour/utils/hbmake/tmake.prg index c1aaf86559..41838bd18c 100644 --- a/harbour/utils/hbmake/tmake.prg +++ b/harbour/utils/hbmake/tmake.prg @@ -72,7 +72,7 @@ DATA aObjs Init {} DATA aObjsc Init {} DATA aRes Init {} DATA nLinkHandle -DATA cLinkcomm Init '' +DATA cLinkcomm Init "" DATA lCompress Init .F. DATA lForce Init .F. DATA lLinux Init .F. @@ -165,7 +165,7 @@ METHOD ReadMakefile(cFile) CLASS THbMake LOCAL cCom := "#COMMANDS" LOCAL cBuild := "#BUILD" LOCAL cTemp := "" - LOCAL cTemp1 := '' + LOCAL cTemp1 := "" LOCAL aTemp := {} LOCAL lMacrosec := .f. LOCAL lBuildSec := .f. @@ -178,7 +178,7 @@ METHOD ReadMakefile(cFile) CLASS THbMake Local cObjitem Local cRes := "" Local cItem - LOCAL lLinux := At( 'linux', Lower( Os() ) ) > 0 + LOCAL lLinux := At( "linux", Lower( Os() ) ) > 0 Local lExtended := .T., szProject LOCAL lPrgObjRule := .F. @@ -235,7 +235,7 @@ METHOD ReadMakefile(cFile) CLASS THbMake IF lmacrosec - IF Alltrim( Left( ctemp, 7 ) ) <> '!ifndef' .and. Alltrim( Left( ctemp, 6 ) ) <> "!endif" .and. Alltrim( Left( ctemp, 7 ) ) <> '!iffile' .and. Alltrim( Left( ctemp, 7 ) ) <> '!stdout' .and. Alltrim( Left( ctemp, 6 ) ) <> '!ifdef' + IF Alltrim( Left( ctemp, 7 ) ) <> "!ifndef" .and. Alltrim( Left( ctemp, 6 ) ) <> "!endif" .and. Alltrim( Left( ctemp, 7 ) ) <> "!iffile" .and. Alltrim( Left( ctemp, 7 ) ) <> "!stdout" .and. Alltrim( Left( ctemp, 6 ) ) <> "!ifdef" IF Len( aTemp ) > 1 @@ -545,8 +545,8 @@ METHOD ReplaceMacros( cMacros ) CLass THBMAKE aTempMacros := Listasarray2( cMacros, " " ) - AEval( aTempMacros, { | xMacro | If( At( "$", xMacro ) > 0, ; - IF( At( ";", xMacro ) > 0, ( aLocalMacros := Listasarray2( xMacro, ";" ), ; + AEval( aTempMacros, { | xMacro | iif( At( "$", xMacro ) > 0, ; + iif( At( ";", xMacro ) > 0, ( aLocalMacros := Listasarray2( xMacro, ";" ), ; Aeval( aLocalMacros, { | x | ::FindMacro( x, @cMacros ) } ) ), ; ::FindMacro( xMacro, @cMacros ) ), ) } ) @@ -576,7 +576,7 @@ METHOD FindMacro( cMacro, cRead ) CLASS THBMAKE nPos := Ascan( ::aMacros, { | x | "$(" + Alltrim( x[ 1 ] ) + ")" == cMacro } ) - IF nPos = 0 + IF nPos == 0 cTemp := Strtran( cMacro, "$(", "" ) cTemp := Strtran( cTemp, ")", "" )
" + cLink + "" +cinfo +'
" + cLink + "" +cinfo +"