From f2db0b0ba1e9adf5e9d842e7a31873fdff628967 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 7 Aug 2008 23:23:09 +0000 Subject: [PATCH] 2008-08-08 01:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/genhtm.sh ! Minor fix to previous commit. * utils/hbdoc/rtf.prg * utils/hbdoc/genos2.prg * utils/hbdoc/genng.prg * utils/hbdoc/genasc.prg * utils/hbdoc/hbdocdef.ch * utils/hbdoc/genchm.prg * utils/hbdoc/os2.prg * utils/hbdoc/ng.prg * utils/hbdoc/genhpc.prg * utils/hbdoc/html.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 ! Fixed to not convert filenames to uppercase. (sf.net #1673895) ! Formatting. * <> -> !=, .f. -> .F., .t. -> .T. ! = -> ==/:= (where the intent was clear) ! Added newline to the end of files. --- harbour/ChangeLog | 27 ++++ harbour/doc/genhtm.sh | 2 +- harbour/utils/hbdoc/ft_funcs.prg | 6 +- harbour/utils/hbdoc/genasc.prg | 16 +- harbour/utils/hbdoc/genchm.prg | 240 +++++++++++++++--------------- harbour/utils/hbdoc/genhpc.prg | 22 +-- harbour/utils/hbdoc/genhtm.prg | 244 +++++++++++++++---------------- harbour/utils/hbdoc/genng.prg | 118 +++++++-------- harbour/utils/hbdoc/genos2.prg | 88 +++++------ harbour/utils/hbdoc/genpdf1.prg | 84 +++++------ harbour/utils/hbdoc/genrtf.prg | 90 ++++++------ harbour/utils/hbdoc/gentrf.prg | 18 +-- harbour/utils/hbdoc/hbdoc.prg | 97 ++++++------ harbour/utils/hbdoc/hbdocdef.ch | 4 +- harbour/utils/hbdoc/html.prg | 14 +- harbour/utils/hbdoc/ng.prg | 4 +- harbour/utils/hbdoc/os2.prg | 16 +- harbour/utils/hbdoc/rtf.prg | 2 +- harbour/utils/hbdoc/troff.prg | 2 +- 19 files changed, 561 insertions(+), 533 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 05a300a370..317e8208c1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,33 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-08 01:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * doc/genhtm.sh + ! Minor fix to previous commit. + + * utils/hbdoc/rtf.prg + * utils/hbdoc/genos2.prg + * utils/hbdoc/genng.prg + * utils/hbdoc/genasc.prg + * utils/hbdoc/hbdocdef.ch + * utils/hbdoc/genchm.prg + * utils/hbdoc/os2.prg + * utils/hbdoc/ng.prg + * utils/hbdoc/genhpc.prg + * utils/hbdoc/html.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 + ! Fixed to not convert filenames to uppercase. (sf.net #1673895) + ! Formatting. + * <> -> !=, .f. -> .F., .t. -> .T. + ! = -> ==/:= (where the intent was clear) + ! Added newline to the end of files. + 2008-08-08 00:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + doc/genhtm.sh + Added Linux/Unix make file for docs (sf.net #1673897) diff --git a/harbour/doc/genhtm.sh b/harbour/doc/genhtm.sh index 4bea936dc0..2d67051bc1 100755 --- a/harbour/doc/genhtm.sh +++ b/harbour/doc/genhtm.sh @@ -3,7 +3,7 @@ # $Id$ # -hbdoc -htm genhtm.lnk genhtm.rsp +../bin/hbdoc -htm genhtm.lnk genhtm.rsp cd htm # echo "renaming harbour.htm to index.htm" diff --git a/harbour/utils/hbdoc/ft_funcs.prg b/harbour/utils/hbdoc/ft_funcs.prg index 27628c1971..6e96ff3917 100644 --- a/harbour/utils/hbdoc/ft_funcs.prg +++ b/harbour/utils/hbdoc/ft_funcs.prg @@ -108,8 +108,8 @@ FUNCTION FT_FUSE( cFile AS STRING, nMode AS NUMERIC) IF cFile == Nil theHandle:closefile() ENDIF - IF cFile <> Nil - IF nMode <> 0 + IF cFile != Nil + IF nMode != 0 theHandle := FileBase():new( cFile ):open() ELSE theHandle := FileBase():new( cFile ):open() @@ -223,7 +223,7 @@ 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. ; + .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( "@" ) ) ; diff --git a/harbour/utils/hbdoc/genasc.prg b/harbour/utils/hbdoc/genasc.prg index 235855f094..110773c58f 100644 --- a/harbour/utils/hbdoc/genasc.prg +++ b/harbour/utils/hbdoc/genasc.prg @@ -207,7 +207,7 @@ FUNCTION ASCIIFiles() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF @@ -298,7 +298,7 @@ FUNCTION ASCIIFiles() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -512,7 +512,7 @@ FUNCTION ASCIIFiles() ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -530,7 +530,7 @@ FUNCTION ASCIIFiles() lBlankLine := EMPTY( cBuffer ) FWRITE( nWriteHandle, " " + cBuffer + CRLF ) nDocCnt ++ - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -547,7 +547,7 @@ FUNCTION ASCIIFiles() lBlankLine := EMPTY( cBuffer ) FWRITE( nWriteHandle, cBuffer + CRLF ) nDocCnt ++ - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -563,11 +563,11 @@ FUNCTION ASCIIFiles() ENDIF FWRITE( nWriteHandle, cBuffer + CRLF ) nDocCnt ++ - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE IF .NOT. EMPTY( cBuffer ) IF nDocCnt > 62 .AND. .NOT. lContinuous FWRITE( nWriteHandle, CHR( K_CTRL_L ) + CRLF ) @@ -581,7 +581,7 @@ FUNCTION ASCIIFiles() + ALLTRIM( cBuffer ) + CRLF ) nDocCnt ++ ENDIF - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) FWRITE( nWriteHandle, " Status" + CRLF ) ENDIF diff --git a/harbour/utils/hbdoc/genchm.prg b/harbour/utils/hbdoc/genchm.prg index 31d75390d7..336a0ca03c 100644 --- a/harbour/utils/hbdoc/genchm.prg +++ b/harbour/utils/hbdoc/genchm.prg @@ -83,7 +83,7 @@ STATIC atiTable := {} STATIC nNumTableItems := 0 STATIC aCurDoc := {} STATIC nCurDoc := 1 -STATIC lWasTestExamples := .f. +STATIC lWasTestExamples := .F. STATIC aColorTable := { 'aqua', 'black', 'fuchia', 'grey', 'green', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow' } @@ -226,7 +226,7 @@ FUNCTION ProcessChm() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) cBuffer := STRTRAN( cBuffer, CHR( 10 ), '' ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -298,11 +298,11 @@ FUNCTION ProcessChm() lClassDoc := .F. IF lEndReturns .AND. lClassDoc - lEndReturns := .f. + lEndReturns := .F. oChm:WriteText( "

" ) ENDIF IF lEndArgs .AND. lClassDoc - lEndArgs := .f. + lEndArgs := .F. oChm:WriteText( "

" ) ENDIF @@ -340,7 +340,7 @@ FUNCTION ProcessChm() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -357,7 +357,7 @@ FUNCTION ProcessChm() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 36 + IF LEN( cFileName ) == 36 cFileName := STUFF( cFileName, 36, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -403,10 +403,10 @@ FUNCTION ProcessChm() oChm:WriteText( "" ) else oChm:WriteText( "

" ) - lWasTestExamples:=.f. + lWasTestExamples:=.F. endif - lEndDesc := .f. + lEndDesc := .F. ENDIF oChm:WriteText( '
' ) @@ -456,7 +456,7 @@ FUNCTION ProcessChm() IF AT( cSyn, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) - oChm:WriteParBold( " Syntax", .f., .f. ) + oChm:WriteParBold( " Syntax", .F., .F. ) oChm:WriteText( '

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

' ) nMode := D_SYNTAX lAddBlank := .T. @@ -477,7 +477,7 @@ end nMode := D_ARG lAddBlank := .T. - lEndArgs := .t. + lEndArgs := .T. end ELSEIF AT( cRet, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -489,7 +489,7 @@ end oChm:WriteText( '

' ) nMode := D_ARG lAddBlank := .T. - lEndReturns := .t. + lEndReturns := .T. end ELSEIF AT( cDesc, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -502,7 +502,7 @@ end nMode := D_DESCRIPTION lAddBlank := .T. - lEndDesc := .t. + lEndDesc := .T. end ELSEIF AT( cdatalink, cBuffer ) > 0 @@ -562,18 +562,18 @@ oChm:writeText("
") //:endpar() nMode := D_EXAMPLE lAddBlank := .T. lAddEndPreTag := .T. - lWasTestExamples:=.t. + lWasTestExamples:=.T. end ELSEIF AT( cTest, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) IF !lBlankLine // oChm:WritePar( "" ) ENDIF - oChm:WriteParBold( " Tests", .t., .f. ) + oChm:WriteParBold( " Tests", .T., .F. ) oChm:WriteText( "

" ) nMode := D_EXAMPLE lAddBlank := .T. - lWasTestExamples:=.t. + lWasTestExamples:=.T. end ELSEIF AT( cStatus, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -632,7 +632,7 @@ oChm:writeText("
") //:endpar() // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -643,7 +643,7 @@ oChm:writeText("
") //:endpar() ENDIF procChmdesc( cbuffer, oChm, "Syntax" ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -654,7 +654,7 @@ oChm:writeText("
") //:endpar() ENDIF procChmdesc( cbuffer, oChm, "Arguments" ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -667,14 +667,14 @@ oChm:writeText("
") //:endpar() ENDIF ProcChmDesc( cBuffer, oChm ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) procChmdesc( cBuffer, oChm, "Example" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -682,11 +682,11 @@ oChm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) procChmdesc( cBuffer, oChm, "Description" ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_DATALINK + ELSEIF nMode == D_DATALINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -698,7 +698,7 @@ oChm:writeText("
") //:endpar() cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) oChm:WriteText( "

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

') - ELSEIF nMode = D_METHODLINK + ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -713,13 +713,13 @@ oChm:writeText("
") //:endpar() oChm:writetext('

') endif - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine ENDIF ENDIF - ELSEIF nMode = D_DATALINK + ELSEIF nMode == D_DATALINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -731,7 +731,7 @@ oChm:writeText("
") //:endpar() cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) oChm:WriteText( "" + cBuffer + '' ) - ELSEIF nMode = D_METHODLINK + ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -743,7 +743,7 @@ oChm:writeText("
") //:endpar() cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) ) oChm:WriteText( "" + cBuffer + '' ) - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -751,15 +751,15 @@ oChm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) procChmdesc( cBuffer, oChm, "Compliance" ) - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) If lWasTestExamples - oChm:WriteParBold( "Status",.t.,.f. ) + oChm:WriteParBold( "Status",.T.,.F. ) Else oChm:WriteParBold( "Status" ) oChm:WriteText( "
" ) Endif - lWasTestExamples:=.f. + lWasTestExamples:=.F. ENDIF ProcStatusChm( oChm, cBuffer ) @@ -872,7 +872,7 @@ FUNCTION ProcessChm2() cFileName := "" FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) - IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -884,10 +884,10 @@ FUNCTION ProcessChm2() DO WHILE nEnd > 0 nEnd := ASCAN(aDocInfo, { | a | a[ 2 ] == cFileName + ".htm" }) IF nEnd > 0 - IF LEN( cFileName ) = 36 + IF LEN( cFileName ) == 36 cFileName := STUFF( cFileName, 36, 1, STR( nCount, 1, 0 ) ) ELSE - cFileName = cFileName + STR( nCount, 1, 0 ) + cFileName := cFileName + STR( nCount, 1, 0 ) ENDIF nCount ++ ENDIF @@ -921,12 +921,12 @@ FUNCTION ProcessChm2() IF ASCAN(aCurDoc[nArrayItem], " $CLASS$") > 0 // Write class name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("" + cTempString + " - Class overview") oHtmClass:WriteText("
Class " + cTempString + "
") @@ -935,17 +935,17 @@ FUNCTION ProcessChm2() AADD(aDocInfo, { cTempString, cFileName, "C1", {} }) // Write oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
" + cTempString + "
") // Write inheritance - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "INHERITS" $ UPPER(a)}) + 1 - IF nArrayItemLine - 1 <> 0 .AND. !EMPTY(aCurDoc[nArrayItem][nArrayItemLine]) //.AND. FILE(aCurDoc[nArrayItem][nArrayItemLine] + ".txt") + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "INHERITS" $ UPPER(a)}) + 1 + IF nArrayItemLine - 1 != 0 .AND. !EMPTY(aCurDoc[nArrayItem][nArrayItemLine]) //.AND. FILE(aCurDoc[nArrayItem][nArrayItemLine] + ".txt") cInherits := aCurDoc[nArrayItem][nArrayItemLine] cTempString := "" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + "" ELSE @@ -986,11 +986,11 @@ FUNCTION ProcessChm2() oHtmClassContent:WriteText("") // Write class name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("" + cTempString + " - Class details") oHtmClassContent:WriteText("
Class " + cTempString + "
") @@ -999,16 +999,16 @@ FUNCTION ProcessChm2() ELSEIF ASCAN(aCurDoc[nArrayItem], " $DATA$") > 0 IF oHtmClassContent:nHandle > 0 // Write property name - IF nPropertyListAnker = .F. + IF nPropertyListAnker == .F. oHtmClassContent:WriteText("") - nPropertyListAnker = .t. + nPropertyListAnker := .T. ENDIF - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "DATA" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "DATA" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
Property " + cTempString + "
") @@ -1019,11 +1019,11 @@ FUNCTION ProcessChm2() AADD(aDocInfo[LEN(aDocInfo)][4], {"Data", cTempString}) // Write property oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
" + cTempString + "
") @@ -1033,27 +1033,27 @@ FUNCTION ProcessChm2() ELSEIF ASCAN(aCurDoc[nArrayItem], " $METHOD$") > 0 IF oHtmClassContent:nHandle > 0 // Write method name - IF nMethodListAnker = .F. + IF nMethodListAnker == .F. oHtmClassContent:WriteText("") - nMethodListAnker = .t. + nMethodListAnker := .T. ENDIF - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "METHOD" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "METHOD" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
Method " + cTempString + "
") AADD(aDocInfo[LEN(aDocInfo)][4], {"Method", cTempString}) // Write method oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
" + cTempString + "
") @@ -1067,16 +1067,16 @@ FUNCTION ProcessChm2() ENDIF ELSE // Write function name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "FUNCNAME" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "FUNCNAME" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
Function " + cTempString + "
") // Add function name and filename to the docinfo array - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CATEGORY" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CATEGORY" $ UPPER(a)}, 2) + 1 cTempString2 := aCurDoc[nArrayItem][nArrayItemLine] IF cTempString2 $ "WinAPI" AADD( aDocInfo, { cTempString, cFileName, "F2" } ) @@ -1085,11 +1085,11 @@ FUNCTION ProcessChm2() ENDIF // Write function oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
" + cTempString + "
") @@ -1140,15 +1140,15 @@ RETURN NIL FUNCTION WriteClass3(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 - IF nArrayItemLine - 1 <> 0 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + IF nArrayItemLine - 1 != 0 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ELSE cTempString := "-" ENDIF - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1170,7 +1170,7 @@ FUNCTION WriteClassDataMethod3(cItem, cTitle, nArrayItem, nArrayItemLine) cTempString := "" DO WHILE nArrayItem <= LEN(aCurDoc) nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "$" + UPPER(cItem) + "$" $ UPPER(a)}) + 1 - IF nArrayItemLine -1 <> 0 + IF nArrayItemLine -1 != 0 AADD(aTmpArray, {"• " + aCurDoc[nArrayItem][nArrayItemLine] + "
", aCurDoc[nArrayItem][nArrayItemLine]}) nTmpCount ++ ENDIF @@ -1179,7 +1179,7 @@ FUNCTION WriteClassDataMethod3(cItem, cTitle, nArrayItem, nArrayItemLine) ASORT(aTmpArray,,, {|x, y| UPPER(x[2]) < UPPER(y[2])}) FOR nTmpCount := 1 TO LEN(aTmpArray) - cTempString = cTempString + aTmpArray[nTmpCount][1] + cTempString := cTempString + aTmpArray[nTmpCount][1] NEXT IF EMPTY(cTempString) cTempString := "-" @@ -1188,8 +1188,8 @@ FUNCTION WriteClassDataMethod3(cItem, cTitle, nArrayItem, nArrayItemLine) oHtmClass:WriteText("
» " + cTitle + "
") oHtmClass:WriteText("
" + cTempString + "
") - nArrayItem = nPrevArrayItem - nArrayItemLine = nPrevArrayItemLine + nArrayItem := nPrevArrayItem + nArrayItemLine := nPrevArrayItemLine LinkInheritance3(cItem) RETURN NIL @@ -1199,7 +1199,7 @@ FUNCTION LinkInheritance3(cItem) LOCAL nTemp1 := 1 DO WHILE nTemp1 <= LEN(aDirList) - IF UPPER(aDirList[nTemp1][1]) = UPPER(cInherits + ".TXT") + IF UPPER(aDirList[nTemp1][1]) == UPPER(cInherits + ".txt") oHtmClass:WriteText("
• " + IIF(cItem ="Data", "Properties", "Methods") + " inherited via " + cInherits + "
") ENDIF nTemp1 ++ @@ -1210,11 +1210,11 @@ RETURN NIL FUNCTION WriteData3(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1228,11 +1228,11 @@ RETURN NIL FUNCTION WriteMethod3(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1248,9 +1248,9 @@ FUNCTION WriteFunction3(cItem, cTitle) nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := aCurDoc[nArrayItem][nArrayItemLine] - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat3(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1271,12 +1271,12 @@ FUNCTION HTMFormat3(cTempString) cTmpChar := SUBSTR(cTmpString1, nTmpCount, 1) DO CASE - CASE cTmpChar = "<" - cTmpString2 = cTmpString2 + "<" - CASE cTmpChar = ">" - cTmpString2 = cTmpString2 + ">" + CASE cTmpChar == "<" + cTmpString2 := cTmpString2 + "<" + CASE cTmpChar == ">" + cTmpString2 := cTmpString2 + ">" OTHERWISE - cTmpString2 = cTmpString2 + cTmpChar + cTmpString2 := cTmpString2 + cTmpChar ENDCASE nTmpCount ++ @@ -1321,7 +1321,7 @@ FUNCTION ProcChmAlso( nWriteHandle, cSeeAlso ) LOCAL xPos LOCAL tPos nLen := LEN( cSeeAlso ) - WHILE .t. + WHILE .T. nPos := AT( ",", cSeeAlso ) IF nPos > 0 xTemp := SUBSTR( ALLTRIM( cSeeAlso ), 1, nPos - 1 ) @@ -1417,8 +1417,8 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) LOCAL cline := '' LOCAL cOldLine := '' LOCAL cBuffend := '' - LOCAL lEndBuffer := .f. - LOCAL lArgBold := .f. + LOCAL lEndBuffer := .F. + LOCAL lArgBold := .F. LOCAL npos //LOCAL nposend // Variable not used in fucntion, it may be deleted? creturn := cBuffer + ' ' @@ -1432,20 +1432,20 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. - // TheBlank := .t. + lEndBuffer := .T. + // TheBlank := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1497,19 +1497,19 @@ FUNCTION FormatChmBuff( cBuffer, cStyle ) cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. - // TheBlank := .t. + lEndBuffer := .T. + // TheBlank := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1589,13 +1589,13 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) LOCAL lEndPar := .F. LOCAL cLine := '' LOCAL lEndFixed := .F. - LOCAL lArgBold := .f. + LOCAL lArgBold := .F. LOCAL LFstTableItem := .T. LOCAL lEndTable := .F. - LOCAL lEndBuffer := .f. + LOCAL lEndBuffer := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF @@ -1603,8 +1603,8 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) oChm:WriteText( "

" ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -1698,7 +1698,7 @@ 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 .OR. !EMPTY( cBuffer ) if AT( '', cBuffer ) > 0 lHasFixed:=.T. else @@ -1715,15 +1715,15 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) DO WHILE !lendFixed cOldLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cOldLine ) > 0 - lendfixed := .t. + lendfixed := .T. cOldLine := ALLTRIM(STRTRAN( cOldLine, "", "" )) ENDIF - IF AT( DELIM, cOldLine ) = 0 + IF AT( DELIM, cOldLine ) == 0 cReturn += ALLTRIM( cOldLine ) + ' ' ENDIF IF AT( DELIM, cOldLine ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF IF AT( DELIM, cOldLine ) == 0 .and. !lendfixed @@ -1737,12 +1737,12 @@ FUNCTION ProcChmDesc( cBuffer, oChm, cStyle ) DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 - lendTable := .t. + lendTable := .T. ELSE IF LFstTableItem nNumTableItems := GetNumberofTableItems( cLine ) procChmtable( cline, nNumTableItems ) - LFstTableItem := .f. + LFstTableItem := .F. ELSE procChmtable( cline, nNumTableItems ) ENDIF @@ -1817,7 +1817,7 @@ FUNCTION ProcChmTable( cBuffer, nNum ) cItem4 := SUBSTR( cBuffer, 1 ) ENDIF ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) AADD( asiTable, "" + cItem2 + '' ) ELSE @@ -1825,12 +1825,12 @@ FUNCTION ProcChmTable( cBuffer, nNum ) AADD( asiTable, cItem2 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( atiTable, "" + cItem3 + '' ) ELSE AADD( atiTable, cItem3 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afoiTable, "" + cItem4 + '' ) ELSE AADD( afoiTable, cItem4 ) @@ -1920,12 +1920,12 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF RETURN lReturn -*+ EOF: GENNG.PRG \ No newline at end of file +*+ EOF: GENNG.PRG diff --git a/harbour/utils/hbdoc/genhpc.prg b/harbour/utils/hbdoc/genhpc.prg index 9d446a969d..fcc859ca7c 100644 --- a/harbour/utils/hbdoc/genhpc.prg +++ b/harbour/utils/hbdoc/genhpc.prg @@ -204,7 +204,7 @@ FUNCTION ProcessFiles() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -280,7 +280,7 @@ FUNCTION ProcessFiles() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -297,7 +297,7 @@ FUNCTION ProcessFiles() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 8 + IF LEN( cFileName ) == 8 cFileName := STUFF( cFileName, 8, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -457,7 +457,7 @@ FUNCTION ProcessFiles() ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -468,7 +468,7 @@ FUNCTION ProcessFiles() lAddBlank := .F. ENDIF FWRITE( nWriteHandle, cBuffer + CRLF ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -481,7 +481,7 @@ FUNCTION ProcessFiles() cBuffer := STRTRAN( cBuffer, "<", "<", 1 ) cBuffer := STRTRAN( cBuffer, ">", ">", 1 ) FWRITE( nWriteHandle, cBuffer + CRLF ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -492,11 +492,11 @@ FUNCTION ProcessFiles() lAddBlank := .F. ENDIF FWRITE( nWriteHandle, StripNgControls( cBuffer ) + CRLF ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine @@ -505,14 +505,14 @@ FUNCTION ProcessFiles() FWRITE( nWriteHandle, " Header File: " ; + ALLTRIM( cBuffer ) + CRLF ) ENDIF - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) FWRITE( nWriteHandle, ".par bold on" + CRLF ) FWRITE( nWriteHandle, " Status" + CRLF ) FWRITE( nWriteHandle, ".endpar" + CRLF ) ENDIF ProcStatus( nWriteHandle, StripNgControls( cBuffer ) ) - ELSEIF nMode = D_TESTS + ELSEIF nMode == D_TESTS IF !EMPTY( cBuffer ) FWRITE( nWriteHandle, ".par bold on" + CRLF ) FWRITE( nWriteHandle, " Tests" + CRLF ) @@ -558,7 +558,7 @@ FUNCTION Proccalso( nWriteHandle, cSeeAlso ) LOCAL xPos LOCAL tPos nLen := LEN( cSeeAlso ) - WHILE .t. + WHILE .T. nPos := AT( ",", cSeeAlso ) IF nPos > 0 diff --git a/harbour/utils/hbdoc/genhtm.prg b/harbour/utils/hbdoc/genhtm.prg index 4b71dd5574..ff5a1f125f 100644 --- a/harbour/utils/hbdoc/genhtm.prg +++ b/harbour/utils/hbdoc/genhtm.prg @@ -84,7 +84,7 @@ STATIC aCurDoc := {} // x static cLastText := "" Static clastBuffer := "" STATIC nCurDoc := 1 -STATIC lWasTestExamples := .f. +STATIC lWasTestExamples := .F. STATIC aColorTable := { 'aqua', 'black', 'fuchia', 'grey', 'green', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal', 'white', 'yellow' } // Static variables added for the htm2 addition @@ -201,7 +201,7 @@ FUNCTION ProcessWww() // Open file for input - nCommentLen := IIF( AT( ".ASM", UPPER( aDirList[ i, F_NAME ] ) ) > 0, 2, 4 ) + nCommentLen := IIF( AT( ".asm", Lower( aDirList[ i, F_NAME ] ) ) > 0, 2, 4 ) nReadHandle := FT_FUSE( aDirList[ i, F_NAME ] ) #ifdef GAUGE if i == 1 @@ -248,7 +248,7 @@ FUNCTION ProcessWww() cBuffer := STRTRAN( cBuffer, CHR( 10 ), '' ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -296,7 +296,7 @@ FUNCTION ProcessWww() AADD( aDocInfo, { cCategory, cFuncName, cOneLine, cFileName } ) nPos := ascan(aResult,{|a| UPPER(a) == UPPER(cCategory)}) if nPos==0 - if cCategory<>"Document" + if cCategory!="Document" aadd(aResult,cCategory) endif endif @@ -324,11 +324,11 @@ FUNCTION ProcessWww() lData := .F. lMethod := .F. IF lEndReturns .AND. lClassDoc - lEndReturns := .f. + lEndReturns := .F. oHtm:WriteText( "" ) ENDIF IF lEndArgs .AND. lClassDoc - lEndArgs := .f. + lEndArgs := .F. oHtm:WriteText( "

" ) ENDIF @@ -371,7 +371,7 @@ FUNCTION ProcessWww() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -388,7 +388,7 @@ FUNCTION ProcessWww() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 36 + IF LEN( cFileName ) == 36 cFileName := STUFF( cFileName, 36, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -432,12 +432,12 @@ FUNCTION ProcessWww() cFuncname := SUBSTR( cFuncName, 1, AT( "(", cFuncName ) - 1 ) ENDIF IF lEndDesc .AND. lClassDoc - lEndDesc := .f. + lEndDesc := .F. if lWasTestExamples oHtm:WriteText( "" ) else oHtm:WriteText( "

" ) - lWasTestExamples:=.f. + lWasTestExamples:=.F. endif ENDIF @@ -488,7 +488,7 @@ FUNCTION ProcessWww() IF AT( cSyn, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) - oHtm:WriteParBold( " Syntax", .f., .f. ) + oHtm:WriteParBold( " Syntax", .F., .F. ) ohtm:WriteText( '
' ) nMode := D_SYNTAX lAddBlank := .T. @@ -496,7 +496,7 @@ FUNCTION ProcessWww() end ELSEIF AT( cConstruct, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) - oHtm:WriteParBold( " Constructor syntax", .F., .f. ) + oHtm:WriteParBold( " Constructor syntax", .F., .F. ) ohtm:WriteText( '
' ) nMode := D_SYNTAX lAddBlank := .T. @@ -509,7 +509,7 @@ end nMode := D_ARG lAddBlank := .T. - lEndArgs := .t. + lEndArgs := .T. end ELSEIF AT( cRet, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -521,7 +521,7 @@ end ohtm:WriteText( '
' ) nMode := D_ARG lAddBlank := .T. - lEndReturns := .t. + lEndReturns := .T. end ELSEIF AT( cDesc, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -534,7 +534,7 @@ end nMode := D_DESCRIPTION lAddBlank := .T. - lEndDesc := .t. + lEndDesc := .T. end ELSEIF AT( cdatalink, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -593,7 +593,7 @@ oHtm:writeText("
") //:endpar() nMode := D_EXAMPLE lAddBlank := .T. lAddEndPreTag := .T. - lWasTestExamples:=.t. + lWasTestExamples:=.T. end ELSEIF AT( cTest, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -604,7 +604,7 @@ oHtm:writeText("
") //:endpar() // oHtm:WriteText( "
" ) nMode := D_EXAMPLE lAddBlank := .T. - lWasTestExamples:= .t. + lWasTestExamples:= .T. end ELSEIF AT( cStatus, cBuffer ) > 0 if GetItem( cBuffer, nCurdoc ) @@ -663,7 +663,7 @@ oHtm:writeText("
") //:endpar() // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -674,7 +674,7 @@ oHtm:writeText("
") //:endpar() ENDIF prochtmdesc( cbuffer, oHtm, "Syntax" ,cFileName) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -685,7 +685,7 @@ oHtm:writeText("
") //:endpar() ENDIF prochtmdesc( cbuffer, oHtm, "Arguments" ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -698,14 +698,14 @@ oHtm:writeText("
") //:endpar() ENDIF ProcHtmDesc( cBuffer, oHtm ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) prochtmdesc( cBuffer, oHtm, "Example" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -713,17 +713,17 @@ oHtm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) prochtmdesc( cBuffer, oHtm, "Description" ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine ENDIF ENDIF - ELSEIF nMode = D_DATALINK + ELSEIF nMode == D_DATALINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -735,7 +735,7 @@ oHtm:writeText("
") //:endpar() cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) ) ohtm:WriteText( "
" + cBuffer + '
' ) ohtm:writetext('

') - ELSEIF nMode = D_METHODLINK + ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -749,7 +749,7 @@ oHtm:writeText("
") //:endpar() ohtm:WriteText( "
" + cBuffer + '
' ) ohtm:writetext('

') endif - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE // WRITE_ERROR( "General", cBuffer, nLineCnt, ; // LONGLINE, aDirList[ i, F_NAME ] ) @@ -757,15 +757,15 @@ oHtm:writeText("
") //:endpar() lBlankLine := EMPTY( cBuffer ) prochtmdesc( cBuffer, oHtm, "Compliance" ) - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) If lWasTestExamples - oHtm:WriteParBold( "Status",.t.,.f. ) + oHtm:WriteParBold( "Status",.T.,.F. ) Else oHtm:WriteParBold( "Status" ) oHtm:WriteText( "
" ) Endif - lWasTestExamples:=.f. + lWasTestExamples:=.F. ENDIF ProcStatusWww( oHtm, cBuffer ) @@ -832,7 +832,7 @@ FUNCTION ProcessWww2() FOR nTemp1 := 1 TO LEN(aDirList) // Calculate the amount of characters the source files uses each line - nCommentLen := IIF(AT(".ASM", UPPER(aDirList[nTemp1, F_NAME])) > 0, 2, 4) + nCommentLen := IIF(AT(".asm", Lower(aDirList[nTemp1, F_NAME])) > 0, 2, 4) // Select the file to read from nReadHandle := FT_FUSE(aDirList[nTemp1, F_NAME]) @@ -877,7 +877,7 @@ FUNCTION ProcessWww2() cFileName := "" FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) - IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -889,10 +889,10 @@ FUNCTION ProcessWww2() DO WHILE nEnd > 0 nEnd := ASCAN(aDocInfo, { | a | a[ 2 ] == cFileName + ".htm" }) IF nEnd > 0 - IF LEN( cFileName ) = 36 + IF LEN( cFileName ) == 36 cFileName := STUFF( cFileName, 36, 1, STR( nCount, 1, 0 ) ) ELSE - cFileName = cFileName + STR( nCount, 1, 0 ) + cFileName := cFileName + STR( nCount, 1, 0 ) ENDIF nCount ++ ENDIF @@ -928,12 +928,12 @@ FUNCTION ProcessWww2() IF ASCAN(aCurDoc[nArrayItem], " $CLASS$") > 0 // Write class name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. - nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) + nArrayItemLine ++ + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
Class " + cTempString + "
") @@ -941,17 +941,17 @@ FUNCTION ProcessWww2() AADD( aDocInfo, { cTempString, cFileName, "C1" } ) // Write oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
" + cTempString + "
") // Write inheritance - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "INHERITS" $ UPPER(a)}) + 1 - IF nArrayItemLine - 1 <> 0 .AND. !EMPTY(aCurDoc[nArrayItem][nArrayItemLine]) //.AND. FILE(aCurDoc[nArrayItem][nArrayItemLine] + ".txt") + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "INHERITS" $ UPPER(a)}) + 1 + IF nArrayItemLine - 1 != 0 .AND. !EMPTY(aCurDoc[nArrayItem][nArrayItemLine]) //.AND. FILE(aCurDoc[nArrayItem][nArrayItemLine] + ".txt") cInherits := aCurDoc[nArrayItem][nArrayItemLine] cTempString := "" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + "" ELSE @@ -992,11 +992,11 @@ FUNCTION ProcessWww2() oHtmClassContent:WriteText("") // Write class name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CLASS" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
Class " + cTempString + "
") ENDIF @@ -1004,25 +1004,25 @@ FUNCTION ProcessWww2() ELSEIF ASCAN(aCurDoc[nArrayItem], " $DATA$") > 0 IF oHtmClassContent:nHandle > 0 // Write property name - IF nPropertyListAnker = .F. + IF nPropertyListAnker == .F. oHtmClassContent:WriteText("") - nPropertyListAnker = .t. + nPropertyListAnker := .T. ENDIF - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "$DATA$" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "$DATA$" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
Property " + cTempString + "
") // Write property oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
" + cTempString + "
") @@ -1033,25 +1033,25 @@ FUNCTION ProcessWww2() ELSEIF ASCAN(aCurDoc[nArrayItem], " $METHOD$") > 0 IF oHtmClassContent:nHandle > 0 // Write method name - IF nMethodListAnker = .F. + IF nMethodListAnker == .F. oHtmClassContent:WriteText("") - nMethodListAnker = .t. + nMethodListAnker := .T. ENDIF - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "METHOD" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "METHOD" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
Method " + cTempString + "
") // Write method oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClassContent:WriteText("
" + cTempString + "
") @@ -1065,16 +1065,16 @@ FUNCTION ProcessWww2() ENDIF ELSE // Write function name - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "FUNCNAME" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "FUNCNAME" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
Function " + cTempString + "
") // Add function name and filename to the docinfo array - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "CATEGORY" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "CATEGORY" $ UPPER(a)}, 2) + 1 cTempString2 := aCurDoc[nArrayItem][nArrayItemLine] IF cTempString2 $ "WinAPI" AADD( aDocInfo, { cTempString, cFileName, "F2" } ) @@ -1083,11 +1083,11 @@ FUNCTION ProcessWww2() ENDIF // Write function oneliner - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "ONELINER" $ UPPER(a)}, 2) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO oHtmClass:WriteText("
" + cTempString + "
") @@ -1136,15 +1136,15 @@ RETURN NIL FUNCTION WriteClass(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 - IF nArrayItemLine - 1 <> 0 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + IF nArrayItemLine - 1 != 0 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ELSE cTempString := "-" ENDIF - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1166,7 +1166,7 @@ FUNCTION WriteClassDataMethod(cItem, cTitle, nArrayItem, nArrayItemLine) cTempString := "" DO WHILE nArrayItem <= LEN(aCurDoc) nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| "$" + UPPER(cItem) + "$" $ UPPER(a)}) + 1 - IF nArrayItemLine -1 <> 0 + IF nArrayItemLine -1 != 0 AADD(aTmpArray, {"• " + aCurDoc[nArrayItem][nArrayItemLine] + "
", aCurDoc[nArrayItem][nArrayItemLine]}) nTmpCount ++ ENDIF @@ -1175,7 +1175,7 @@ FUNCTION WriteClassDataMethod(cItem, cTitle, nArrayItem, nArrayItemLine) ASORT(aTmpArray,,, {|x, y| UPPER(x[2]) < UPPER(y[2])}) FOR nTmpCount := 1 TO LEN(aTmpArray) - cTempString = cTempString + aTmpArray[nTmpCount][1] + cTempString := cTempString + aTmpArray[nTmpCount][1] NEXT IF EMPTY(cTempString) cTempString := "-" @@ -1184,8 +1184,8 @@ FUNCTION WriteClassDataMethod(cItem, cTitle, nArrayItem, nArrayItemLine) oHtmClass:WriteText("
» " + cTitle + "
") oHtmClass:WriteText("
" + cTempString + "
") - nArrayItem = nPrevArrayItem - nArrayItemLine = nPrevArrayItemLine + nArrayItem := nPrevArrayItem + nArrayItemLine := nPrevArrayItemLine LinkInheritance(cItem) RETURN NIL @@ -1195,7 +1195,7 @@ FUNCTION LinkInheritance(cItem) LOCAL nTemp1 := 1 DO WHILE nTemp1 <= LEN(aDirList) - IF UPPER(aDirList[nTemp1][1]) = UPPER(cInherits + ".TXT") + IF UPPER(aDirList[nTemp1][1]) == UPPER(cInherits + ".txt") oHtmClass:WriteText("
• " + IIF(cItem ="Data", "Properties", "Methods") + " inherited via " + cInherits + "
") ENDIF nTemp1 ++ @@ -1205,11 +1205,11 @@ RETURN NIL FUNCTION WriteData(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1222,11 +1222,11 @@ RETURN NIL FUNCTION WriteMethod(cItem, cTitle) LOCAL cTempString - nArrayItemLine = ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 + nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1241,9 +1241,9 @@ FUNCTION WriteFunction(cItem, cTitle) LOCAL cTempString nArrayItemLine := ASCAN(aCurDoc[nArrayItem], {|a| UPPER(cItem) $ UPPER(a)}) + 1 cTempString := aCurDoc[nArrayItem][nArrayItemLine] - DO WHILE "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] = .F. + DO WHILE !( "$" $ aCurDoc[nArrayItem][nArrayItemLine + 1] ) nArrayItemLine ++ - cTempString = cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) + cTempString := cTempString + "
" + HTMFormat(aCurDoc[nArrayItem][nArrayItemLine]) ENDDO IF EMPTY(cTempString) cTempString := "-" @@ -1264,12 +1264,12 @@ FUNCTION HTMFormat(cTempString) cTmpChar := SUBSTR(cTmpString1, nTmpCount, 1) DO CASE - CASE cTmpChar = "<" - cTmpString2 = cTmpString2 + "<" - CASE cTmpChar = ">" - cTmpString2 = cTmpString2 + ">" + CASE cTmpChar == "<" + cTmpString2 := cTmpString2 + "<" + CASE cTmpChar == ">" + cTmpString2 := cTmpString2 + ">" OTHERWISE - cTmpString2 = cTmpString2 + cTmpChar + cTmpString2 := cTmpString2 + cTmpChar ENDCASE nTmpCount ++ @@ -1316,7 +1316,7 @@ FUNCTION ProcWwwAlso( nWriteHandle, cSeeAlso ) LOCAL xPos LOCAL tPos nLen := LEN( cSeeAlso ) - WHILE .t. + WHILE .T. nPos := AT( ",", cSeeAlso ) IF nPos > 0 xTemp := SUBSTR( ALLTRIM( cSeeAlso ), 1, nPos - 1 ) @@ -1412,8 +1412,8 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) LOCAL cline := '' LOCAL cOldLine := '' LOCAL cBuffend := '' - LOCAL lEndBuffer := .f. - LOCAL lArgBold := .f. + LOCAL lEndBuffer := .F. + LOCAL lArgBold := .F. LOCAL npos creturn := cBuffer + ' ' IF AT( '', creturn ) > 0 .OR. EMPTY( cBuffer ) @@ -1426,20 +1426,20 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. - // TheBlank := .t. + lEndBuffer := .T. + // TheBlank := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1491,19 +1491,19 @@ FUNCTION FormatHtmBuff( cBuffer, cStyle ) cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. - // TheBlank := .t. + lEndBuffer := .T. + // TheBlank := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1583,10 +1583,10 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) LOCAL lEndPar := .F. LOCAL cLine := '' LOCAL lEndFixed := .F. - LOCAL lArgBold := .f. + LOCAL lArgBold := .F. LOCAL LFstTableItem := .T. LOCAL lEndTable := .F. - LOCAL lEndBuffer := .f. + LOCAL lEndBuffer := .F. DEFAULT cStyle TO "Default" DEFAULT cFileName TO NIL @@ -1594,7 +1594,7 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) // tracelog('cBuffer',cBuffer) clastBuffer += cBuffer endif - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF @@ -1602,8 +1602,8 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) oHtm:WriteText( "

" ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -1704,7 +1704,7 @@ 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 .OR. !EMPTY( cBuffer ) if AT( '', cBuffer ) > 0 lHasFixed:=.T. else @@ -1722,16 +1722,16 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) DO WHILE !lendFixed cOldLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cOldLine ) > 0 - lendfixed := .t. + lendfixed := .T. cOldLine := Alltrim(STRTRAN( cOldLine, "", "" )) ENDIF - IF AT( DELIM, cOldLine ) = 0 + IF AT( DELIM, cOldLine ) == 0 cReturn += ALLTRIM( cOldLine ) + ' ' ENDIF IF AT( DELIM, cOldLine ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF @@ -1740,18 +1740,18 @@ FUNCTION ProchtmDesc( cBuffer, oHtm, cStyle ,cFileName) ENDIF ENDDO // oHtm:WriteText( "
" ) - lHasFixed:=.f. + lHasFixed:=.F. END IF AT( '
', cBuffer ) > 0 DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 - lendTable := .t. + lendTable := .T. ELSE IF LFstTableItem nNumTableItems := GetNumberofTableItems( cLine ) prochtmtable( cline, nNumTableItems ) - LFstTableItem := .f. + LFstTableItem := .F. ELSE prochtmtable( cline, nNumTableItems ) ENDIF @@ -1826,7 +1826,7 @@ FUNCTION ProchtmTable( cBuffer, nNum ) cItem4 := SUBSTR( cBuffer, 1 ) ENDIF ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) AADD( asiTable, "" + cItem2 + '' ) ELSE @@ -1834,12 +1834,12 @@ FUNCTION ProchtmTable( cBuffer, nNum ) AADD( asiTable, cItem2 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( atiTable, "" + cItem3 + '' ) ELSE AADD( atiTable, cItem3 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afoiTable, "" + cItem4 + '' ) ELSE AADD( afoiTable, cItem4 ) @@ -1929,9 +1929,9 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF @@ -1941,4 +1941,4 @@ RETURN lReturn function CountDocs(aCurDoc) return len(aCurdoc) #endif -*+ EOF: GENNG.PRG \ No newline at end of file +*+ EOF: GENNG.PRG diff --git a/harbour/utils/hbdoc/genng.prg b/harbour/utils/hbdoc/genng.prg index 194b41e4a8..19f5649b7c 100644 --- a/harbour/utils/hbdoc/genng.prg +++ b/harbour/utils/hbdoc/genng.prg @@ -210,7 +210,7 @@ FUNCTION ProcessiNg() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -296,7 +296,7 @@ FUNCTION ProcessiNg() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -313,7 +313,7 @@ FUNCTION ProcessiNg() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 21 + IF LEN( cFileName ) == 21 cFileName := STUFF( cFileName, 21, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -497,7 +497,7 @@ FUNCTION ProcessiNg() nMode := D_EXAMPLE lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cStatus, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -514,7 +514,7 @@ FUNCTION ProcessiNg() nMode := D_COMPLIANCE lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cPlat, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -525,7 +525,7 @@ FUNCTION ProcessiNg() nMode := D_NORMAL lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cFiles, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -536,7 +536,7 @@ FUNCTION ProcessiNg() nMode := D_NORMAL lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cFunction, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -546,7 +546,7 @@ FUNCTION ProcessiNg() // ENDIF oNgi:WriteParBold( " Functions" ) - lPar := .t. + lPar := .T. nMode := D_NORMAL lAddBlank := .T. ENDIF @@ -563,7 +563,7 @@ FUNCTION ProcessiNg() ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -576,7 +576,7 @@ FUNCTION ProcessiNg() cbuFfer := '' + cBuffer + '' ENDIF procngdesc( cbuffer, oNgi, "Syntax" ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -584,14 +584,14 @@ FUNCTION ProcessiNg() lBlankLine := EMPTY( cBuffer ) procngdesc( cbuffer, oNgi, "Arguments" ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) ProcNgDesc( cBuffer, oNgi, "Example" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -599,14 +599,14 @@ FUNCTION ProcessiNg() lBlankLine := EMPTY( cBuffer ) ProcNgDesc( cBuffer, oNgi, "Description" ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) ProcNgDesc( cBuffer, oNgi ) - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -614,13 +614,13 @@ FUNCTION ProcessiNg() lBlankLine := EMPTY( cBuffer ) ProcNgDesc( cBuffer, oNgi, "Compliance" ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := ProcNgiAlso( StripFiles( ALLTRIM( cBuffer ) ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) oNgi:WriteParBold( "Status" ) ENDIF @@ -695,7 +695,7 @@ FUNCTION ProcNgiInput() LOCAL nYhandle := FCREATE( 'ngi\funcn_.txt' ) LOCAL xY := "!Short:" LOCAL cSee := "!seealso:" - LOCAL lEof := .f. + LOCAL lEof := .F. LOCAL cBuffer SET CONSOLE ON afiles := DIRECTORY( "ngi\*.*" ) @@ -726,7 +726,7 @@ FUNCTION ProcNgiInput() ENDIF ENDIF END - lEof := .f. + lEof := .F. FT_FUSE() NEXT @@ -768,7 +768,7 @@ FUNCTION ProcNgiInput() // cBuffer:=strtran(cBuffer,chr(10),"") FWRITE( nXhandle, cBuffer + pCRLF ) - lEof := .f. + lEof := .F. aalso := {} FT_FUSE() NEXT @@ -813,28 +813,28 @@ FUNCTION ProcNgiInput() // cBuffer:=strtran(cBuffer,chr(10),"") FWRITE( nYhandle, cBuffer + pCRLF ) - lEof := .f. + lEof := .F. aAlso := {} - lEof := .f. + lEof := .F. FT_FUSE() NEXT FCLOSE( nYhandle ) - lEof := .f. + lEof := .F. 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 ] ) @@ -872,11 +872,11 @@ FUNCTION ProcNgiInput() ENDIF ENDIF - lEof := .f. + lEof := .F. aAlso := {} FT_FUSE() NEXT - lEof := .f. + lEof := .F. FCLOSE( y ) RETURN NIL @@ -906,7 +906,7 @@ FUNCTION procngialso2( cSeealso ) nPos := AT( "()", xAlso[ hPos ] ) IF nPos > 0 AADD( aAlso, "funcam.ngo:" + ALLTRIM( xAlso[ hPos ] ) + ' ' ) - ELSEIF nPos = 0 .AND. UPPER( xAlso[ hPos ] ) <> "LICENSE" .AND. UPPER( xAlso[ hPos ] ) <> "OVERVIEW" .AND. !EMPTY( 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 ] ) + ' ' ) ENDIF ENDIF @@ -953,7 +953,7 @@ FUNCTION GenNgTable( oNgi ) LOCAL x LOCAL nMax LOCAL nSpace - LOCAL lCar := .f. + LOCAL lCar := .F. LOCAL nMax2 LOCAL nSpace2 LOCAL nPos1 @@ -1288,7 +1288,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF @@ -1297,8 +1297,8 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -1313,7 +1313,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) IF AT( "@", cOldLine ) > 0 .OR. AT( "()", cOldLine ) > 0 .OR. AT( "<", cOldLine ) > 0 .OR. AT( "_", cOldLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF // cBuffer:= strtran(cBuffer,"","") @@ -1496,7 +1496,7 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) ENDIF IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) = 0 .OR. !EMPTY( cBuffer ) + IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) @@ -1505,15 +1505,15 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) DO WHILE !lendFixed cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lendfixed := .t. + lendfixed := .T. cLine := STRTRAN( cLine, "", "" ) ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ALLTRIM( cLine ) + ' ' ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF IF AT( DELIM, cLine ) == 0 @@ -1526,12 +1526,12 @@ FUNCTION ProcNGDesc( cBuffer, oNgi, cStyle ) DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 .or. AT( "", cLine ) > 0 - lendTable := .t. + lendTable := .T. ELSE IF LFstTableItem nNumTableItems := GetNumberofTableItems( cLine ) procngtable( cline, nNumTableItems ) - LFstTableItem := .f. + LFstTableItem := .F. ELSE procngtable( cline, nNumTableItems ) ENDIF @@ -1626,11 +1626,11 @@ FUNCTION FormatNgBuff( cBuffer, cStyle ) LOCAL cLine := '' LOCAL cOldLine := '' LOCAL cBuffEnd := '' - LOCAL lEndBuffer := .f. + LOCAL lEndBuffer := .F. LOCAL nPos - LOCAL lArgBold := .f. - LOCAL LFstTableItem := .t. + LOCAL lArgBold := .F. + LOCAL LFstTableItem := .T. cReturn := cBuffer + ' ' IF AT( '', cReturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) @@ -1642,20 +1642,20 @@ FUNCTION FormatNgBuff( cBuffer, cStyle ) DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. + lEndBuffer := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1686,19 +1686,19 @@ FUNCTION FormatNgBuff( cBuffer, cStyle ) cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. + lEndBuffer := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1761,12 +1761,12 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF RETURN lReturn -*+ EOF: GENNG.PRG \ No newline at end of file +*+ EOF: GENNG.PRG diff --git a/harbour/utils/hbdoc/genos2.prg b/harbour/utils/hbdoc/genos2.prg index f14cc76fe0..05f463ad47 100644 --- a/harbour/utils/hbdoc/genos2.prg +++ b/harbour/utils/hbdoc/genos2.prg @@ -213,7 +213,7 @@ FUNCTION ProcessOs2() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -301,7 +301,7 @@ FUNCTION ProcessOs2() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -318,7 +318,7 @@ FUNCTION ProcessOs2() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 40 + IF LEN( cFileName ) == 40 cFileName := STUFF( cFileName, 40, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -548,7 +548,7 @@ end ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -564,7 +564,7 @@ end procos2desc( cbuffer, oOs2, "Syntax" ) - ELSEIF nMode = D_RETURN + ELSEIF nMode == D_RETURN IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; @@ -574,7 +574,7 @@ end /* oOs2:dostoos2Text(cBuffer)*/ procos2desc( cbuffer, oOs2, "Arguments" ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -582,7 +582,7 @@ end lBlankLine := EMPTY( cBuffer ) // oOs2:DosToOs2Text(cBuffer) procos2desc( cbuffer, oOs2, "Arguments" ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -590,7 +590,7 @@ end lBlankLine := EMPTY( cBuffer ) // oOs2:DosToOs2Text(cBuffer) procos2desc( cBuffer, oOs2 ) - ELSEIF nMode = D_DATALINK + ELSEIF nMode == D_DATALINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -602,7 +602,7 @@ end cTemp := SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( ":", cBuffer ) + 1 ) oOs2:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cBuffer ) - ELSEIF nMode = D_METHODLINK + ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -616,18 +616,18 @@ end cBuffer := SUBSTR( cBuffer, AT( "()", cBuffer ) + 2 ) oOs2:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := ProcOs2Also( StripFiles( ALLTRIM( cBuffer ) ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine oOs2:WriteText( ".br" ) ENDIF ENDIF - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -636,7 +636,7 @@ end // oOs2:DosToOs2Text(cBuffer) procos2desc( cBuffer, oOs2, "Compliance" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -645,7 +645,7 @@ end // oOs2:DosToOs2Text(cBuffer) procos2desc( cBuffer, oOs2, "Description" ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -659,7 +659,7 @@ end // oOs2:DosToOs2Text(cBuffer) procos2desc( cBuffer, oOs2, "Example" ) - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) oOs2:WriteParBold( "Status" ) ENDIF @@ -738,10 +738,10 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) LOCAL cLine := '' LOCAL cBuffend := '' LOCAL coline := '' - LOCAL lEndBuff := .f. + LOCAL lEndBuff := .F. LOCAL nPos - LOCAL lArgBold := .f. + LOCAL lArgBold := .F. cReturn := cBuffer + ' ' IF AT( '', cReturn ) > 0 .OR. EMPTY( cBuffer ) @@ -754,19 +754,19 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) DO WHILE !lEndBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuff := .t. + lEndBuff := .T. ENDIF IF EMPTY( cLine ) - lEndBuff := .t. + lEndBuff := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cline ) > 0 FT_FSKIP( - 1 ) - lEndBuff := .t. + lEndBuff := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += " "+ ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -791,7 +791,7 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) IF AT( "@", cOLine ) > 0 .OR. AT( "()", cOLine ) > 0 .OR. AT( "<", cOLine ) > 0 .OR. AT( "_", cOLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF ENDIF @@ -799,17 +799,17 @@ FUNCTION Formatos2Buff( cBuffer, cStyle ) DO WHILE !lEndBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuff := .t. + lEndBuff := .T. ENDIF IF EMPTY( cLine ) - lEndBuff := .t. + lEndBuff := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cline ) > 0 FT_FSKIP( - 1 ) - lEndBuff := .t. + lEndBuff := .T. ENDIF - IF AT( DELIM, cline ) = 0 + IF AT( DELIM, cline ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -913,7 +913,7 @@ FUNCTION ProcOs2Table( cBuffer , nNum ) cItem4 := SUBSTR( cBuffer, 1 ) ENDIF ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afiTable, "" + RTRIM( LTRIM( cItem ) ) + '' ) AADD( asiTable, "" + cItem2 + '' ) ELSE @@ -921,12 +921,12 @@ FUNCTION ProcOs2Table( cBuffer , nNum ) AADD( asiTable, cItem2 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( atiTable, "" + cItem3 + '' ) ELSE AADD( atiTable, cItem3 ) ENDIF - IF cColor <> NIL + IF cColor != NIL AADD( afoiTable, "" + cItem4 + '' ) ELSE AADD( afoiTable, cItem4 ) @@ -1042,15 +1042,15 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) DEFAULT cStyle TO "Default" lendfixed := .F. - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF IF EMPTY( cBuffer ) oOs2:WriteText( ".br" ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -1065,7 +1065,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) IF AT( "@", cOLine ) > 0 .OR. AT( "()", cOLine ) > 0 .OR. AT( "<", cOLine ) > 0 .OR. AT( "_", cOLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF // cBuffer:= strtran(cBuffer,"","") @@ -1137,7 +1137,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) if AT("",cLine)>0 .or. AT("",cLine)>0 cLine := STRTRAN( cLine, '', '' ) cLine := STRTRAN( cLine, '', '' ) - oOs2:WriteParBold(cLine,.f.) + oOs2:WriteParBold(cLine,.F.) Else oos2:WriteText(SPACE(nidentLevel )+ cLine ) Endif @@ -1190,7 +1190,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDIF*/ IF !EMPTY( cBuffer ) /* cBuffer := SUBSTR( cBuffer, 2 ) - oOs2:WriteParBold( cBuffer,.f.) + oOs2:WriteParBold( cBuffer,.F.) oOs2:writeText('.br') oOs2:writeText('.br')*/ // ? cBuffer @@ -1210,7 +1210,7 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) ENDIF IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) = 0 .OR. !EMPTY( cBuffer ) + IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) if AT( '', cBuffer ) > 0 lHasFixed:=.T. else @@ -1227,15 +1227,15 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) DO WHILE !lendFixed cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lendfixed := .t. + lendfixed := .T. cLine := STRTRAN( cLine, "", "" ) ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ALLTRIM( cLine ) + ' ' ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF IF AT( DELIM, cLine ) == 0 .and. !lendfixed @@ -1249,12 +1249,12 @@ FUNCTION Procos2Desc( cBuffer, oOs2, cStyle ) DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 - lendTable := .t. + lendTable := .T. ELSE IF LFstTableItem nNumTableItems := GetNumberofTableItems( cLine ) procos2table( cline, nNumTableItems ) - LFstTableItem := .f. + LFstTableItem := .F. ELSE procos2table( cline, nNumTableItems ) ENDIF @@ -1309,12 +1309,12 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF RETURN lReturn -*+ EOF: GENOS2.PRG \ No newline at end of file +*+ EOF: GENOS2.PRG diff --git a/harbour/utils/hbdoc/genpdf1.prg b/harbour/utils/hbdoc/genpdf1.prg index 2373d31654..69f09a15d6 100644 --- a/harbour/utils/hbdoc/genpdf1.prg +++ b/harbour/utils/hbdoc/genpdf1.prg @@ -247,7 +247,7 @@ local hhh cBuffer := STRTRAN( cBuffer, CHR( 10 ), "" ) endif nLineCnt ++ -// IF nLineCnt % 10 = 0 +// IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) // ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -354,7 +354,7 @@ local hhh FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -371,7 +371,7 @@ local hhh // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 21 + IF LEN( cFileName ) == 21 cFileName := STUFF( cFileName, 21, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -431,7 +431,7 @@ local hhh hb_pdfWritetext(" ") aadd(aWww,{alltrim(cFuncname),HB_GETPAGE()}) else -// oPdf:WriteTitle( PAD( cFuncName, 40 ), cFuncName ,cCategory,.t.) +// oPdf:WriteTitle( PAD( cFuncName, 40 ), cFuncName ,cCategory,.T.) HB_PDFNEWPAGE( PAD( cFuncName, 40 ), cFuncName) if empty(cCategory) cCategory := "Dos" @@ -564,7 +564,7 @@ local hhh nMode := D_EXAMPLE lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cStatus, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -583,7 +583,7 @@ local hhh nMode := D_COMPLIANCE lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cPlat, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -596,7 +596,7 @@ local hhh nMode := D_NORMAL lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cFiles, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -609,7 +609,7 @@ local hhh nMode := D_NORMAL lAddBlank := .T. - lPar := .t. + lPar := .T. ENDIF ELSEIF AT( cFunction, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -620,7 +620,7 @@ local hhh hb_pdfwriteBoldtext1( " Functions" ) hb_pdfWritetext( " " ) - lPar := .t. + lPar := .T. nMode := D_NORMAL lAddBlank := .T. ENDIF @@ -637,7 +637,7 @@ local hhh ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -650,7 +650,7 @@ local hhh cbuFfer := '' + cBuffer + '' ENDIF ProcPdfDesc( cbuffer, oPdf, "Syntax" ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -658,14 +658,14 @@ local hhh lBlankLine := EMPTY( cBuffer ) ProcPdfDesc( cbuffer, oPdf, "Arguments" ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) ProcPdfDesc( cBuffer, oPdf, "Example" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -673,14 +673,14 @@ local hhh lBlankLine := EMPTY( cBuffer ) ProcPdfDesc( cBuffer, oPdf, "Description" ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) ProcPdfDesc( cBuffer, oPdf ) - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -688,13 +688,13 @@ local hhh lBlankLine := EMPTY( cBuffer ) ProcPdfDesc( cBuffer, oPdf, "Compliance" ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := ProcPdfAlso( StripFiles( ALLTRIM( cBuffer ) ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) hb_pdfwritetext('') hb_pdfwriteBoldtext1( " Status" ) @@ -916,7 +916,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF @@ -925,8 +925,8 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -941,7 +941,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) IF AT( "@", cOldLine ) > 0 .OR. AT( "()", cOldLine ) > 0 .OR. AT( "<", cOldLine ) > 0 .OR. AT( "_", cOldLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF // cBuffer:= strtran(cBuffer,"","") @@ -1090,7 +1090,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDIF ENDIF IF !EMPTY( cLine ) - hb_pdfWriteBoldText( SPACE( nidentLevel ) + ALLTRIM( cLine ) ,.f.) + hb_pdfWriteBoldText( SPACE( nidentLevel ) + ALLTRIM( cLine ) ,.F.) ENDIF curPos += nPos ENDDO @@ -1139,7 +1139,7 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) ENDIF IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) = 0 .OR. !EMPTY( cBuffer ) + IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) hb_pdfWriteText( cBuffer ) @@ -1147,15 +1147,15 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) DO WHILE !lendFixed cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lendfixed := .t. + lendfixed := .T. cLine := STRTRAN( cLine, "", "" ) ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ALLTRIM( cLine ) + ' ' ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF IF AT( DELIM, cLine ) == 0 @@ -1168,12 +1168,12 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle ) DO WHILE !lendTable cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cLine ) > 0 .or. AT( "", cLine ) > 0 - lendTable := .t. + lendTable := .T. ELSE IF LFstTableItem nNumTableItems := GetNumberofTableItems( cLine ) ProcPdfTable( cline, nNumTableItems ) - LFstTableItem := .f. + LFstTableItem := .F. ELSE ProcPdfTable( cline, nNumTableItems ) ENDIF @@ -1265,10 +1265,10 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) LOCAL cLine := '' LOCAL cOldLine := '' LOCAL cBuffEnd := '' - LOCAL lEndBuffer := .f. + LOCAL lEndBuffer := .F. LOCAL nPos - LOCAL lArgBold := .f. - LOCAL LFstTableItem := .t. + LOCAL lArgBold := .F. + LOCAL LFstTableItem := .T. HB_SYMBOL_UNUSED( oPdf ) @@ -1284,20 +1284,20 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) DO WHILE !lEndBuffer cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. + lEndBuffer := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1328,19 +1328,19 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf ) cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lEndBuffer := .t. + lEndBuffer := .T. ENDIF IF EMPTY( cLine ) - lEndBuffer := .t. + lEndBuffer := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cLine ) > 0 FT_FSKIP( - 1 ) - lEndBuffer := .t. + lEndBuffer := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1404,9 +1404,9 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF diff --git a/harbour/utils/hbdoc/genrtf.prg b/harbour/utils/hbdoc/genrtf.prg index 2d55e1a11a..e1abf2da81 100644 --- a/harbour/utils/hbdoc/genrtf.prg +++ b/harbour/utils/hbdoc/genrtf.prg @@ -132,7 +132,7 @@ FUNCTION ProcessRtf() LOCAL oRtf LOCAL nReadHandle LOCAL lPar - LOCAL lWrite := .f. + LOCAL lWrite := .F. LOCAL lWasLine := .F. LOCAL lIsDataLink := .F. LOCAL lIsMethodLink := .F. @@ -173,7 +173,7 @@ FUNCTION ProcessRtf() lIsDataLink := .F. lIsMethodLink := .F. - lWrite := .f. + lWrite := .F. cTempx := '' // // Entry Point @@ -215,7 +215,7 @@ FUNCTION ProcessRtf() cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -258,7 +258,7 @@ FUNCTION ProcessRtf() aAlso:=ListAsArray2(cSeeAlso,",") // if Len(aAlso) <3 // ProcRtfalso( oRtf, cSeealso ) -// oRtf:WriteKLink(aAlso,.f.) +// oRtf:WriteKLink(aAlso,.F.) // else oRtf:WriteKLink(aAlso) // endif @@ -301,7 +301,7 @@ FUNCTION ProcessRtf() FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -318,7 +318,7 @@ FUNCTION ProcessRtf() // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 40 + IF LEN( cFileName ) == 40 cFileName := STUFF( cFileName, 40, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -425,7 +425,7 @@ FUNCTION ProcessRtf() oRtf:WritePar( '' ) //:endpar() nMode := D_ARG lAddBlank := .T. - lPar := .t. + lPar := .T. END ELSEIF AT( cRet, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -437,7 +437,7 @@ FUNCTION ProcessRtf() oRtf:WritePar( "" ) //:endpar() nMode := D_RETURN lAddBlank := .T. - lPar := .t. + lPar := .T. END ELSEIF AT( cDesc, cBuffer ) > 0 IF GetItem( cBuffer, nCurdoc ) @@ -593,7 +593,7 @@ oRtf:WritePar( "" ) //:endpar() ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -607,7 +607,7 @@ oRtf:WritePar( "" ) //:endpar() ENDIF procrtfdesc( cbuffer, oRtf, "Syntax" ) // oRtf:WritePar('') //:endpar() - ELSEIF nMode = D_RETURN + ELSEIF nMode == D_RETURN IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; @@ -617,7 +617,7 @@ oRtf:WritePar( "" ) //:endpar() procrtfdesc( cbuffer, oRtf, "Arguments" ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; @@ -626,7 +626,7 @@ oRtf:WritePar( "" ) //:endpar() lBlankLine := EMPTY( cBuffer ) procrtfdesc( cbuffer, oRtf, "Arguments" ) - ELSEIF nMode = D_DATALINK + ELSEIF nMode == D_DATALINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -638,7 +638,7 @@ oRtf:WritePar( "" ) //:endpar() cTemp := SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) cBuffer := SUBSTR( cBuffer, AT( ":", cBuffer ) + 1 ) oRtf:WriteJumpLink1( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer ) - ELSEIF nMode = D_METHODLINK + ELSEIF nMode == D_METHODLINK IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -652,14 +652,14 @@ oRtf:WritePar( "" ) //:endpar() cBuffer := SUBSTR( cBuffer, AT( "()", cBuffer ) + 2 ) oRtf:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ),ALLTRIM( cTemp ), cBuffer ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) ENDIF lBlankLine := EMPTY( cBuffer ) procrtfdesc( cBuffer, oRtf ) - ELSEIF nMode = D_COMPLIANCE + ELSEIF nMode == D_COMPLIANCE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -667,7 +667,7 @@ oRtf:WritePar( "" ) //:endpar() lBlankLine := EMPTY( cBuffer ) procrtfdesc( cBuffer, oRtf, "Compliance" ) - ELSEIF nMode = D_DESCRIPTION + ELSEIF nMode == D_DESCRIPTION IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -675,7 +675,7 @@ oRtf:WritePar( "" ) //:endpar() lBlankLine := EMPTY( cBuffer ) procrtfdesc( cBuffer, oRtf, "Description" ) - ELSEIF nMode = D_EXAMPLE + ELSEIF nMode == D_EXAMPLE IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -688,18 +688,18 @@ oRtf:WritePar( "" ) //:endpar() ENDIF procrtfdesc( cBuffer, oRtf, "Example" ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := StripFiles( ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine oRtf:WritePar( "" ) //:endpar() ENDIF ENDIF - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) oRtf:WritePar( '' ) //:endpar() oRtf:WriteParBold( "Status" ) @@ -852,9 +852,9 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) LOCAL lEndFixed := .F. LOCAL lEndTable := .F. - LOCAL lArgBold := .f. + LOCAL lArgBold := .F. DEFAULT cStyle TO "Default" - IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle <> "Example" + IF AT( '', cBuffer ) == 0 .AND. !EMPTY( cBuffer ) .AND. cstyle != "Example" cBuffer := '' + cBuffer ENDIF @@ -862,8 +862,8 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) oRtf:WritePar( "" ) ENDIF - IF cStyle <> "Example" .AND. AT( "", cBuffer ) == 0 .AND. AT( "", cBuffer ) = 0 - IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) = 0 .AND. !EMPTY( cbuffer ) + IF cStyle != "Example" .AND. AT( "
", cBuffer ) == 0 .AND. AT( "", cBuffer ) == 0 + IF AT( "", cBuffer ) >= 0 .OR. AT( "", cBuffer ) == 0 .AND. !EMPTY( cbuffer ) IF AT( "", cBuffer ) > 0 .AND. AT( "", cBuffer ) > 0 IF cStyle == "Arguments" @@ -883,7 +883,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) IF AT( "@", cOLine ) > 0 .OR. AT( "()", cOLine ) > 0 .OR. AT( "<", cOLine ) > 0 .OR. AT( "_", cOLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF // cBuffer:= strtran(cBuffer,"","") @@ -966,7 +966,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) ENDIF ENDIF IF AT( '', cBuffer ) > 0 .OR. cStyle = "Example" - IF AT( '', cBuffer ) = 0 .OR. !EMPTY( cBuffer ) + IF AT( '', cBuffer ) == 0 .OR. !EMPTY( cBuffer ) cBuffer := STRTRAN( cBuffer, "", "" ) cBuffer := STRTRAN( cBuffer, "", "" ) oRtf:WriteParFixed( cBuffer ) @@ -974,12 +974,12 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) DO WHILE !lendFixed cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lendfixed := .t. + lendfixed := .T. cLine := STRTRAN( cline, "", "" ) ENDIF IF AT( DELIM, cline ) > 0 FT_FSKIP( - 1 ) - lEndfixed := .t. + lEndfixed := .T. ENDIF IF AT( DELIM, cline ) == 0 @@ -992,7 +992,7 @@ FUNCTION ProcRTFDesc( cBuffer, oRtf, cStyle ) DO WHILE !lendTable cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "
", cBuffer ) > 0 - lendTable := .t. + lendTable := .T. ELSE procrtftable( cBuffer ) ENDIF @@ -1040,7 +1040,7 @@ FUNCTION ProcRtfTable( cBuffer ) ELSE cItem := '' ENDIF - IF ccolor <> NIL + IF ccolor != NIL AADD( afiTable, ccolor + cItem ) ELSE AADD( afiTable, cItem ) @@ -1059,7 +1059,7 @@ RETURN Nil FUNCTION GenRtfTable( oRtf ) LOCAL x - LOCAL lCar := .f. + LOCAL lCar := .F. LOCAL nMax2 LOCAL nPos2 LOCAL nPos @@ -1167,9 +1167,9 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) LOCAL cLine := '' LOCAL cBuffend := '' LOCAL coline := '' - LOCAL lEndBuff := .f. + LOCAL lEndBuff := .F. LOCAL nPos - LOCAL lArgBold := .f. + LOCAL lArgBold := .F. creturn := cBuffer + ' ' IF AT( '', creturn ) > 0 .OR. EMPTY( cBuffer ) IF EMPTY( cbuffer ) @@ -1181,20 +1181,20 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) DO WHILE !lendBuff cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( '', cLine ) > 0 - lEndBuff := .t. + lEndBuff := .T. ENDIF IF EMPTY( cLine ) - lEndBuff := .t. + lEndBuff := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cline ) > 0 FT_FSKIP( - 1 ) - lEndBuff := .t. + lEndBuff := .T. ENDIF - IF AT( DELIM, cLine ) = 0 + IF AT( DELIM, cLine ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1220,7 +1220,7 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) IF AT( "@", cOLine ) > 0 .OR. AT( "()", cOLine ) > 0 .OR. AT( "<", cOLine ) > 0 .OR. AT( "_", cOLine ) > 0 lArgBold := .T. ELSE - lArgBold := .f. + lArgBold := .F. ENDIF ENDIF @@ -1228,19 +1228,19 @@ FUNCTION FormatrtfBuff( cBuffer, cStyle ) cLine := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) IF AT( "", cLine ) > 0 - lEndBuff := .t. + lEndBuff := .T. ENDIF IF EMPTY( cLine ) - lEndBuff := .t. + lEndBuff := .T. FT_FSKIP( - 1 ) ENDIF IF AT( DELIM, cline ) > 0 FT_FSKIP( - 1 ) - lEndBuff := .t. + lEndBuff := .T. ENDIF - IF AT( DELIM, cline ) = 0 + IF AT( DELIM, cline ) == 0 cReturn += ' ' + ALLTRIM( cLine ) + ' ' ENDIF ENDDO @@ -1304,9 +1304,9 @@ STATIC FUNCTION GetItem( cItem, nCurdoc ) IF nPos > 0 cCuritem := xPos[ nPos ] IF AT( "$", xPos[ nPos + 1 ] ) > 0 - lReturn := .f. + lReturn := .F. ELSE - lReturn := .t. + lReturn := .T. ENDIF ENDIF @@ -1314,4 +1314,4 @@ RETURN lReturn // / -*+ EOF: GENRTF.PRG \ No newline at end of file +*+ EOF: GENRTF.PRG diff --git a/harbour/utils/hbdoc/gentrf.prg b/harbour/utils/hbdoc/gentrf.prg index e6d9c69661..4f328ff7c6 100644 --- a/harbour/utils/hbdoc/gentrf.prg +++ b/harbour/utils/hbdoc/gentrf.prg @@ -192,7 +192,7 @@ FUNCTION ProcessTroff cBuffer := TRIM( SUBSTR( ReadLN( @lEof ), nCommentLen ) ) nLineCnt ++ - IF nLineCnt % 10 = 0 + IF nLineCnt % 10 == 0 @ LINELINE, 33 SAY STR( nLineCnt, 5, 0 ) ENDIF // check to see if we are in doc mode or getting out of doc mode @@ -276,7 +276,7 @@ FUNCTION ProcessTroff FOR j := 1 TO LEN( cTemp ) cChar := SUBSTR( cTemp, j, 1 ) IF ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar = "_" + ( cChar >= "A" .AND. cChar <= "Z" ) .OR. cChar == "_" cFileName += cChar ENDIF NEXT @@ -293,7 +293,7 @@ FUNCTION ProcessTroff // This will break if there are more than 10 files with the same first // seven characters. We take our chances. - IF LEN( cFileName ) = 21 + IF LEN( cFileName ) == 21 cFileName := STUFF( cFileName, 21, 1, STR( nCount, 1, 0 ) ) ELSE cFileName += STR( nCount, 1, 0 ) @@ -433,7 +433,7 @@ FUNCTION ProcessTroff ELSE // translate any \$ into $ cBuffer := STRTRAN( cBuffer, "\" + DELIM, DELIM ) - IF nMode = D_SYNTAX + IF nMode == D_SYNTAX IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Syntax", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -446,7 +446,7 @@ FUNCTION ProcessTroff /* nNonBlank:=FirstNB(cBuffer) cBuffer=STUFF(cBuffer,nNonBlank,0,"^a1f ")*/ otroff:WritePar( cBuffer ) - ELSEIF nMode = D_ARG + ELSEIF nMode == D_ARG IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "Arguments", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -459,7 +459,7 @@ FUNCTION ProcessTroff cBuffer := STRTRAN( cBuffer, "<", "<", 1 ) cBuffer := STRTRAN( cBuffer, ">", ">", 1 ) otroff:WritePar( StripNgControls( cBuffer ) ) - ELSEIF nMode = D_NORMAL + ELSEIF nMode == D_NORMAL IF LEN( cBuffer ) > LONGLINE WRITE_ERROR( "General", cBuffer, nLineCnt, ; LONGLINE, aDirList[ i, F_NAME ] ) @@ -470,11 +470,11 @@ FUNCTION ProcessTroff lAddBlank := .F. ENDIF otroff:WritePar( StripNgControls( cBuffer ) ) - ELSEIF nMode = D_SEEALSO + ELSEIF nMode == D_SEEALSO IF .NOT. EMPTY( cBuffer ) cSeeAlso := ProcTroffAlso( StripFiles( ALLTRIM( cBuffer ) ) ) ENDIF - ELSEIF nMode = D_INCLUDE + ELSEIF nMode == D_INCLUDE // read next line IF .NOT. EMPTY( cBuffer ) IF !lBlankLine @@ -483,7 +483,7 @@ FUNCTION ProcessTroff otroff:WritePar( " Header File: " ; + ALLTRIM( cBuffer ) ) ENDIF - ELSEIF nMode = D_STATUS + ELSEIF nMode == D_STATUS IF !EMPTY( cBuffer ) otroff:WriteParBold( "Status" ) ENDIF diff --git a/harbour/utils/hbdoc/hbdoc.prg b/harbour/utils/hbdoc/hbdoc.prg index 1aade5aa8a..f228a049e6 100644 --- a/harbour/utils/hbdoc/hbdoc.prg +++ b/harbour/utils/hbdoc/hbdoc.prg @@ -189,7 +189,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) LOCAL ppp LOCAL aMetaContents:={} Local aTemp:={} - LOCAL lAdded:=.f. + LOCAL lAdded:=.F. Local aRtfid LOCAL nCount_1 := 1 @@ -217,7 +217,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) PUBLIC lTee := .F. PUBLIC aWWW := {} PUBLIC aResult := {} - PUBLIC lTroff := .f. + PUBLIC lTroff := .F. // The following variables are used to allow one to change the delimiter // around the keywords. @@ -239,29 +239,29 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF ( cFlags := UPPER( RIGHT( cFlags, 3 ) ) ) == "TXT" lAscii := .T. lContinuous := .F. - ELSEIF cFlags = "TEE" + ELSEIF cFlags == "TEE" lTee := .T. - ELSEIF cFlags = "HPC" + ELSEIF cFlags == "HPC" lNorton := .T. - ELSEIF cFlags = "NGI" + ELSEIF cFlags == "NGI" lNgi := .T. - ELSEIF cFlags = "OS2" + ELSEIF cFlags == "OS2" lOs2 := .T. - ELSEIF cFlags = "RTF" + ELSEIF cFlags == "RTF" lRtf := .T. - ELSEIF cFlags = "HTM" + ELSEIF cFlags == "HTM" lWww := .T. - ELSEIF cFlags = "HT2" + ELSEIF cFlags == "HT2" lWww2 := .T. - ELSEIF cFlags = "PDF" + ELSEIF cFlags == "PDF" lPdf := .T. - ELSEIF cFlags = "CHM" + ELSEIF cFlags == "CHM" lChm := .T. - ELSEIF cFlags = "CH2" + ELSEIF cFlags == "CH2" lChm2 := .T. - ELSEIF cFlags = "TRF" - lTroff := .t. - ELSEIF cFlags = "DOC" + ELSEIF cFlags == "TRF" + lTroff := .T. + ELSEIF cFlags == "DOC" lAscii := .T. lContinuous := .T. lAuthor := .F. @@ -274,7 +274,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // Get the linkfile name and get the info in it - IF cLinkName = NIL + IF cLinkName == NIL outstd( "Harbour Doc Extractor"+ hb_osnewline() ) outstd( "Copyright (c) 1999-2008, http://www.harbour-project.org/"+ hb_osnewline() ) outstd( ""+ hb_osnewline() ) @@ -378,7 +378,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) cCompiler := fill_Link_info( cLinkName ) endif - IF cAtFile = NIL // use all files in directory + IF cAtFile == NIL // use all files in directory // Loop through each of the types of files @@ -404,8 +404,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // tracelog(aRtfid,aRtfid[1]) #ifdef HBDOC_PDF ELSEIF lPdf - ProcessPDF(.t.) - ProcessPDF(.f.) + ProcessPDF(.T.) + ProcessPDF(.F.) #endif ELSEIF lWww ProcessWww() @@ -439,8 +439,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ProcessFiles() #ifdef HBDOC_PDF ELSEIF lPdf - ProcessPDF(.t.) - ProcessPDF(.f.) + ProcessPDF(.T.) + ProcessPDF(.F.) #endif ELSEIF lRtf aRtfid := ProcessRtf() @@ -519,16 +519,16 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) nItem := ASCAN( aLinkInfo, { | a | UPPER( ALLTRIM( a[ 1 ] ) ) == UPPER( ALLTRIM( aDocInfo[ i, 1 ] ) ) } ) IF nItem > 0 - IF i = 1 .OR. .NOT. ( ALLTRIM( aDocInfo[ i - 1, 1 ] ) == ALLTRIM( aDocInfo[ i, 1 ] ) ) + IF i == 1 .OR. .NOT. ( ALLTRIM( aDocInfo[ i - 1, 1 ] ) == ALLTRIM( aDocInfo[ i, 1 ] ) ) // Make the first copy ? "ECHO Creating", aLinkinfo[ nItem, 2 ] - ? "COPY hdf\" + ALLTRIM( aDocInfo[ i, 4 ] ) + " HarDoc.hdf > NUL" + ? "COPY hdf\" + ALLTRIM( aDocInfo[ i, 4 ] ) + " hardoc.hdf > NUL" ELSE // This may be slow but I don't have to worry about line length - ? "TYPE hdf\" + ALLTRIM( aDocInfo[ i, 4 ] ) + " >> HarDoc.hdf " + ? "TYPE hdf\" + ALLTRIM( aDocInfo[ i, 4 ] ) + " >> hardoc.hdf " ENDIF - aLinkInfo[ nItem, 3 ] = .T. + aLinkInfo[ nItem, 3 ] := .T. ELSE // Write the error message SET ALTERNATE TO @@ -594,7 +594,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) FWRITE( nHpj, '1 Harbour Runtime functions and Commands by Name'+CRLF) asort(aWww,,,{|x,y| x[1]'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" + 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 @@ -637,7 +637,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ELSEIF lWWW ASORT( aDocWWWInfo,,, { | a, b | UPPER( a[ 1 ] ) < UPPER( b[ 1 ]) } ) asort(adocinfo,,,{|x,y| x[1]+x[2]'Run Time Errors' .and. cLast <>"Document" .and. cLast <>"The garbage collector" .and. cLast <>"The idle states") .and. (cLast != "Command" .and. clast !="OOP Command" .and. cLast !="Statement") .and. (! "CLASS" $ UPPER(cLast) .and. !"METHOD" $ UPPER(cLast)) + if (cLast!='Run Time Errors' .and. cLast !="Document" .and. cLast !="The garbage collector" .and. cLast !="The idle states") .and. (cLast != "Command" .and. clast !="OOP Command" .and. cLast !="Statement") .and. (! "CLASS" $ UPPER(cLast) .and. !"METHOD" $ UPPER(cLast)) ohtm1:WriteLink('hb'+strtran(aResult[ppp]," ","")+'.htm',aResult[ppp]) endif @@ -847,7 +847,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) ohtm:WriteText("
    ") asort(aDocinfo,,,{|x,y|x[2]'Run Time Errors' .and. aDocInfo[ppp,1] <>"Document" .and. aDocInfo[ppp,1] <>"The garbage collector" .and. aDocInfo[ppp,1] <>"OOP Command" .and. aDocInfo[ppp,1] <>"Command" .and. aDocInfo[ppp,1] <>"The idle states" + if aDocInfo[ppp,1]!='Run Time Errors' .and. aDocInfo[ppp,1] !="Document" .and. aDocInfo[ppp,1] !="The garbage collector" .and. aDocInfo[ppp,1] !="OOP Command" .and. aDocInfo[ppp,1] !="Command" .and. aDocInfo[ppp,1] !="The idle states" oHtm:Listitem() oHtm:AddObject("text/sitemap") oHtm:AddParam("Name",UpperLower(aDocinfo[ppp,2])) @@ -871,7 +871,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) for ppp:=1 to nItem cLast:=GetNextContent(ppp) - 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("
      ") oHtm:ListItem() oHtm:AddObject("text/sitemap") @@ -879,7 +879,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) 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( "
        " ) @@ -976,7 +976,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) 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"}) + //nPos := aScan(aDocInfo, {|x| Upper(x[2] + ".htm") = "OVERVIEW"}) //if nPos > 0 FWRITE( nHpj,'Default topic=index.htm' + CRLF) //Else @@ -1226,7 +1226,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) IF nLen > 1 // Middle initial cMI := aName[ 2 ] - IF !( LEN( cMi ) = 1 .OR. ( LEN( cMi ) = 2 .AND. RIGHT( cMi, 1 ) = "." ) ) + IF !( LEN( cMi ) == 1 .OR. ( LEN( cMi ) == 2 .AND. RIGHT( cMi, 1 ) == "." ) ) cMi := NIL ENDIF // Last name @@ -1239,7 +1239,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // Add to array - aAuthorList[ i, 3 ] = cLName + "," + cFname + IIF( !EMPTY( cMi ), " " + cMi, " " ) + aAuthorList[ i, 3 ] := cLName + "," + cFname + IIF( !EMPTY( cMi ), " " + cMi, " " ) ENDIF @@ -1262,7 +1262,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) // Remove duplicate names but capture a CIS ID if we don't have one IF EMPTY( aAuthorList[ i - 1, 2 ] ) .AND. !EMPTY( aAuthorList[ i, 2 ] ) - aAuthorList[ i - 1, 2 ] = aAuthorList[ i, 2 ] + aAuthorList[ i - 1, 2 ] := aAuthorList[ i, 2 ] ENDIF ADEL( aAuthorList, i ) ASIZE( aAuthorList, LEN( aAuthorList ) - 1 ) @@ -1292,7 +1292,8 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile ) - @ MAXROW(), 0 SAY "Execute ASSEMBL.BAT to compile and link Guides" + /* TOFIX: Make this multiplatform. */ + @ MAXROW(), 0 SAY "Execute assembl.bat to compile and link Guides" WAIT @@ -1318,7 +1319,7 @@ FUNCTION ListAsArray2( cList, cDelimiter ) LOCAL nPos LOCAL aList := {} // Define an empty array - IF cDelimiter = NIL + IF cDelimiter == NIL cDelimiter := "," ENDIF // @@ -1342,12 +1343,12 @@ RETURN aList // Return the array FUNCTION StripNgControls( cString ) LOCAL nPos - LOCAL lStriped := .f. + LOCAL lStriped := .F. nPos := AT( "^b", cString ) IF nPos > 0 cString := SUBSTR( cString, nPos + 3 ) - lStriped := .t. + lStriped := .T. ELSE IF !lStriped cString := cString @@ -1357,7 +1358,7 @@ FUNCTION StripNgControls( cString ) nPos := AT( "^b^", cString ) IF nPos > 0 cString := SUBSTR( cString, 1, nPos - 1 ) - lStriped := .t. + lStriped := .T. ELSE IF !lStriped cString := cString @@ -1367,7 +1368,7 @@ FUNCTION StripNgControls( cString ) nPos := AT( "^CFE", cString ) IF nPos > 0 cString := SUBSTR( cString, nPos + 5 ) - lStriped := .t. + lStriped := .T. ELSE IF !lStriped cString := cString @@ -1377,7 +1378,7 @@ FUNCTION StripNgControls( cString ) nPos := AT( "^a1f", cString ) IF nPos > 0 cString := SUBSTR( cString, nPos + 5 ) - lStriped := .t. + lStriped := .T. ELSE IF !lStriped cString := cString @@ -1475,7 +1476,7 @@ FUNCTION FirstNB( cString ) // i := 1 IF !EMPTY( cString ) - DO WHILE nReturn = 0 .AND. i < LEN( cString ) + DO WHILE nReturn == 0 .AND. i < LEN( cString ) IF SUBSTR( cString, i, 1 ) != " " nReturn := i ELSE @@ -1510,7 +1511,7 @@ FUNCTION ListAsArray( cList, cDelimiter ) LOCAL nPos LOCAL aList := {} // Define an empty array - IF cDelimiter = NIL + IF cDelimiter == NIL cDelimiter := "," ENDIF // @@ -1605,7 +1606,7 @@ FUNCTION ReadAtFile( cAtFile ) // // Entry Point // - IF FT_FUSE( cAtFile ) <> NIL + IF FT_FUSE( cAtFile ) != NIL // Read each line lEof := .F. @@ -1615,7 +1616,7 @@ FUNCTION ReadAtFile( cAtFile ) IF .NOT. EMPTY( cBuffer ) AADD( aDirList, ARRAY( F_LEN ) ) nCount ++ - aDirList[ nCount, F_NAME ] = UPPER( cBuffer ) + aDirList[ nCount, F_NAME ] := cBuffer ENDIF ENDDO ENDIF @@ -1653,7 +1654,7 @@ FUNCTION WRITE_ERROR( cDescrip, cBadLine, nLineCnt, nMax, cFile ) SET ALTERNATE ON // Send out the output - IF cBadLine = NIL + IF cBadLine == NIL ? cDescrip, "in file", cFile ? " " ELSE @@ -1728,7 +1729,7 @@ FUNCTION fill_link_info( cLinkName ) IF AT( "!MENU", cBuffer ) > 0 lMenuMode := .T. cBuffer := UPPER( ReadLN( @lEof ) ) - ELSEIF LEFT( cBuffer, 1 ) = "!" + ELSEIF LEFT( cBuffer, 1 ) == "!" lMenuMode := .F. ENDIF diff --git a/harbour/utils/hbdoc/hbdocdef.ch b/harbour/utils/hbdoc/hbdocdef.ch index e08f469534..fa03eecef3 100644 --- a/harbour/utils/hbdoc/hbdocdef.ch +++ b/harbour/utils/hbdoc/hbdocdef.ch @@ -83,8 +83,8 @@ #define pMEMO "M" #define pNUMERIC "N" #define pOBJECT "O" -#define pTRUE .t. -#define pFALSE .f. +#define pTRUE .T. +#define pFALSE .F. #define pCRLF HB_OSNEWLINE() #xtranslate DOSFILENAME() => substr( , rat("\",)+1 ) diff --git a/harbour/utils/hbdoc/html.prg b/harbour/utils/hbdoc/html.prg index ab906a1b1d..923c23cd97 100644 --- a/harbour/utils/hbdoc/html.prg +++ b/harbour/utils/hbdoc/html.prg @@ -92,14 +92,14 @@ METHOD New( cFile,aMetaContents ) CLASS THTML FCLOSE( NX ) ENDIF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF nX := Self:nHandle FWRITE( Self:nHandle, "" + CRLF ) FWRITE( Self:nHandle, "" + CRLF ) - if Valtype(aMetaContents) <> NIL .and. Valtype(aMetaContents)=="A" + if Valtype(aMetaContents) != NIL .and. Valtype(aMetaContents)=="A" For nCount:=1 to len(aMetaContents) Self:WriteMetaTag(aMetaContents[nCount,1],aMetaContents[nCount,2]) NEXT @@ -219,13 +219,13 @@ METHOD NewChm( cFile ,aMetaContents,cFuncName) CLASS THTML FCLOSE( NX ) ENDIF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF nX := Self:nHandle FWRITE( Self:nHandle, "" + CRLF +"" +CRLF) - if Valtype(aMetaContents) <> NIL .and. Valtype(aMetaContents)=="A" + if Valtype(aMetaContents) != NIL .and. Valtype(aMetaContents)=="A" For nCount:=1 to len(aMetaContents) Self:WriteMetaTag(aMetaContents[nCount,1],aMetaContents[nCount,2]) NEXT @@ -240,7 +240,7 @@ METHOD NewChm( cFile ,aMetaContents,cFuncName) CLASS THTML RETURN Self method ADDOBJECT(cType,cClassId) Class THTML - IF VALTYPE(cClassId)<>NIL .and. VALTYPE(cClassId)=="C" + IF VALTYPE(cClassId)!=NIL .and. VALTYPE(cClassId)=="C" FWRITE( Self:nHandle,''+CRLF) ELSE FWRITE( Self:nHandle,''+CRLF) @@ -259,7 +259,7 @@ METHOD NewContent( cFile ) CLASS THTML FCLOSE( NX ) ENDIF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF @@ -296,4 +296,4 @@ METHOD WriteChmLink( cLink, cName ) CLASS THTML cTemp := STRTRAN( cTemp, " ", "" ) FWRITE( Self:nHandle, "" + cLink + "
        " + CRLF ) Return Self -*+ EOF: HTML.PRG \ No newline at end of file +*+ EOF: HTML.PRG diff --git a/harbour/utils/hbdoc/ng.prg b/harbour/utils/hbdoc/ng.prg index bf0ca08430..83ed36f121 100644 --- a/harbour/utils/hbdoc/ng.prg +++ b/harbour/utils/hbdoc/ng.prg @@ -77,7 +77,7 @@ ENDCLASS METHOD new( cFile ) CLASS TNortonGuide - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF @@ -128,4 +128,4 @@ METHOD WriteLink( cLink ) CLASS TNortonGuide RETURN Self -*+ EOF: NG.PRG \ No newline at end of file +*+ EOF: NG.PRG diff --git a/harbour/utils/hbdoc/os2.prg b/harbour/utils/hbdoc/os2.prg index c7b43e3278..83867691ae 100644 --- a/harbour/utils/hbdoc/os2.prg +++ b/harbour/utils/hbdoc/os2.prg @@ -94,7 +94,7 @@ METHOD New( cFile ) CLASS TOs2 Self:nRef := 1 ENDIF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF @@ -134,14 +134,14 @@ Endif For nPos:=1 to LEN(aLines) cLine:=aLines[nPos] If nPos==1 - If !empty(cLine) .and. cStyle <>"Syntax" + If !empty(cLine) .and. !( cStyle =="Syntax") FWRITE( Self:nHandle,cTag+ cLine + CRLF) elseIf !empty(cLine) .and. cStyle =="Syntax" FWRITE( Self:nHandle,cTag+ ":hp2."+ cLine +":ehp2." +CRLF) Endif Else - If !empty(cLine) .and. cStyle <>"Syntax" + If !empty(cLine) .and. !( cStyle =="Syntax") FWRITE( Self:nHandle, cLine + CRLF) elseIf !empty(cLine) .and. cStyle =="Syntax" FWRITE( Self:nHandle, ":hp2."+ cLine +":ehp2." +CRLF) @@ -159,7 +159,7 @@ endif IF nPos > 0 cLine := SUBSTR( cBuffer, 1, nPos ) ENDIF - If !empty(cLine) .and. cStyle <>"Syntax" + If !empty(cLine) .and. !(cStyle =="Syntax") FWRITE( Self:nHandle,cTag+ cLine + CRLF) elseIf !empty(cLine) .and. cStyle =="Syntax" FWRITE( Self:nHandle,cTag+ ":hp2."+ cLine +":ehp2." +CRLF) @@ -185,7 +185,7 @@ endif ENDIF ENDIF - If !empty(cLine) .and. cStyle <>"Syntax" + If !empty(cLine) .and. !(cStyle =="Syntax") FWRITE( Self:nHandle,cTag+ cLine + CRLF) elseIf !empty(cLine) .and. cStyle =="Syntax" FWRITE( Self:nHandle,cTag+ ":hp2."+ cLine +":ehp2." +CRLF) @@ -208,7 +208,7 @@ RETURN Self METHOD WriteParBold( cPar ,lMarg) CLASS TOs2 -DEFAULT lMarg to .t. +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 ) Else @@ -284,7 +284,7 @@ METHOD WriteLink( cLink ) CLASS TOs2 ENDIF - IF nItem = 0 + IF nItem == 0 nItem := Self:nRef ENDIF @@ -423,4 +423,4 @@ IF nLen<=230 aadd(aLine,ALLTRIM(cBuffer)) ENDIF RETURN aLine -*+ EOF: OS2.PRG \ No newline at end of file +*+ EOF: OS2.PRG diff --git a/harbour/utils/hbdoc/rtf.prg b/harbour/utils/hbdoc/rtf.prg index bcae19438f..f7f84436e8 100644 --- a/harbour/utils/hbdoc/rtf.prg +++ b/harbour/utils/hbdoc/rtf.prg @@ -90,7 +90,7 @@ ENDCLASS METHOD new( cFile ) CLASS TRTF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF diff --git a/harbour/utils/hbdoc/troff.prg b/harbour/utils/hbdoc/troff.prg index 0b316ad50f..f00429bcdf 100644 --- a/harbour/utils/hbdoc/troff.prg +++ b/harbour/utils/hbdoc/troff.prg @@ -75,7 +75,7 @@ ENDCLASS METHOD NEW( cFile ) CLASS TTROFF - IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C" + IF VALTYPE( cFile ) != NIL .AND. VALTYPE( cFile ) == "C" Self:cFile := LOWER( cFile ) Self:nHandle := FCREATE( Self:cFile ) ENDIF