Changeset: 394 fdbozzo - 06/08/2014 23:45:03:

- Arreglo bug ";" y "," antes de EndText

TESTS/ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion.prg

@@ -89,7 +89,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laLineasExclusion_Esperadas( 8)	= .T.
 		laLineasExclusion_Esperadas( 9)	= .T.
 
-		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
 			<<C_PROC>> myMethod_B
 				*-- Code Block
 				<<C_IF_F>>
@@ -132,7 +132,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laLineasExclusion_Esperadas( 8)	= .T.
 		laLineasExclusion_Esperadas( 9)	= .T.
 
-		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
 			<<C_PROC>> myMethod_B
 				*-- Code Block
 				<<C_IF_F>>
@@ -176,7 +176,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laLineasExclusion_Esperadas( 8)	= .T.
 		laLineasExclusion_Esperadas( 9)	= .T.
 
-		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
 			<<C_PROC>> myMethod_B
 				*-- Code Block
 				<<C_TEXT>>
@@ -211,7 +211,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laExpected_Pos(1,1)	= 0
 		laExpected_Pos(1,2)	= 0
 
-		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
 			<<C_PROC>> myMethod_B
 				*-- Code Block
 				IF !FOUND()
@@ -292,7 +292,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 			laLineasExclusion_Esperadas(I)	= .T.
 		ENDFOR
 
-		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
 			<<C_PROC>> myMethod_B
 				*-- Code Block
 				IF ODBC_Query.odbc
@@ -335,4 +335,56 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 	ENDFUNC
 
 
+	*******************************************************************************************************************************************
+	FUNCTION Deberia_EncontrarBloque_TEXT_ENDTEXT_CuandoEvaluaUnaLineaQueTerminaConUn_EndText_YLineaAnteriorTerminaEn_Coma
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2) ;
+			, laLineasExclusion(23), laLineasExclusion_Esperadas(23)
+		LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
+		loObj	= THIS.icObj
+		
+		*-- Input and expected params
+		STORE '' TO lcMethod
+		laExpected_Pos(1,1)	= 3
+		laExpected_Pos(1,2)	= 13
+		FOR I = 3 TO 13
+			laLineasExclusion_Esperadas(I)	= .T.
+		ENDFOR
+
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
+			<<C_PROC>> Init
+			Local lcRowSource
+			<<C_TEXT>> To lcRowSource Textmerge Noshow
+			Overview,ItemDtl,
+			Forecasting,Forecasting,
+			Purchase Orders,PurchaseOrders,
+			Sales Orders,SalesOrders,
+			Sales History,History,
+			Inventory,Bins,
+			Inventory History,InventoryHistory,
+			Configuration,PartsInfo,
+			Operations,Operations,
+			<<C_ENDTEXT>>
+
+
+			This.RowSource	   = Chrtran(lcRowSource, CRLF, '')
+			This.ControlSource = 'Thisform.cStartPage'
+			This.Value		   = ReadSetting('Item Detail Start Page', 'ItemDtl', .F., .T.)
+			<<C_ENDPROC>>
+			<<C_PROC>> Valid
+			WriteSetting('Item Detail Start Page', This.Value, .F., .T.)
+			Thisform.comboPartno.SetFocus()
+			<<C_ENDPROC>>
+		ENDTEXT
+		
+		lnLineas	= ALINES( laLineas, lcMethod )
+
+		*-- Test
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laLineasExclusion, @lnPos_Count, @laPos )
+		
+		*-- Evaluaci<63>n de resultados
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count, @laLineasExclusion_Esperadas, @laLineasExclusion )
+		
+	ENDFUNC
+
+
 ENDDEFINE

foxbin2prg.pj2

@@ -23,10 +23,10 @@ _CompanyName = "Fernando D. Bozzo"
 _FileDescription = "Conversor bidireccional de binarios FoxPro 9 (scx,vcx,pjx) a texto para sustituir al scctext :-)"
 _LegalCopyright = "Creative Commons 4:	Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
 _LegalTrademark = "Creative Commons 4:	Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
-_ProductName = " FOXBIN2PRG v1.19.29"
+_ProductName = " FOXBIN2PRG v1.19.30"
 _MajorVer = "1"
 _MinorVer = "19"
-_Revision = "29"
+_Revision = "30"
 _LanguageID = "1034"
 _AutoIncrement = "0"
 *</DevInfo>

foxbin2prg.prg

@@ -3164,10 +3164,11 @@ DEFINE CLASS c_conversor_base AS SESSION
 								DO CASE
 								CASE .elTextoEvaluadoEsElTokenIndicado( @lcLine, @ta_ID_Bloques, lnLen_IDFinBQ, X, 1 ) ;
 										AND NOT THIS.currentLineIsPreviousLineContinuation( @taCodeLines, I )
+									*-- Busca el primer marcador (#IF o TEXT)
 									lnAnidamientos	= lnAnidamientos + 1
 
-								CASE .elTextoEvaluadoEsElTokenIndicado( @lcLine, @ta_ID_Bloques, lnLen_IDFinBQ, X, 2 ) ;
+								CASE .elTextoEvaluadoEsElTokenIndicado( @lcLine, @ta_ID_Bloques, lnLen_IDFinBQ, X, 2 )
-										AND NOT THIS.currentLineIsPreviousLineContinuation( @taCodeLines, I )
+									*-- Busca el segundo marcador (#ENDIF o ENDTEXT)
 									lnAnidamientos	= lnAnidamientos - 1
 
 									IF lnAnidamientos = 0