Changeset: 165 v.1.19.11

- Optimizaciones WITH/ENDWITH con una ganancia de velocidad de conversión de hasta un 16% más rápido
- Arreglo bug: Solo se contemplaba un nivel de #IF, dando un error si se enidaban más niveles
- Arreglo bug: Al regenerar el PJX no siempre se establece el directorio por defecto correctamente
- Agregado test unitario de FoxUnit para comprobar el arreglo del #IF anidado

TESTS/ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion.prg

@@ -8,7 +8,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 	#DEFINE C_ENDPROC	'ENDPROC'
 	#DEFINE C_TEXT		'TEXT'
 	#DEFINE C_ENDTEXT	'ENDTEXT'
-	#DEFINE C_IF_F		'#IF .F.'
+	#DEFINE C_IF_F		'#IF'
 	#DEFINE C_ENDIF		'#ENDIF'
 	icObj = NULL
 	
@@ -88,6 +88,40 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 	ENDFUNC
 
 
+	*******************************************************************************************************************************************
+	FUNCTION Deberia_ObtenerLaUbicacionDelBloque_IF_ENDIF_Externo_CuandoCodigoCon_IF_ENDIF_predominante_esEvaluado
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2)
+		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)	= 9
+
+		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
+			<<C_PROC>> myMethod_B
+				*-- Code Block
+				<<C_IF_F>>
+					<<C_IF_F>>
+						<<C_TEXT>>
+						*-- Code Block
+						<<C_ENDTEXT>>
+					<<C_ENDIF>>
+				<<C_ENDIF>>
+			<<C_ENDPROC>>
+		ENDTEXT
+		
+		lnLineas	= ALINES( laLineas, lcMethod )
+
+		*-- Test
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laPos, @lnPos_Count )
+		
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count )
+		
+	ENDFUNC
+
+
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_ObtenerLaUbicacionDelBloque_TEXT_ENDTEXT_CuandoCodigoCon_TEXT_ENDTEXT_predominante_esEvaluado
 		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2)

foxbin2prg.pj2

@@ -26,7 +26,7 @@ _LegalTrademark = "Open Source"
 _ProductName = " FOXBIN2PRG"
 _MajorVer = "1"
 _MinorVer = "19"
-_Revision = " 253"
+_Revision = " 260"
 _LanguageID = "1034"
 _AutoIncrement = "1"
 *</DevInfo>
@@ -50,8 +50,8 @@ MODIFY PROJECT 'foxbin2prg.pjx' NOWAIT NOSHOW NOPROJECTHOOK
 loProject = _VFP.Projects('foxbin2prg.pjx')
 
 WITH loProject.FILES
-	.ADD('config\config.fpw')		&& *< FileMetadata: Type="T" Cpid="1252" Timestamp="1132857145" ID="0" ObjRev="0" />
-	.ADD('foxbin2prg.prg')		&& *< FileMetadata: Type="P" Cpid="1252" Timestamp="1145667342" ID="0" ObjRev="544" />
+	.ADD('config\config.fpw')		&& *< FileMetadata: Type="T" Cpid="1252" Timestamp="1132857145" ID="1131721714" ObjRev="0" />
+	.ADD('foxbin2prg.prg')		&& *< FileMetadata: Type="P" Cpid="1252" Timestamp="1145929891" ID="1130644423" ObjRev="544" />
 	*</BuildProj>
 
 	.ITEM('__newproject.f2b').Remove()