From a682aa5d865d39a1edd52061dbeb38130414136d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 7 Mar 2010 03:35:31 +0000 Subject: [PATCH] 2010-03-07 04:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/vm/hvm.c * include/hbapi.h * Marked hb_synEval public symbol with HB_LEGACY_LEVEL3 * src/rtl/gtwin/gtwin.c ! Copyright header update. * src/rtl/objfunc.prg * include/hboo.ch * Minor cleanup and formatting. * INSTALL * Minor refinement in wording. * contrib/hbide/hbide.prg * contrib/hbide/ideactions.prg * contrib/hbide/idedocks.prg ! "Codec" -> "Encoding" in a few more places. ! "..." added to some more menu items. ! Double "(.ext)" text in filetypes in open project dialog. ; Please review me. --- harbour/ChangeLog | 51 +++++++++++++++++------- harbour/INSTALL | 8 ++-- harbour/contrib/hbide/hbide.prg | 2 +- harbour/contrib/hbide/ideactions.prg | 7 ++-- harbour/contrib/hbide/idedocks.prg | 4 +- harbour/contrib/hbide/ideprojmanager.prg | 6 +-- harbour/include/hbapi.h | 5 ++- harbour/include/hboo.ch | 2 +- harbour/src/rtl/gtwin/gtwin.c | 6 ++- harbour/src/rtl/objfunc.prg | 48 ++++++++++------------ harbour/src/vm/hvm.c | 7 +++- 11 files changed, 85 insertions(+), 61 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 19ba1dba31..175124065f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-07 04:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/vm/hvm.c + * include/hbapi.h + * Marked hb_synEval public symbol with HB_LEGACY_LEVEL3 + + * src/rtl/gtwin/gtwin.c + ! Copyright header update. + + * src/rtl/objfunc.prg + * include/hboo.ch + * Minor cleanup and formatting. + + * INSTALL + * Minor refinement in wording. + + * contrib/hbide/hbide.prg + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + ! "Codec" -> "Encoding" in a few more places. + ! "..." added to some more menu items. + ! Double "(.ext)" text in filetypes in open project dialog. + ; Please review me. + 2010-03-06 15:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + contrib/hbide/resources/fl_c.png + contrib/hbide/resources/fl_dll.png @@ -44,15 +67,15 @@ + contrib/hbide/resources/source_res.png + contrib/hbide/resources/source_txt.png + contrib/hbide/resources/source_unknown.png - + Added more images for user interface. + + Added more images for user interface. * contrib/hbide/resources/projectpropertiesex.ui * contrib/hbide/resources/projectpropertiesex.uic - Removed xMate ".xhp" project loading icon. * contrib/hbxbp/xbpwindow.prg - ! Commented out "resize" event as it was hanging the - applications without any graspable reason. Will be + ! Commented out "resize" event as it was hanging the + applications without any graspable reason. Will be investigated deeply in future. * contrib/hbide/hbide.hbp @@ -67,20 +90,20 @@ * contrib/hbide/idesaveload.prg * contrib/hbide/idestylesheets.prg + contrib/hbide/idethemes.prg - + ! This commit corrects/fixes issues reported by Viktor. Please scratch them again. I might have missed a couple of them. + Implemented: A root panel called "Stats" containing, presently, "Welcome" and "FAQ's" tabs, detailed below. - Now hbIDE has a mechanism to hold as many informative + Now hbIDE has a mechanism to hold as many informative slots as the development will demand in future. : It holds the exiting "Projects" information: Title Type Sources Last_Modified Location - The field is a link to open detailed view of its + The field <Title> is a link to open detailed view of its contents which contain fields: Source Type Size Last_Modified Location @@ -89,31 +112,31 @@ <Home> icon is added in the top-toolbar next to <Exit> icon which leads you to <Stats> panel holding <Welcome> and <FAQs> tabs. - Projects -> Detail -> Source : backward navigation is enabled + Projects -> Detail -> Source : backward navigation is enabled through context menu withing browser. The options within thus context menu has <Print> option which leads to print preview dialog and eventually to printing on the paper. - <FAQs>: This holds short questions and answers as per the - industry standards. I could put only two of them still. + <FAQs>: This holds short questions and answers as per the + industry standards. I could put only two of them still. Please forward the ones you consider should go to this list. - ! Changed: main window icon as previous one was not giving a + ! Changed: main window icon as previous one was not giving a strong impression to be remember for long. - + ! Loading/Opening a project: now offers .hbp or .xhp options. .xhp is converted to .hbp and is written to disk and project is loaded as usual. This should be a one-time process. - ! Click on function list now position the clicked function + ! Click on function list now position the clicked function in the center of the editor. - ! IdeSettings.ini is now hbide.set and is saved where hbide.ini + ! IdeSettings.ini is now hbide.set and is saved where hbide.ini is residing. The change is name was nessary as to avoid wrong impression of .ini nature as a text file. It is binary by nature. - ! Many more artifacts which I tend to forget, please bear it + ! Many more artifacts which I tend to forget, please bear it with my age. 2010-03-06 23:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) diff --git a/harbour/INSTALL b/harbour/INSTALL index 917c9f17be..63f759699b 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -17,7 +17,7 @@ HARBOUR =============================================== NOTE: Before reporting a problem on the developers' mailing list, please - make sure to read the TROUBLESHOOTING section in this file. + make sure to read the TROUBLESHOOTING section in this document. For all platforms you'll need: @@ -37,7 +37,7 @@ HARBOUR instructions for details. It's recommended to make sure no tools in your PATH belonging to other C compilers are interfering with your setup. For the list of supported compilers, please look up - the relevant section in this file. + the relevant section in this document. 3.) You need to get GNU Make. We recommend this link: http://sourceforge.net/projects/mingw/files/MinGW%20make/make-3.81-20090914-mingw32/make-3.81-20090914-mingw32-bin.tar.gz/download Unpack it to your PATH or Harbour source root directory. @@ -1037,7 +1037,7 @@ HARBOUR 9. HOW TO GET THE HARBOUR SOURCES ================================= - 1.) It's possible you're reading this file as part of the Harbour + 1.) It's possible you're reading this document as part of the Harbour source code package. If not, read along. 2.) Harbour source repository @@ -1093,7 +1093,7 @@ HARBOUR set HB_INC_*= set HB_DIR_*= - Try to do no or only small modifications at once to command examples - included in this file. If it doesn't work, fall back to documented + included in this document. If it doesn't work, fall back to documented examples as is. diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index bdcea1587a..db296b8157 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -1067,7 +1067,7 @@ METHOD HbIde:manageProjectContext( mp1, mp2, oXbpTreeItem ) CASE n == -1 // Project Root aadd( aPops, { "New Project" , {|| ::oPM:loadProperties( NIL, .t., .t., .t. ) } } ) aadd( aPops, { "" } ) - aadd( aPops, { "Open Project" , {|| ::oPM:loadProperties( NIL, .f., .f., .t. ) } } ) + aadd( aPops, { "Open Project..." , {|| ::oPM:loadProperties( NIL, .f., .f., .t. ) } } ) aadd( aPops, { "" } ) // IF !empty( ::oEV:getNames() ) diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 1bd20a6bc9..3cad4a189b 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -230,12 +230,12 @@ METHOD IdeActions:loadActions() aadd( aAct, { "Paste" , "~Paste" , "paste" , "" , "No", "Yes" } ) aadd( aAct, { "SelectAll" , "Select ~All" , "selectall" , "" , "No", "Yes" } ) aadd( aAct, { "SelectionMode" , "Toggle Selection Mode" , "stream" , "" , "No", "Yes" } ) - aadd( aAct, { "Find" , "~Find / Replace" , "find" , "^F" , "No", "Yes" } ) + aadd( aAct, { "Find" , "~Find / Replace..." , "find" , "^F" , "No", "Yes" } ) aadd( aAct, { "FindEx" , "~Find / Replace Ex" , "find" , "Sh+^F", "No", "Yes" } ) aadd( aAct, { "Search" , "F~ind in Files" , "search" , "" , "No", "Yes" } ) aadd( aAct, { "SetMark" , "Set Mark" , "placeremovemark", "" , "No", "Yes" } ) aadd( aAct, { "GotoMark" , "Goto Mark" , "gotomark" , "" , "No", "Yes" } ) - aadd( aAct, { "Goto" , "~Goto Line" , "gotoline" , "^G" , "No", "Yes" } ) + aadd( aAct, { "Goto" , "~Goto Line..." , "gotoline" , "^G" , "No", "Yes" } ) aadd( aAct, { "ToUpper" , "To Upper" , "toupper" , "" , "No", "Yes" } ) aadd( aAct, { "ToLower" , "To Lower" , "tolower" , "" , "No", "Yes" } ) aadd( aAct, { "Invert" , "Invert" , "invertcase" , "" , "No", "Yes" } ) @@ -244,7 +244,7 @@ METHOD IdeActions:loadActions() aadd( aAct, { "ZoomOut" , "ZoomOut" , "zoomout" , "" , "No", "Yes" } ) // aadd( aAct, { "NewProject" , "~Project" , "project" , "" , "No", "Yes" } ) - aadd( aAct, { "LoadProject" , "Open Projec~t" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "LoadProject" , "Open Projec~t..." , "" , "" , "No", "Yes" } ) aadd( aAct, { "SaveAs" , "Save ~as..." , "saveas" , "" , "No", "Yes" } ) aadd( aAct, { "SaveAll" , "Save A~ll" , "saveall" , "Sh+^s", "No", "Yes" } ) aadd( aAct, { "CloseAll" , "Clos~e All" , "closeall" , "" , "No", "Yes" } ) @@ -884,4 +884,3 @@ FUNCTION hbide_mnuFindItem( oIde, cCaption ) RETURN nil /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 546830f87c..231862c193 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -813,7 +813,7 @@ METHOD IdeDocks:buildStatusBar() ::oSBar:addItem( "", , , , "Stream" ):oWidget:setMinimumWidth( 20 ) ::oSBar:addItem( "", , , , "Edit" ):oWidget:setMinimumWidth( 20 ) ::oSBar:addItem( "", , , , "Search" ):oWidget:setMinimumWidth( 20 ) - ::oSBar:addItem( "", , , , "Codec" ):oWidget:setMinimumWidth( 20 ) + ::oSBar:addItem( "", , , , "Encoding" ):oWidget:setMinimumWidth( 20 ) ::oSBar:addItem( "", , , , "Environ" ):oWidget:setMinimumWidth( 20 ) ::oSBar:addItem( "", , , , "View" ):oWidget:setMinimumWidth( 20 ) ::oSBar:addItem( "", , , , "Project" ):oWidget:setMinimumWidth( 20 ) @@ -1002,7 +1002,7 @@ METHOD IdeDocks:setStatusText( nPart, xValue ) EXIT CASE SB_PNL_CODEC xValue := iif( empty( xValue ), "default", xValue ) - oPanel:caption := "<font color = brown >Codec: " + xValue + "</font>" + oPanel:caption := "<font color = brown >Encoding: " + xValue + "</font>" EXIT CASE SB_PNL_ENVIRON xValue := iif( empty( xValue ), "default", xValue ) diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 923aba61ba..df6bb37554 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -332,8 +332,8 @@ METHOD IdeProjManager:loadProperties( cProjFileName, lNew, lFetch, lUpdateTree ) lFetch := .t. ELSE IF empty( cProjFileName ) - cProjFileName := hbide_fetchAFile( ::oDlg, "Open Project...", { { "Harbour Projects (*.hbp)", "*.hbp" } , ; - { "xMate Projects (*.xhp)" , "*.xhp" } } ) + cProjFileName := hbide_fetchAFile( ::oDlg, "Open Project...", { { "Harbour Projects", "*.hbp" } , ; + { "xMate Projects" , "*.xhp" } } ) cProjFileName := ::synchronizeAlienProject( cProjFileName ) ENDIF IF empty( cProjFileName ) @@ -1433,5 +1433,3 @@ METHOD IdeProjManager:launchProject( cProject, cExe ) RETURN Self /*----------------------------------------------------------------------*/ - - diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 43344ca747..2e5db74bd3 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -475,7 +475,10 @@ typedef unsigned int HB_ERRCODE; #define HB_SUCCESS 0 #define HB_FAILURE 1 -extern HB_SYMB hb_symEval; +#ifdef HB_LEGACY_LEVEL3 +/* NOTE: Deprecated. Use 'hb_vmPushEvalSym()' instead of 'hb_vmPushSymbol( &hb_symEval )' */ +extern HB_SYMB hb_symEval; +#endif extern HB_EXPORT void hb_xinit( void ); /* Initialize fixed memory subsystem */ extern HB_EXPORT void hb_xexit( void ); /* Deinitialize fixed memory subsystem */ diff --git a/harbour/include/hboo.ch b/harbour/include/hboo.ch index b3642a03e7..cb627d7361 100644 --- a/harbour/include/hboo.ch +++ b/harbour/include/hboo.ch @@ -66,7 +66,7 @@ #ifndef HB_OO_CH_ #define HB_OO_CH_ -/* Used by ObjFunc.prg (__objGetMsgList) and Classes.c (hb___msgClsSel()) */ +/* Used by objfunc.prg (__objGetMsgList) and classes.c (hb___msgClsSel()) */ #define HB_MSGLISTALL 0 #define HB_MSGLISTCLASS 1 #define HB_MSGLISTPURE 2 diff --git a/harbour/src/rtl/gtwin/gtwin.c b/harbour/src/rtl/gtwin/gtwin.c index ae159dc1e5..8f4982a677 100644 --- a/harbour/src/rtl/gtwin/gtwin.c +++ b/harbour/src/rtl/gtwin/gtwin.c @@ -18,8 +18,10 @@ * The following parts are Copyright of the individual authors. * www - http://www.harbour-project.org * - * Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu) - * hb_gt_CtrlHandler(), hb_gt_win_SetCloseButton() + * Copyright 1999-2010 Viktor Szakats (harbour.01 syenar.hu) + * hb_gt_win_CtrlHandler() + * hb_gt_win_SetCloseButton() + * hb_gt_win_SetPalette*() * * Copyright 1999 David G. Holm <dholm@jsd-llc.com> * hb_gt_Tone() diff --git a/harbour/src/rtl/objfunc.prg b/harbour/src/rtl/objfunc.prg index 7c27115329..1429dba58f 100644 --- a/harbour/src/rtl/objfunc.prg +++ b/harbour/src/rtl/objfunc.prg @@ -72,7 +72,7 @@ FUNCTION __objHasData( oObject, cSymbol ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF @@ -81,46 +81,40 @@ FUNCTION __objHasData( oObject, cSymbol ) FUNCTION __objHasMethod( oObject, cSymbol ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF RETURN __objHasMsg( oObject, cSymbol ) .AND. ; !__objHasMsg( oObject, "_" + cSymbol ) - -// nCLassType can be 0, 1 or 2 see hbOO.ch -//#define HB_MSGLISTALL 0 -//#define HB_MSGLISTCLASS 1 -//#define HB_MSGLISTPURE 2 - FUNCTION __objGetMsgList( oObject, lDataMethod, nClassType ) LOCAL aInfo LOCAL aData LOCAL n LOCAL nLen - IF !ISOBJECT( oObject ) + IF ! ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF !ISLOGICAL( lDataMethod ) + IF ! ISLOGICAL( lDataMethod ) lDataMethod := .T. ENDIF - IF !ISNUMBER( nClassType ) + IF ! ISNUMBER( nClassType ) nClasstype := HB_MSGLISTALL ENDIF - aInfo := ASort( oObject:ClassSel(nClassType) ) + aInfo := ASort( oObject:ClassSel( nClassType ) ) aData := {} n := 1 nLen := Len( aInfo ) DO WHILE n <= nLen .AND. !( Substr( aInfo[ n ], 1, 1 ) == "_" ) - /* If in range and no set function found yet ( set functions */ - /* begin with a leading underscore ). */ + /* If in range and no set function found yet + (set functions begin with a leading underscore). */ // If found -> DATA // else METHOD @@ -139,7 +133,7 @@ FUNCTION __objGetMsgList( oObject, lDataMethod, nClassType ) FUNCTION __objGetMethodList( oObject ) - IF !ISOBJECT( oObject ) + IF ! ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF @@ -152,11 +146,11 @@ FUNCTION __objGetValueList( oObject, aExcept ) LOCAL cSymbol LOCAL n - IF !ISOBJECT( oObject ) + IF ! ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF !ISARRAY( aExcept ) + IF ! ISARRAY( aExcept ) aExcept := {} ENDIF @@ -175,7 +169,7 @@ FUNCTION __objGetValueList( oObject, aExcept ) FUNCTION __ObjSetValueList( oObject, aData ) - IF !ISOBJECT( oObject ) + IF ! ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSE AEval( aData, {| aItem | __objSendMsg( oObject, "_" + aItem[ HB_OO_DATA_SYMBOL ], aItem[ HB_OO_DATA_VALUE ] ) } ) @@ -185,7 +179,7 @@ FUNCTION __ObjSetValueList( oObject, aData ) FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) __clsAddMsg( oObject:ClassH, cSymbol, nFuncPtr, HB_OO_MSG_METHOD, NIL, 1 ) @@ -195,7 +189,7 @@ FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr ) FUNCTION __objAddInline( oObject, cSymbol, bInline ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) __clsAddMsg( oObject:ClassH, cSymbol, bInline, HB_OO_MSG_INLINE, NIL, 1 ) @@ -206,7 +200,7 @@ FUNCTION __objAddInline( oObject, cSymbol, bInline ) FUNCTION __objAddData( oObject, cSymbol ) LOCAL nSeq, hClass - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) .AND. !__objHasMsg( oObject, "_" + cSymbol ) hClass := oObject:ClassH @@ -219,7 +213,7 @@ FUNCTION __objAddData( oObject, cSymbol ) FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsModMsg( oObject:ClassH, cSymbol, nFuncPtr ) @@ -229,7 +223,7 @@ FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr ) FUNCTION __objModInline( oObject, cSymbol, bInline ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISBLOCK( bInline ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. ! ISBLOCK( bInline ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsModMsg( oObject:ClassH, cSymbol, bInline ) @@ -239,7 +233,7 @@ FUNCTION __objModInline( oObject, cSymbol, bInline ) FUNCTION __objDelMethod( oObject, cSymbol ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsDelMsg( oObject:ClassH, cSymbol ) @@ -248,11 +242,11 @@ FUNCTION __objDelMethod( oObject, cSymbol ) RETURN oObject FUNCTION __objDelInline( oObject, cSymbol ) - RETURN __objDelMethod( oObject, cSymbol ) // Same story + RETURN __objDelMethod( oObject, cSymbol ) FUNCTION __objDelData( oObject, cSymbol ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) + IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasData( oObject, cSymbol ) __clsDelMsg( oObject:ClassH, cSymbol ) @@ -265,7 +259,7 @@ FUNCTION __objDelData( oObject, cSymbol ) FUNCTION __objDerivedFrom( oObject, xSuper ) LOCAL cClassName - IF !ISOBJECT( oObject ) + IF ! ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c index 365ae0b9f9..eba94816b2 100644 --- a/harbour/src/vm/hvm.c +++ b/harbour/src/vm/hvm.c @@ -259,7 +259,12 @@ static const char * s_vm_pszLinkedMain = NULL; /* name of startup function set b /* virtual machine state */ -HB_SYMB hb_symEval = { "EVAL", {HB_FS_PUBLIC}, {hb_vmDoBlock}, NULL }; /* symbol to evaluate codeblocks */ +#ifdef HB_LEGACY_LEVEL3 + HB_SYMB hb_symEval = { "EVAL", {HB_FS_PUBLIC}, {hb_vmDoBlock}, NULL }; /* symbol to evaluate codeblocks */ +#else +/* TODO: Rename to s_symEval. */ +static HB_SYMB hb_symEval = { "EVAL", {HB_FS_PUBLIC}, {hb_vmDoBlock}, NULL }; /* symbol to evaluate codeblocks */ +#endif static HB_BOOL s_fHVMActive = HB_FALSE; /* is HVM ready for PCODE executing */ static HB_BOOL s_fDoExitProc = HB_TRUE; /* execute EXIT procedures */