romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changeset: 36 Changeset: 36 Arreglos varios, UT de SCX/VCX optimizados

Browse Source
This commit is contained in:
fernando
2013-12-06 15:18:00 +01:00
parent b66167896e
commit 63e43d4b8c
2 changed files with 148 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2075
TESTS/ut__foxbin2prg.prg
View File

File diff suppressed because it is too large Load Diff

19
foxbin2prg.prg
View File

@@ -386,7 +386,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
******************************************************************************************************************* *******************************************************************************************************************
PROCEDURE Convertir PROCEDURE Convertir
LPARAMETERS tc_InputFile, toModulo, toEx AS EXCEPTION LPARAMETERS tc_InputFile, toModulo, toEx AS EXCEPTION, tlRelanzarError
TRY TRY
LOCAL lnCodError, lcErrorInfo LOCAL lnCodError, lcErrorInfo
@@ -471,6 +471,9 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF THIS.l_Debug AND THIS.l_ShowErrors IF THIS.l_Debug AND THIS.l_ShowErrors
MESSAGEBOX( lcErrorInfo, 0+16+4096, 'FOXBIN2PRG: ERROR!!', 10000 ) MESSAGEBOX( lcErrorInfo, 0+16+4096, 'FOXBIN2PRG: ERROR!!', 10000 )
ENDIF ENDIF
IF tlRelanzarError && Usado en Unit Testing
THROW
ENDIF
ENDTRY ENDTRY
RETURN lnCodError RETURN lnCodError
@@ -1448,6 +1451,12 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
lnLastPos = 1 lnLastPos = 1
DIMENSION taPropsAndValues( lnCantComillas / 2, 2 ) DIMENSION taPropsAndValues( lnCantComillas / 2, 2 )
*-------------------------------------------------------------------------------------
* IMPORTANTE!!
* ------------
* SI SE SEPARAN LAS IGUALDADES CON ESPACIOS, <20>STAS DEJAN DE RECONOCERSE!! (prop = "valor" en vez de prop="valor")
* TENER EN CUENTA AL GENERAR EL TEXTO O AL MODIFICARLO MANUALMENTE AL MERGEAR
*-------------------------------------------------------------------------------------
FOR I = 1 TO lnCantComillas STEP 2 FOR I = 1 TO lnCantComillas STEP 2
X = X + 1 X = X + 1
@@ -2592,7 +2601,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
toClase._UniqueID = .get_ValueByName_FromListNamesWithValues( 'UniqueID', 'C', @laPropsAndValues ) toClase._UniqueID = .get_ValueByName_FromListNamesWithValues( 'UniqueID', 'C', @laPropsAndValues )
toClase._ProjectClassIcon = .get_ValueByName_FromListNamesWithValues( 'ProjectClassIcon', 'C', @laPropsAndValues ) toClase._ProjectClassIcon = .get_ValueByName_FromListNamesWithValues( 'ProjectClassIcon', 'C', @laPropsAndValues )
toClase._ClassIcon = .get_ValueByName_FromListNamesWithValues( 'ClassIcon', 'C', @laPropsAndValues ) toClase._ClassIcon = .get_ValueByName_FromListNamesWithValues( 'ClassIcon', 'C', @laPropsAndValues )
toClase._Ole2 = .get_ValueByName_FromListNamesWithValues( 'Ole2', 'C', @laPropsAndValues ) toClase._Ole2 = .get_ValueByName_FromListNamesWithValues( 'OLEObject', 'C', @laPropsAndValues )
ENDWITH && THIS ENDWITH && THIS
IF NOT EMPTY( toClase._Ole2 ) && Le agrego "OLEObject = " delante IF NOT EMPTY( toClase._Ole2 ) && Le agrego "OLEObject = " delante
@@ -2974,7 +2983,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
toClase._PROPERTIES = THIS.classProps2Memo( toClase ) toClase._PROPERTIES = THIS.classProps2Memo( toClase )
toClase._PROTECTED = THIS.hiddenAndProtected_PAM( toClase ) toClase._PROTECTED = THIS.hiddenAndProtected_PAM( toClase )
toClase._METHODS = THIS.classMethods2Memo( toClase ) toClase._METHODS = THIS.classMethods2Memo( toClase )
*toClase._RESERVED1 = IIF( THIS.c_Type = 'SCX', 'Screen', 'Class' ) toClase._RESERVED1 = IIF( THIS.c_Type = 'SCX', '', 'Class' )
toClase._RESERVED2 = IIF( THIS.c_Type = 'VCX' OR toClase._Nombre == 'Dataenvironment', TRANSFORM( toClase._AddObject_Count + 1 ), '' ) toClase._RESERVED2 = IIF( THIS.c_Type = 'VCX' OR toClase._Nombre == 'Dataenvironment', TRANSFORM( toClase._AddObject_Count + 1 ), '' )
toClase._RESERVED3 = THIS.defined_PAM2Memo( toClase ) toClase._RESERVED3 = THIS.defined_PAM2Memo( toClase )
toClase._RESERVED4 = toClase._ClassIcon toClase._RESERVED4 = toClase._ClassIcon
@@ -5185,8 +5194,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
ENDTEXT ENDTEXT
IF NOT EMPTY(toRegClass.OLE2) IF NOT EMPTY(toRegClass.OLE2)
*FDB* OLEObject="<<STREXTRACT(toRegClass.ole2, 'OLEObject = ', CHR(13)+CHR(10), 1, 1+2)>>"
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8 TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8
OLEObject = "<<STREXTRACT(toRegClass.ole2, 'OLEObject = ', CHR(13)+CHR(10), 1, 1+2)>>" OLEObject="<<STREXTRACT(toRegClass.ole2, 'OLEObject = ', CHR(13)+CHR(10), 1, 1+2)>>" CheckSum="<<SYS(2007, toRegClass.ole, 0, 1)>>" <<>>
ENDTEXT ENDTEXT
ENDIF ENDIF
@@ -5635,6 +5645,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
Nombre="<<IIF(EMPTY(loReg.Parent),'',loReg.Parent+'.') + loReg.objName>>" Nombre="<<IIF(EMPTY(loReg.Parent),'',loReg.Parent+'.') + loReg.objName>>"
Parent="<<loReg.Parent>>" Parent="<<loReg.Parent>>"
ObjName="<<loReg.objname>>" ObjName="<<loReg.objname>>"
OLEObject="<<STREXTRACT(loReg.ole2, 'OLEObject = ', CHR(13)+CHR(10), 1, 1+2)>>"
Checksum="<<lcOLEChecksum>>" <<>> Checksum="<<lcOLEChecksum>>" <<>>
ENDTEXT ENDTEXT