From fad4f89fc2de71a798727f05f450e8510af6f702 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 8 Jan 2011 12:48:10 +0000 Subject: [PATCH] 2011-01-08 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmisc/nconvert.prg * Removed unnecessary parantheses. ! Corrected to use ENDDO instead of END. --- harbour/ChangeLog | 5 ++ harbour/contrib/hbmisc/nconvert.prg | 80 ++++++++++++++--------------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9fedff889b..b61b82e704 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-08 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmisc/nconvert.prg + * Removed unnecessary parantheses. + ! Corrected to use ENDDO instead of END. + 2011-01-08 13:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbformat/hbformat.prg ! Fixed to not use PRIVATE variable to communicate between diff --git a/harbour/contrib/hbmisc/nconvert.prg b/harbour/contrib/hbmisc/nconvert.prg index e821d49508..f8a2db6f64 100644 --- a/harbour/contrib/hbmisc/nconvert.prg +++ b/harbour/contrib/hbmisc/nconvert.prg @@ -147,58 +147,58 @@ FUNCTION HexaToDec( cString ) NEXT RETURN nNumber -FUNCTION DecToRoman( nNumber ) +FUNCTION DecToRoman( nNumber ) LOCAL cRoman := "" - DO WHILE ( nNumber >= 1000 ) - cRoman += "M" + DO WHILE nNumber >= 1000 + cRoman += "M" nNumber -= 1000 - END - DO WHILE ( nNumber >= 900 ) - cRoman += "CM" + ENDDO + DO WHILE nNumber >= 900 + cRoman += "CM" nNumber -= 900 - END - DO WHILE ( nNumber >= 500 ) - cRoman += "D" + ENDDO + DO WHILE nNumber >= 500 + cRoman += "D" nNumber -= 500 - END - DO WHILE ( nNumber >= 400 ) - cRoman += "CD" + ENDDO + DO WHILE nNumber >= 400 + cRoman += "CD" nNumber -= 400 - END - DO WHILE ( nNumber >= 100 ) - cRoman += "C" + ENDDO + DO WHILE nNumber >= 100 + cRoman += "C" nNumber -= 100 - END - DO WHILE ( nNumber >= 90 ) - cRoman += "XC" + ENDDO + DO WHILE nNumber >= 90 + cRoman += "XC" nNumber -= 90 - END - DO WHILE ( nNumber >= 50 ) - cRoman += "L" + ENDDO + DO WHILE nNumber >= 50 + cRoman += "L" nNumber -= 50 - END - DO WHILE ( nNumber >= 40 ) - cRoman += "XL" + ENDDO + DO WHILE nNumber >= 40 + cRoman += "XL" nNumber -= 40 - END - DO WHILE ( nNumber >= 10 ) - cRoman += "X" + ENDDO + DO WHILE nNumber >= 10 + cRoman += "X" nNumber -= 10 - END - DO WHILE ( nNumber >= 9 ) - cRoman += "IX" + ENDDO + DO WHILE nNumber >= 9 + cRoman += "IX" nNumber -= 9 - END - DO WHILE ( nNumber >= 5 ) - cRoman += "V" + ENDDO + DO WHILE nNumber >= 5 + cRoman += "V" nNumber -= 5 - END - DO WHILE ( nNumber >= 4 ) - cRoman += "IV" + ENDDO + DO WHILE nNumber >= 4 + cRoman += "IV" nNumber -= 4 - END - DO WHILE ( nNumber >= 1 ) - cRoman += "I" + ENDDO + DO WHILE nNumber >= 1 + cRoman += "I" --nNumber - END + ENDDO RETURN cRoman