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

Changeset: 659 - Hacer algunos mensajes de error más descriptivos (Lutz Scheffler)

Browse Source
This commit is contained in:
fdbozzo
2015-03-02 01:19:25 +01:00
parent 58595c8304 43cf365c78
commit c6a8cfa399
2 changed files with 111 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FoxBin2PRGVersionFile.txt
View File

@@ -21,6 +21,7 @@ Change History -------------------------------------------------------------
- Added VFP 9 SP1 runtime validation
- Bug Fix: Broken SourceSafe compatibility because an error is thrown when querying for file support (Tuvia Vinitsky)
- Bug Fix scx/vcx: Process only one TEXT/ENDTEXT nesting level because TEXT/ENDTEXT can't be nested (Lutz Scheffler)
- Make some error descriptions more informative and precise (Lutz Scheffler)
2015/01/18 v1.19.41
- Bug Fix db2: Erroneous detection of Invalid Table when size is less than 328 bytes. Lower limit was changed to 65 bytes.

122
foxbin2prg.prg
View File

@@ -133,6 +133,7 @@
* 13/01/2015 FDBOZZO v1.19.41 Bug Fix db2: Detecci<63>n err<72>nea de tabla inv<6E>lida cuando el tama<6D>o es inferior a 328 bytes. L<>mite m<>nimo cambiado a 65 bytes.
* 20/01/2015 FDBOZZO v1.19.42 Mejora: Validaci<63>n de versi<73>n de Visual FoxPro, para evitar problemas ajenos a FoxBin2Prg
* 25/02/2015 FDBOZZO v1.19.42 Bug Fix scx/vcx: Procesar solo un nivel de text/endtext, ya que no se admiten m<>s niveles (Lutz Scheffler)
* 25/02/2015 FDBOZZO v1.19.42 Mejora: Hacer algunos mensajes de error m<>s descriptivos (Lutz Scheffler)
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
*
*---------------------------------------------------------------------------------------------------
@@ -194,6 +195,7 @@
* 06/01/2015 Mike Potjer Reporte bug db2: [Error 12, Variable "TCOUTPUTFILE" is not found] cuando DBF_Conversion_Support=4 y el archivo de salida es igual al generado (Agregado en v1.19.40)
* 13/01/2015 Ryan Harris Reporte bug vcx/scx v1.19.40: Detecci<63>n err<72>nea de estructuras PROCEDURE/ENDPROC cuando se usan como par<61>metros LPARAMETERS en l<>nea aparte (Arreglado en v1.19.41)
* 25/02/2015 Lutz Scheffler Reporte de Bug scx/vcx v1.19.41: Procesar solo un nivel de text/endtext, ya que no se admiten m<>s niveles (Arreglado en v1.19.42)
* 25/02/2015 Lutz Scheffler Mejora v1.19.41: Hacer algunos mensajes de error m<>s descriptivos (Agregado en v1.19.42)
* </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
*
*---------------------------------------------------------------------------------------------------
@@ -2412,6 +2414,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
DO CASE
CASE ATC('-SHOWMSG', ('-' + tcType)) >= 1
THIS.writeErrorLog_Flush()
DO CASE
CASE lnCodError = 1799 && Conversion Cancelled
@@ -3174,7 +3177,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
lcError = 'Error ' + TRANSFORM(toEx.ERRORNO) + ', ' + toEx.MESSAGE + CR_LF ;
+ toEx.PROCEDURE + ', ' + TRANSFORM(toEx.LINENO) + CR_LF
IF NOT EMPTY(toEx.LINECONTENTS)
IF NOT EMPTY(toEx.LINECONTENTS) AND toEx.ErrorNo <> 1098
lcError = lcError + toEx.LINECONTENTS + CR_LF
ENDIF
@@ -3739,6 +3742,7 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
+ [<memberdata name="normalizarasignacion" display="normalizarAsignacion"/>] ;
+ [<memberdata name="normalizarvalorpropiedad" display="normalizarValorPropiedad"/>] ;
+ [<memberdata name="normalizarvalorxml" display="normalizarValorXML"/>] ;
+ [<memberdata name="set_uservalue" display="set_UserValue"/>] ;
+ [<memberdata name="sortpropsandvalues" display="sortPropsAndValues"/>] ;
+ [<memberdata name="sortspecialprops" display="SortSpecialProps"/>] ;
+ [<memberdata name="sortpropsandvalues_setandgetscxpropnames" type="method" display="sortPropsAndValues_SetAndGetSCXPropNames"/>] ;
@@ -3761,6 +3765,7 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
+ [<memberdata name="l_propsort_enabled" display="l_PropSort_Enabled"/>] ;
+ [<memberdata name="l_reportsort_enabled" display="l_ReportSort_Enabled"/>] ;
+ [<memberdata name="n_fb2prg_version" display="n_FB2PRG_Version"/>] ;
+ [<memberdata name="n_methods_lineno" display="n_Methods_LineNo"/>] ;
+ [<memberdata name="ofso" display="oFSO"/>] ;
+ [</VFPData>]
@@ -3795,6 +3800,7 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
c_OriginalFileName = ''
c_ClaseActual = ''
oFSO = NULL
n_Methods_LineNo = 0 && N<>mero de l<>nea del error dentro de "Methods"
@@ -4605,6 +4611,7 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
*ERROR 'No se ha encontrado el marcador de fin [' + ta_ID_Bloques(lnPrimerID,2) ;
+ '] que cierra al marcador de inicio [' + ta_ID_Bloques(lnPrimerID,1) ;
+ '] de la l<>nea ' + TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))
.n_Methods_LineNo = taBloquesExclusion(tnBloquesExclusion,1)
ERROR (TEXTMERGE(loLang.C_END_MARKER_NOT_FOUND_LOC))
ENDIF
ENDIF
@@ -4761,6 +4768,10 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION
ENDFUNC
PROCEDURE set_UserValue
LPARAMETERS toEx as Exception
ENDPROC
PROCEDURE sortPropsAndValues_SetAndGetSCXPropNames
*--------------------------------------------------------------------------------------------------------------
@@ -7496,6 +7507,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
_MEMBERDATA = [<VFPData>] ;
+ [<memberdata name="escribirarchivobin" display="escribirArchivoBin"/>] ;
+ [</VFPData>]
c_Type = 'VC2'
PROCEDURE Convertir
@@ -7851,6 +7863,7 @@ DEFINE CLASS c_conversor_prg_a_scx AS c_conversor_prg_a_bin
_MEMBERDATA = [<VFPData>] ;
+ [<memberdata name="escribirarchivobin" display="escribirArchivoBin"/>] ;
+ [</VFPData>]
c_Type = 'SC2'
PROCEDURE Convertir
@@ -8211,6 +8224,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin
+ [<memberdata name="analizarbloque_textfiles" display="analizarBloque_TextFiles"/>] ;
+ [<memberdata name="analizarbloque_projectproperties" display="analizarBloque_ProjectProperties"/>] ;
+ [</VFPData>]
c_Type = 'PJ2'
@@ -9011,6 +9025,7 @@ DEFINE CLASS c_conversor_prg_a_frx AS c_conversor_prg_a_bin
+ [<memberdata name="analizarbloque_platform" display="analizarBloque_platform"/>] ;
+ [<memberdata name="analizarbloque_reportes" display="analizarBloque_Reportes"/>] ;
+ [</VFPData>]
c_Type = 'FR2'
PROCEDURE Convertir
@@ -9452,6 +9467,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
+ [<memberdata name="analizarbloque_fields" display="analizarBloque_FIELDS"/>] ;
+ [<memberdata name="analizarbloque_indexes" display="analizarBloque_INDEXES"/>] ;
+ [</VFPData>]
c_Type = 'DB2'
PROCEDURE Convertir
@@ -9750,6 +9766,7 @@ DEFINE CLASS c_conversor_prg_a_dbc AS c_conversor_prg_a_bin
+ [<memberdata name="analizarbloque_connections" display="analizarBloque_CONNECTIONS"/>] ;
+ [<memberdata name="analizarbloque_database" display="analizarBloque_DATABASE"/>] ;
+ [</VFPData>]
c_Type = 'DC2'
PROCEDURE Convertir
@@ -9930,9 +9947,9 @@ DEFINE CLASS c_conversor_prg_a_mnx AS c_conversor_prg_a_bin
+ [<memberdata name="n_menutype" display="n_MenuType"/>] ;
+ [</VFPData>]
n_MenuType = 0
c_MenuLocation = ''
c_Type = 'MN2'
n_MenuType = 0
c_MenuLocation = ''
PROCEDURE Convertir
@@ -10154,7 +10171,6 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
+ [</VFPData>]
PROCEDURE Convertir
*---------------------------------------------------------------------------------------------------
* PAR<41>METROS: (v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
@@ -10236,7 +10252,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
WITH THIS AS c_conversor_bin_a_prg OF 'FOXBIN2PRG.PRG'
lnMethodCount = tnMethodCount
.Method2Array( toRegObj.METHODS, @taMethods, @taCode, '', @tnMethodCount ;
, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count, @toFoxBin2Prg )
, @taPropsAndComments, tnPropsAndComments_Count, @taProtected, tnProtected_Count, @toFoxBin2Prg, @toRegObj )
*-- Ubico los m<>todos protegidos y les cambio la definici<63>n.
*-- Los m<>todos se deben generar con la ruta completa, porque si no es imposible saber a que objeto corresponden,
@@ -10762,6 +10778,64 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
ENDPROC
PROCEDURE set_UserValue
LPARAMETERS toEx as Exception
LOCAL lcMethods, I, lcLine, laCodeLines(1), lcMethod, lcLocation, lnErrorLine
STORE '' TO lcMethods, lcLine, laCodeLines, lcMethod, lcLocation
STORE 0 TO lnErrorLine, I
toEx.UserValue = toEx.UserValue + CR_LF
IF INLIST(THIS.c_Type, 'SCX', 'VCX') THEN
lcMethods = Methods
toEx.UserValue = toEx.UserValue + 'Error location ' + '..............................' + CR_LF
IF NOT EMPTY(Parent)
lcLocation = lcLocation + Parent + '.'
ENDIF
lcLocation = lcLocation + ObjName
*-- Busco el Procedure si hay un n_Methods_LineNo
ALINES(laCodeLines, lcMethods)
FOR I = THIS.n_Methods_LineNo TO 1 STEP -1
lcLine = LTRIM( laCodeLines(I), 0, ' ', CHR(9) )
DO CASE
CASE LEFT(lcLine, 10) == 'PROCEDURE '
lcMethod = ALLTRIM( SUBSTR( lcLine, 11) )
lnErrorLine = THIS.n_Methods_LineNo - I
EXIT
CASE LEFT(lcLine, 9) == 'FUNCTION '
lcMethod = ALLTRIM( SUBSTR( lcLine, 10) )
lnErrorLine = THIS.n_Methods_LineNo - I
EXIT
ENDCASE
ENDFOR
IF EMPTY(lcMethod) THEN
lcLocation = 'Class: ' + lcLocation
ELSE
lcLocation = 'Method: ' + lcLocation + '.' + lcMethod
ENDIF
IF lnErrorLine > 0 THEN
lcLocation = lcLocation + ', Line ' + TRANSFORM(lnErrorLine)
ENDIF
toEx.UserValue = toEx.UserValue + lcLocation + CR_LF
toEx.UserValue = toEx.UserValue + '> ' + laCodeLines(THIS.n_Methods_LineNo) + CR_LF
ENDIF
toEx.UserValue = toEx.UserValue + 'Recno: ' + TRANSFORM(RECNO()) + CR_LF
toEx.UserValue = toEx.UserValue + '.............................................' + CR_LF
ENDPROC
PROCEDURE SortMethod
LPARAMETERS tcMethod, taMethods, taCode, tcSorted, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
@@ -10834,7 +10908,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS C_CONVERSOR_BASE
PROCEDURE Method2Array
LPARAMETERS tcMethod, taMethods, taCode, tcSorted, tnMethodCount, taPropsAndComments, tnPropsAndComments_Count ;
, taProtected, tnProtected_Count, toFoxBin2Prg
, taProtected, tnProtected_Count, toFoxBin2Prg, toRegObj
*-- 29/10/2013 Fernando D. Bozzo
*-- Se tiene en cuenta la posibilidad de que haya un PROC/ENDPROC dentro de un TEXT/ENDTEXT
*-- cuando es usado en un generador de c<>digo o similar.
@@ -11851,6 +11925,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_vcx_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'VCX'
PROCEDURE Convertir
@@ -12039,7 +12114,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
lnMethodCount = 0
.Method2Array( loRegClass.METHODS, @laMethods, @laCode, '', @lnMethodCount ;
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg, @loRegClass )
.get_CLASS_METHODS( @lnMethodCount, @laMethods, @laCode, @laProtected, @laPropsAndComments )
@@ -12127,6 +12202,8 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON
ENDIF
@@ -12154,6 +12231,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_scx_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'SCX'
PROCEDURE Convertir
@@ -12359,7 +12437,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
lnMethodCount = 0
.Method2Array( loRegClass.METHODS, @laMethods, @laCode, '', @lnMethodCount ;
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg, @loRegClass )
.get_CLASS_METHODS( @lnMethodCount, @laMethods, @laCode, @laProtected, @laPropsAndComments )
@@ -12449,6 +12527,8 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON
ENDIF
@@ -12476,6 +12556,7 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_pjx_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'PJX'
PROCEDURE Convertir
@@ -12783,12 +12864,14 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
lnCodError = toEx.ERRORNO
DO CASE
CASE lnCodError = 2062 && The specified key already exists ==> loProject.ADD( loReg, loReg.NAME )
*toEx.USERVALUE = 'Archivo duplicado: ' + loReg.NAME
toEx.USERVALUE = loLang.C_DUPLICATED_FILE_LOC + ': ' + loReg.NAME
toEx.USERVALUE = toEx.USERVALUE + loLang.C_DUPLICATED_FILE_LOC + ': ' + loReg.NAME
ENDCASE
IF THIS.l_Debug AND _VFP.STARTMODE = 0
@@ -12815,6 +12898,7 @@ DEFINE CLASS c_conversor_pjm_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_pjm_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'PJM'
PROCEDURE Convertir
@@ -13161,12 +13245,14 @@ DEFINE CLASS c_conversor_pjm_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
lnCodError = toEx.ERRORNO
DO CASE
CASE lnCodError = 2062 && The specified key already exists ==> loProject.ADD( loReg, loReg.NAME )
*toEx.USERVALUE = 'Archivo duplicado: ' + loReg.NAME
toEx.USERVALUE = loLang.C_DUPLICATED_FILE_LOC + ': ' + loReg.NAME
toEx.USERVALUE = toEx.USERVALUE + loLang.C_DUPLICATED_FILE_LOC + ': ' + loReg.NAME
ENDCASE
IF THIS.l_Debug AND _VFP.STARTMODE = 0
@@ -13197,6 +13283,7 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
*_MEMBERDATA = [<VFPData>] ;
+ [<memberdata name="convertir" display="Convertir"/>] ;
+ [</VFPData>]
c_Type = 'FRX'
@@ -13338,6 +13425,8 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON
ENDIF
@@ -13365,6 +13454,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_dbf_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'DBF'
PROCEDURE Convertir
@@ -13480,6 +13570,8 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
DO CASE
CASE toEx.ERRORNO = 13 && Alias not found
*toEx.USERVALUE = 'WARNING!!' + CR_LF ;
@@ -13488,7 +13580,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
+ '<27><>ATENCI<43>N!!' + CR_LF ;
+ 'ASEG<45>RESE DE QUE NO EST<53> USANDO UN ALIAS DE TABLA EN LAS EXPRESIONES DE LOS <20>NDICES!! (ej: index on ' ;
+ UPPER(JUSTSTEM(THIS.c_InputFile)) + '.campo tag nombreclave)'
toEx.USERVALUE = TEXTMERGE(loLang.C_WARN_TABLE_ALIAS_ON_INDEX_EXPRESSION_LOC)
toEx.USERVALUE = toEx.USERVALUE + TEXTMERGE(loLang.C_WARN_TABLE_ALIAS_ON_INDEX_EXPRESSION_LOC)
*!* CASE toEx.ErrorNo = 1976 && Cannot resolve backlink
*!* toEx.UserValue = 'WARNING!!' + CR_LF ;
@@ -13534,6 +13626,7 @@ DEFINE CLASS c_conversor_dbc_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_dbc_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'DBC'
PROCEDURE Convertir
@@ -13581,6 +13674,8 @@ DEFINE CLASS c_conversor_dbc_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON
ENDIF
@@ -13604,6 +13699,7 @@ DEFINE CLASS c_conversor_mnx_a_prg AS c_conversor_bin_a_prg
#IF .F.
LOCAL THIS AS c_conversor_mnx_a_prg OF 'FOXBIN2PRG.PRG'
#ENDIF
c_Type = 'MNX'
PROCEDURE Convertir
@@ -13658,6 +13754,8 @@ DEFINE CLASS c_conversor_mnx_a_prg AS c_conversor_bin_a_prg
CATCH TO toEx
THIS.set_UserValue(@toEx)
IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON
ENDIF