From cd23962bf256ba2ffb1d768b3eab439cddd46dd8 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Sat, 29 Nov 2014 14:19:12 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20525=20fdbozzo=20-=2029/11/2014=200?= =?UTF-8?q?4:13:08:=20-=20Arreglo=20para=20detecci=C3=B3n=20de=20ENDPROC?= =?UTF-8?q?=20redundantes=20-=20Arreglo=20de=20comentario=20PAM=20fuera=20?= =?UTF-8?q?de=20l=C3=ADnea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foxbin2prg.prg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/foxbin2prg.prg b/foxbin2prg.prg index f31e509..3716cb8 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -9952,6 +9952,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base lcLine = UPPER( CHRTRAN( laLine(I) , '&'+CHR(9)+CHR(0), ' ') ) + ' ' IF lnLine_Len >= 7 AND LEFT(lcLine,8) == 'ENDPROC ' *-- Es el final de estructura ENDPROC + IF NOT llProcOpen + *-- Esto no es normal, porque hay más de un ENDPROC, por lo que se ignora. + LOOP + ENDIF ELSE *-- Es otra cosa (variable, etc) taCode(tnMethodCount) = taCode(tnMethodCount) + laLine(I) + CR_LF @@ -9965,6 +9969,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base lcLine = UPPER( CHRTRAN( laLine(I) , '&'+CHR(9)+CHR(0), ' ') ) + ' ' IF lnLine_Len >= 7 AND LEFT(lcLine,8) == 'ENDFUNC ' *-- Es el final de estructura ENDPROC + IF NOT llProcOpen + *-- Esto no es normal, porque hay más de un ENDFUNC, por lo que se ignora. + LOOP + ENDIF laLine(I) = STRTRAN( laLine(I), 'ENDFUNC', 'ENDPROC' ) ELSE *-- Es otra cosa (variable, etc) @@ -10192,7 +10200,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base *TEXT TO tcCodigo ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 * <<>> && <> *ENDTEXT - tcCodigo = tcCodigo + CHR(13) + CHR(10) + CHR(9) + CHR(9) + '&' + '& ' + taPropsAndComments(lnComment,2) + tcCodigo = tcCodigo + CHR(9) + CHR(9) + '&' + '& ' + taPropsAndComments(lnComment,2) ENDIF ENDIF ENDFOR