diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 74343d7157..9bfdbe90fc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,44 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-15 11:01 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/class.prg + * contrib/gtwvg/parthdlr.prg + * contrib/gtwvg/radiobut.prg + * contrib/gtwvg/toolbar.prg + * contrib/gtwvg/wnd.prg + * contrib/hbnf/doc/en/amedian.txt + * contrib/hbnf/doc/en/ftidle.txt + * contrib/hbnf/doc/en/iamidle.txt + * contrib/hbnf/tests/datecnfg.prg + * contrib/hbsqlit3/tests/sl3_test.prg + * contrib/hbtip/tests/ftpadv.prg + * contrib/hbtip/tests/httpadv.prg + * contrib/xhb/hblog.prg + * contrib/xhb/htmutil.prg + * contrib/xhb/sprintf.prg + * doc/clipper.txt + * extras/gtwvw/tests/ebtest7.prg + * extras/gtwvw/tests/maximize.prg + * extras/gtwvw/tests/prog0.prg + * extras/gtwvw/tests/prog1.prg + * extras/gtwvw/tests/prog2.prg + * extras/gtwvw/tests/wvwmouse.prg + * extras/gtwvw/tests/wvwtest9.prg + * extras/hbdoc/hbdoc.prg + * extras/httpsrv/cookie.prg + * extras/httpsrv/session.prg + * src/rtl/tbrowse.prg + * tests/destruct.prg + * tests/switch.prg + * tests/t1.prg + * tests/testbrw.prg + * tests/tstuse.prg + * utils/hbmk2/hbmk2.prg + * utils/hbtest/rt_math.prg + * END -> END* + * other minor cleanups and formatting + 2012-10-15 04:48 UTC+0200 Viktor Szakats (harbour syenar.net) * extras/guestbk/inifiles.prg * tests/inifiles.prg diff --git a/harbour/contrib/gtwvg/class.prg b/harbour/contrib/gtwvg/class.prg index 0bbc834299..e4de6de736 100644 --- a/harbour/contrib/gtwvg/class.prg +++ b/harbour/contrib/gtwvg/class.prg @@ -108,65 +108,65 @@ CLASS wvtDialog /* To hold previous settings */ - DATA nOldRows - DATA nOldCols - DATA aOldFont - DATA cOldTitle - DATA cOldColor - DATA nOldCursor - DATA aPalette - DATA cScreen - DATA aWvtScreen - DATA aOldPnt - DATA oldTooltipActive - DATA oldTooltipWidth - DATA oldTooltipBkColor - DATA oldTooltipTextColor - DATA oldMenuHandle - DATA oldMenuBlock - DATA lGui + VAR nOldRows + VAR nOldCols + VAR aOldFont + VAR cOldTitle + VAR cOldColor + VAR nOldCursor + VAR aPalette + VAR cScreen + VAR aWvtScreen + VAR aOldPnt + VAR oldTooltipActive + VAR oldTooltipWidth + VAR oldTooltipBkColor + VAR oldTooltipTextColor + VAR oldMenuHandle + VAR oldMenuBlock + VAR lGui /* Dialog Parameters */ - DATA nRows - DATA nCols - DATA cFont - DATA nFontHeight - DATA nFontWidth - DATA nFontBold - DATA nFontQuality - DATA cTitle - DATA cColor + VAR nRows + VAR nCols + VAR cFont + VAR nFontHeight + VAR nFontWidth + VAR nFontBold + VAR nFontQuality + VAR cTitle + VAR cColor /* Objects handelling */ - DATA aObjects INIT {} - DATA oCurObj - DATA oLastObj - DATA oObjOver - DATA oLastOver - DATA nCurObj INIT 1 - DATA nLastObj INIT 0 - DATA nObjOver INIT 0 - DATA nLastOver INIT - 1 - DATA nUseObj - DATA oMenu - DATA aDialogKeys INIT {} - DATA cDialogID INIT "" + VAR aObjects INIT {} + VAR oCurObj + VAR oLastObj + VAR oObjOver + VAR oLastOver + VAR nCurObj INIT 1 + VAR nLastObj INIT 0 + VAR nObjOver INIT 0 + VAR nLastOver INIT - 1 + VAR nUseObj + VAR oMenu + VAR aDialogKeys INIT {} + VAR cDialogID INIT "" /* Tooltip Management */ - DATA nTooltipWidth - DATA nTooltipBkColor - DATA nTooltipTextColor + VAR nTooltipWidth + VAR nTooltipBkColor + VAR nTooltipTextColor /* Miscellaneous */ - DATA ClassName INIT "WVTDIALOG" - DATA cPaintBlockID - DATA nPaintID INIT 1 - DATA nObjID INIT 5000 - DATA nKey - DATA hFonts INIT {} - DATA lEventHandled - DATA lTabStops INIT .F. - DATA bOnCreate + VAR ClassName INIT "WVTDIALOG" + VAR cPaintBlockID + VAR nPaintID INIT 1 + VAR nObjID INIT 5000 + VAR nKey + VAR hFonts INIT {} + VAR lEventHandled + VAR lTabStops INIT .F. + VAR bOnCreate ACCESS nObjects INLINE Len( ::aObjects ) @@ -649,7 +649,7 @@ METHOD wvtDialog:CreateObjects() nObjs := Len( ::aObjects ) FOR i := 1 TO nObjs - switch ::aObjects[ i ]:nType + SWITCH ::aObjects[ i ]:nType CASE DLG_OBJ_BROWSE ::aObjects[ i ]:Create() @@ -692,7 +692,7 @@ METHOD wvtDialog:CreateObjects() CASE DLG_OBJ_PROGRESSBAR ::aObjects[ i ]:Create() EXIT - end + ENDSWITCH NEXT RETURN self @@ -742,83 +742,83 @@ METHOD wvtDialog:ActivateMenu() CLASS WvtObject - DATA oParent - DATA nType - DATA nId + VAR oParent + VAR nType + VAR nId - DATA nTop - DATA nLeft - DATA nBottom - DATA nRight - DATA aPxlTLBR INIT {} + VAR nTop + VAR nLeft + VAR nBottom + VAR nRight + VAR aPxlTLBR INIT {} - DATA aObjects INIT {} - DATA aParent INIT {} - DATA aChildren INIT {} - DATA aPaint INIT {} - DATA bPaint - DATA ClassName INIT "" + VAR aObjects INIT {} + VAR aParent INIT {} + VAR aChildren INIT {} + VAR aPaint INIT {} + VAR bPaint + VAR ClassName INIT "" - DATA nObjID INIT 900000 - DATA nPointer - DATA cargo - DATA xSettings - DATA cText - DATA cToolTip - DATA lActive INIT .T. - DATA lAnimate INIT .F. - DATA lTabStop INIT .T. - DATA hFont + VAR nObjID INIT 900000 + VAR nPointer + VAR cargo + VAR xSettings + VAR cText + VAR cToolTip + VAR lActive INIT .T. + VAR lAnimate INIT .F. + VAR lTabStop INIT .T. + VAR hFont - DATA aPopup INIT {} - DATA hPopup INIT nil - DATA nPopupItemID INIT 700000 + VAR aPopup INIT {} + VAR hPopup INIT nil + VAR nPopupItemID INIT 700000 - DATA nMRow INIT 0 - DATA nMCol INIT 0 - DATA cColorHilite INIT "W+/B*" - DATA cColorDehilite INIT "W/N*" + VAR nMRow INIT 0 + VAR nMCol INIT 0 + VAR cColorHilite INIT "W+/B*" + VAR cColorDehilite INIT "W/N*" - DATA nTextColor - DATA nBackColor - DATA nBackMode INIT 0 /* OPAQUE 1-TRANSPARENT */ - DATA nTextColorHoverOn - DATA nTextColorHoverOff - DATA nBackColorHoverOn - DATA nBackColorHoverOff - DATA cFont - DATA nFontHeight - DATA nFontWidth - DATA nFontWeight - DATA nFontQuality - DATA nCharSet - DATA lItalic - DATA lUnderline - DATA lStrikeOut - DATA nAlignHorz - DATA nAlignVert - DATA nAngle + VAR nTextColor + VAR nBackColor + VAR nBackMode INIT 0 /* OPAQUE 1-TRANSPARENT */ + VAR nTextColorHoverOn + VAR nTextColorHoverOff + VAR nBackColorHoverOn + VAR nBackColorHoverOff + VAR cFont + VAR nFontHeight + VAR nFontWidth + VAR nFontWeight + VAR nFontQuality + VAR nCharSet + VAR lItalic + VAR lUnderline + VAR lStrikeOut + VAR nAlignHorz + VAR nAlignVert + VAR nAngle ACCESS ToolTip INLINE iif( ::cTooltip == nil, "", ::cTooltip ) ASSIGN ToolTip( cTip ) INLINE ::cToolTip := cTip - DATA bHandleEvent - DATA bOnCreate INIT {|| NIL } - DATA bOnSelect INIT {|| NIL } - DATA bOnFocus INIT {|| NIL } - DATA bOnRefresh INIT {|| NIL } - DATA bOnLeftUp INIT {|| NIL } - DATA bOnLeftDown INIT {|| .F. } - DATA bOnMMLeftDown INIT {|| NIL } - DATA bOnLeftPressed INIT {|| NIL } - DATA bTooltip INIT {|| NIL } - DATA bSaveSettings INIT {|| NIL } - DATA bRestSettings INIT {|| NIL } - DATA bOnHilite INIT {|| NIL } - DATA bOnDeHilite INIT {|| NIL } + VAR bHandleEvent + VAR bOnCreate INIT {|| NIL } + VAR bOnSelect INIT {|| NIL } + VAR bOnFocus INIT {|| NIL } + VAR bOnRefresh INIT {|| NIL } + VAR bOnLeftUp INIT {|| NIL } + VAR bOnLeftDown INIT {|| .F. } + VAR bOnMMLeftDown INIT {|| NIL } + VAR bOnLeftPressed INIT {|| NIL } + VAR bTooltip INIT {|| NIL } + VAR bSaveSettings INIT {|| NIL } + VAR bRestSettings INIT {|| NIL } + VAR bOnHilite INIT {|| NIL } + VAR bOnDeHilite INIT {|| NIL } ACCESS nChildren INLINE Len( ::aChildren ) - DATA nIndexOrder + VAR nIndexOrder METHOD New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -867,7 +867,7 @@ METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) ::nBottom := nBottom ::nRight := nRight - switch nType + SWITCH nType CASE DLG_OBJ_BROWSE ::ClassName := "WVTBROWSE" @@ -931,7 +931,7 @@ METHOD WvtObject:New( oParent, nType, nID, nTop, nLeft, nBottom, nRight ) ::lTabStop := .F. EXIT - end + ENDSWITCH RETURN Self @@ -1017,16 +1017,16 @@ METHOD WvtObject:ShowPopup() CLASS WvtBrowse FROM WvtObject - DATA cAlias - DATA oBrw - DATA lHSBar INIT .T. - DATA lVSBar INIT .T. - DATA oHBar - DATA oVBar - DATA bTotalRecords - DATA bCurrentRecord - DATA bTotalColumns - DATA bCurrentColumn + VAR cAlias + VAR oBrw + VAR lHSBar INIT .T. + VAR lVSBar INIT .T. + VAR oHBar + VAR oVBar + VAR bTotalRecords + VAR bCurrentRecord + VAR bTotalColumns + VAR bCurrentColumn ACCESS cDesc INLINE iif( ::cText == nil, "", ::cText ) ASSIGN cDesc( cText ) INLINE ::cText := cText @@ -1290,7 +1290,7 @@ METHOD WvtBrowse:PaintBlock( nPaintObj ) LOCAL bBlock, b := ::oBrw - switch nPaintObj + SWITCH nPaintObj CASE 1 bBlock := {|| Wvt_DrawBoxRaised( b:nTop - 2, b:nLeft - 2, b:nBottom + 1, b:nRight + 2 ) } @@ -1312,7 +1312,7 @@ METHOD WvtBrowse:PaintBlock( nPaintObj ) AAdd( ::aPaint, { bBlock, { WVT_BLOCK_GRID_V, b:nTop + 1, b:nLeft + 1, b:nBottom - 1, b:nRight - 1, b } } ) EXIT - end + ENDSWITCH RETURN Self @@ -1328,8 +1328,8 @@ METHOD WvtBrowse:PaintBlock( nPaintObj ) CLASS WvtStatusBar FROM WvtObject - DATA aPanels - DATA cColor + VAR aPanels + VAR cColor METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -1485,9 +1485,9 @@ METHOD WvtStatusBar:Refresh() CLASS WvtPanel FROM WvtObject - DATA cColor - DATA cTxt - DATA cIconFile + VAR cColor + VAR cTxt + VAR cIconFile ACCESS TEXT INLINE ::cTxt ASSIGN TEXT( cText ) INLINE ::cTxt := PadR( cText, ::nRight - ::nLeft - 2 ) @@ -1690,16 +1690,16 @@ METHOD WvtLabel:HoverOff() CLASS WvtToolBar FROM WvtObject - DATA nPaintID - DATA aObjects INIT {} - DATA lHidden INIT .F. - DATA nCurButton INIT 0 - DATA lActive - DATA lFloating - DATA wScreen - DATA cScreen - DATA nBtnLeft INIT 0 - DATA nRGBSep INIT RGB( 150, 150, 150 ) + VAR nPaintID + VAR aObjects INIT {} + VAR lHidden INIT .F. + VAR nCurButton INIT 0 + VAR lActive + VAR lFloating + VAR wScreen + VAR cScreen + VAR nBtnLeft INIT 0 + VAR nRGBSep INIT RGB( 150, 150, 150 ) ACCESS nButtons INLINE Len( ::aButtons ) @@ -1853,10 +1853,10 @@ METHOD WvtToolBar:HoverOff() CLASS WvtToolButton FROM WvtObject - DATA cFileImage - DATA nCurState INIT 0 - DATA nBtnType INIT TLB_BUTTON_TYPE_IMAGE - DATA aPxlOffSet INIT { 0, - 1, - 3, 1 } + VAR cFileImage + VAR nCurState INIT 0 + VAR nBtnType INIT TLB_BUTTON_TYPE_IMAGE + VAR aPxlOffSet INIT { 0, - 1, - 3, 1 } METHOD New( oParent ) METHOD create() @@ -1976,7 +1976,7 @@ METHOD WvtToolButton:HoverOff() CLASS WvtImage FROM WvtObject - DATA cImageFile + VAR cImageFile ACCESS cImage INLINE ::cImageFile ASSIGN cImage( cImg ) INLINE ::cImageFile := cImg @@ -2032,24 +2032,24 @@ METHOD WvtImage:SetImage( cImage ) CLASS WvtStatic FROM WvtObject - DATA nStatic - DATA nOrient - DATA nFormat - DATA nAlign - DATA nStyle - DATA nThick - DATA nColor + VAR nStatic + VAR nOrient + VAR nFormat + VAR nAlign + VAR nStyle + VAR nThick + VAR nColor - DATA nfTop - DATA nfLeft - DATA nfBottom - DATA nfRight + VAR nfTop + VAR nfLeft + VAR nfBottom + VAR nfRight - DATA nHorzVert INIT 0 - DATA aRGBb - DATA aRGBe + VAR nHorzVert INIT 0 + VAR aRGBb + VAR aRGBe - DATA aPxlOffSet INIT {} + VAR aPxlOffSet INIT {} METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -2180,8 +2180,8 @@ METHOD WvtStatic:Refresh() CLASS WvtPushButton FROM WvtObject - DATA cCaption - DATA cFileImage + VAR cCaption + VAR cFileImage ACCESS block INLINE ::bOnLeftUp ASSIGN block( bBlock ) INLINE ::bOnLeftUp := bBlock @@ -2257,11 +2257,11 @@ METHOD WvtPushButton:LeftUp() CLASS WvtGets FROM WvtObject - DATA aGetList INIT {} - DATA nLastGet INIT 1 - DATA nCurGet INIT 1 - DATA GetList INIT {} - DATA cDesc INIT "" + VAR aGetList INIT {} + VAR nLastGet INIT 1 + VAR nCurGet INIT 1 + VAR GetList INIT {} + VAR cDesc INIT "" METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -2412,48 +2412,48 @@ METHOD WvtGets:DeHilite() CLASS WvtScrollBar FROM WvtObject - DATA nBarType INIT WVT_SCROLLBAR_VERT + VAR nBarType INIT WVT_SCROLLBAR_VERT - DATA nTotal INIT 100 - DATA nCurrent INIT 1 - DATA nThumbPos INIT 0 - DATA nBlockNo INIT 1 + VAR nTotal INIT 100 + VAR nCurrent INIT 1 + VAR nThumbPos INIT 0 + VAR nBlockNo INIT 1 - DATA nSTop - DATA nSLeft - DATA nSBottom - DATA nSRight + VAR nSTop + VAR nSLeft + VAR nSBottom + VAR nSRight - DATA nBtn1Top - DATA nBtn1Left - DATA nBtn1Bottom - DATA nBtn1Right + VAR nBtn1Top + VAR nBtn1Left + VAR nBtn1Bottom + VAR nBtn1Right - DATA nBtn2Top - DATA nBtn2Left - DATA nBtn2Bottom - DATA nBtn2Right - DATA bBtnLeftTop - DATA bBtnLeftTopDep - DATA bBtnRightBottom - DATA bBtnRightBottomDep - DATA bBtnScroll - DATA bTotal - DATA bCurrent - DATA lHidden INIT .T. + VAR nBtn2Top + VAR nBtn2Left + VAR nBtn2Bottom + VAR nBtn2Right + VAR bBtnLeftTop + VAR bBtnLeftTopDep + VAR bBtnRightBottom + VAR bBtnRightBottomDep + VAR bBtnScroll + VAR bTotal + VAR bCurrent + VAR lHidden INIT .T. - DATA aPxlBtnTop INIT { 0, 0, 0, 0 } - DATA aPxlBtnLft INIT { 0, 0, 0, 0 } - DATA aPxlBtnBtm INIT { 0, 0, 0, 0 } - DATA aPxlBtnRgt INIT { 0, 0, 0, 0 } - DATA aPxlScroll INIT { 0, 0, 0, 0 } + VAR aPxlBtnTop INIT { 0, 0, 0, 0 } + VAR aPxlBtnLft INIT { 0, 0, 0, 0 } + VAR aPxlBtnBtm INIT { 0, 0, 0, 0 } + VAR aPxlBtnRgt INIT { 0, 0, 0, 0 } + VAR aPxlScroll INIT { 0, 0, 0, 0 } - DATA lLeftDown INIT .F. - DATA lOnThumb INIT .F. - DATA lAnchored INIT .F. - DATA lOnLeftDown INIT .F. + VAR lLeftDown INIT .F. + VAR lOnThumb INIT .F. + VAR lAnchored INIT .F. + VAR lOnLeftDown INIT .F. - DATA nScrollUnits INIT 0 + VAR nScrollUnits INIT 0 METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -2955,20 +2955,20 @@ METHOD wvtScrollbar:HandleEvent( nKey ) CLASS WvtBanner FROM WvtObject - DATA nTimeDelay INIT 0.5 /* One-half Second */ - DATA nDirection INIT 0 /* LEFT 1-RIGHT */ - DATA nCharToSkip INIT 1 - DATA cText INIT "" - DATA cDispText INIT "" - DATA nTextLen INIT 0 - DATA nTextIndex INIT 0 + VAR nTimeDelay INIT 0.5 /* One-half Second */ + VAR nDirection INIT 0 /* LEFT 1-RIGHT */ + VAR nCharToSkip INIT 1 + VAR cText INIT "" + VAR cDispText INIT "" + VAR nTextLen INIT 0 + VAR nTextIndex INIT 0 - DATA oLabel + VAR oLabel - DATA nAlignVert INIT 2 /* Center */ + VAR nAlignVert INIT 2 /* Center */ - DATA nCurSeconds INIT 0 - DATA nCurAlign + VAR nCurSeconds INIT 0 + VAR nCurAlign METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -3127,7 +3127,7 @@ METHOD WvtBanner:HoverOff() CLASS WvtTextBox FROM WvtObject - DATA cText INIT "" + VAR cText INIT "" METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -3228,19 +3228,19 @@ METHOD WvtTextBox:HoverOff( /*cText*/ ) CLASS WvtProgressBar FROM WvtObject - DATA cImage - DATA nDirection INIT 0 /* 0-Left-Right,Top-Bottom 1-Right-Left,Bottom-Top */ - DATA nStyle INIT 0 - DATA lVertical INIT .F. - DATA lActive INIT .F. + VAR cImage + VAR nDirection INIT 0 /* 0-Left-Right,Top-Bottom 1-Right-Left,Bottom-Top */ + VAR nStyle INIT 0 + VAR lVertical INIT .F. + VAR lActive INIT .F. - DATA nBarColor INIT RGB( 0, 0, 128 ) - DATA nCurrent INIT 0 - DATA nTotal INIT 1 - DATA nPercent INIT 0 - DATA cBackColor INIT "W/W" + VAR nBarColor INIT RGB( 0, 0, 128 ) + VAR nCurrent INIT 0 + VAR nTotal INIT 1 + VAR nPercent INIT 0 + VAR cBackColor INIT "W/W" - DATA cScreen + VAR cScreen METHOD New( oParent, nID, nTop, nLeft, nBottom, nRight ) METHOD create() @@ -3617,7 +3617,7 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) CLASS TBrowseWVG FROM TBrowse - DATA aColumnsSep INIT {} + VAR aColumnsSep INIT {} METHOD SetVisible() diff --git a/harbour/contrib/gtwvg/parthdlr.prg b/harbour/contrib/gtwvg/parthdlr.prg index 597467dcca..f950ce8aa9 100644 --- a/harbour/contrib/gtwvg/parthdlr.prg +++ b/harbour/contrib/gtwvg/parthdlr.prg @@ -78,7 +78,7 @@ CLASS WvgPartHandler - DATA cargo + VAR cargo METHOD new( oParent, oOwner ) METHOD create( oParent, oOwner ) @@ -99,14 +99,14 @@ CLASS WvgPartHandler METHOD notifier( nEvent, xParams ) METHOD controlWndProc( hWnd, nMessage, nwParam, nlParam ) - DATA aChildren INIT {} - DATA nNameId - DATA oParent - DATA oOwner - DATA nStatus INIT 0 + VAR aChildren INIT {} + VAR nNameId + VAR oParent + VAR oOwner + VAR nStatus INIT 0 /* Application Level Notifier */ - DATA sb_notifier + VAR sb_notifier METHOD notifierBlock( ... ) SETGET ENDCLASS @@ -369,7 +369,7 @@ METHOD WvgPartHandler:notifier( nEvent, xParams ) EXIT CASE WM_NCMOUSEMOVE EXIT - END + ENDSWITCH CASE nEvent == HB_GTE_KEYBOARD IF HB_ISBLOCK( ::keyboard ) diff --git a/harbour/contrib/gtwvg/radiobut.prg b/harbour/contrib/gtwvg/radiobut.prg index b6b9e0df8c..a2a46602e1 100644 --- a/harbour/contrib/gtwvg/radiobut.prg +++ b/harbour/contrib/gtwvg/radiobut.prg @@ -84,10 +84,10 @@ CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef - DATA autosize INIT .F. - DATA caption INIT "" - DATA pointerFocus INIT .T. - DATA selection INIT .F. + VAR autosize INIT .F. + VAR caption INIT "" + VAR pointerFocus INIT .T. + VAR selection INIT .F. METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -157,7 +157,7 @@ METHOD handleEvent( nMessage, aNM ) CLASS WvgRadioButton ENDIF EXIT - END + ENDSWITCH RETURN 1 diff --git a/harbour/contrib/gtwvg/toolbar.prg b/harbour/contrib/gtwvg/toolbar.prg index 4d3caaea86..63ce5ce957 100644 --- a/harbour/contrib/gtwvg/toolbar.prg +++ b/harbour/contrib/gtwvg/toolbar.prg @@ -78,27 +78,27 @@ CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/ - DATA appearance - DATA style INIT WVGTOOLBAR_STYLE_STANDARD - DATA allowCustomize INIT .T. - DATA enabled INIT .T. - DATA showToolTips INIT .T. - DATA borderStyle INIT WVGFRAME_NONE - DATA wrappable INIT .T. - DATA buttonWidth INIT 0 - DATA buttonHeight INIT 0 - DATA textAlign INIT WVGALIGN_BOTTOM - DATA imageWidth INIT 0 - DATA imageHeight INIT 0 - DATA transparentColor INIT 0 + VAR appearance + VAR style INIT WVGTOOLBAR_STYLE_STANDARD + VAR allowCustomize INIT .T. + VAR enabled INIT .T. + VAR showToolTips INIT .T. + VAR borderStyle INIT WVGFRAME_NONE + VAR wrappable INIT .T. + VAR buttonWidth INIT 0 + VAR buttonHeight INIT 0 + VAR textAlign INIT WVGALIGN_BOTTOM + VAR imageWidth INIT 0 + VAR imageHeight INIT 0 + VAR transparentColor INIT 0 - DATA aItems INIT {} - DATA hImageList - DATA lSized INIT .F. + VAR aItems INIT {} + VAR hImageList + VAR lSized INIT .F. - DATA sl_change - DATA sl_buttonMenuClick - DATA sl_buttonDropDown + VAR sl_change + VAR sl_buttonMenuClick + VAR sl_buttonDropDown METHOD numItems() INLINE Len( ::aItems ) @@ -241,7 +241,7 @@ METHOD WvgToolBar:handleEvent( nMessage, aNM ) ENDCASE EXIT - END + ENDSWITCH RETURN EVENT_UNHANDELLED @@ -472,25 +472,25 @@ METHOD WvgToolBar:buttonDropDown( xParam ) CLASS WvgToolBarButton - DATA enabled INIT .T. - DATA INDEX INIT 0 - DATA KEY INIT "" - DATA style INIT WVGTOOLBAR_BUTTON_DEFAULT - DATA caption INIT "" - DATA image INIT NIL - DATA disabledImage INIT NIL - DATA hotImage INIT NIL - DATA mixedState INIT .F. - DATA pressed INIT .F. - DATA visible INIT .T. - DATA left INIT 0 - DATA BOTTOM INIT 0 - DATA TOP INIT 0 - DATA width INIT 0 - DATA height INIT 0 - DATA description INIT "" - DATA tooltipText INIT "" - DATA command INIT 0 + VAR enabled INIT .T. + VAR INDEX INIT 0 + VAR KEY INIT "" + VAR style INIT WVGTOOLBAR_BUTTON_DEFAULT + VAR caption INIT "" + VAR image INIT NIL + VAR disabledImage INIT NIL + VAR hotImage INIT NIL + VAR mixedState INIT .F. + VAR pressed INIT .F. + VAR visible INIT .T. + VAR left INIT 0 + VAR BOTTOM INIT 0 + VAR TOP INIT 0 + VAR width INIT 0 + VAR height INIT 0 + VAR description INIT "" + VAR tooltipText INIT "" + VAR command INIT 0 METHOD new( cCaption, nStyle, cKey ) diff --git a/harbour/contrib/gtwvg/wnd.prg b/harbour/contrib/gtwvg/wnd.prg index 87cdaf235b..fda734ed55 100644 --- a/harbour/contrib/gtwvg/wnd.prg +++ b/harbour/contrib/gtwvg/wnd.prg @@ -88,103 +88,103 @@ CLASS WvgWindow INHERIT WvgPartHandler /* CONFIGURATION */ - DATA animate INIT .F. - DATA clipChildren INIT .F. - DATA clipParent INIT .F. - DATA clipSiblings INIT .T. - DATA group INIT 0 /* XBP_NO_GROUP */ - DATA sizeRedraw INIT .F. - DATA tabStop INIT .F. - DATA visible INIT .T. + VAR animate INIT .F. + VAR clipChildren INIT .F. + VAR clipParent INIT .F. + VAR clipSiblings INIT .T. + VAR group INIT 0 /* XBP_NO_GROUP */ + VAR sizeRedraw INIT .F. + VAR tabStop INIT .F. + VAR visible INIT .T. - DATA pointerFocus INIT .T. + VAR pointerFocus INIT .T. - /* RUNTIME DATA */ - DATA dropZone INIT .F. - DATA helpLink - DATA s_tooltipText INIT "" + /* RUNTIME VAR */ + VAR dropZone INIT .F. + VAR helpLink + VAR s_tooltipText INIT "" METHOD tooltipText SETGET - DATA clr_FG - DATA clr_BG - DATA fnt_COMMPOUNDNAME - DATA fnt_hFont + VAR clr_FG + VAR clr_BG + VAR fnt_COMMPOUNDNAME + VAR fnt_hFont /* CALLBACK SLOTS */ - DATA sl_enter - DATA sl_leave - DATA sl_lbClick - DATA sl_lbDblClick - DATA sl_lbDown - DATA sl_lbUp - DATA sl_mbClick - DATA sl_mbDblClick - DATA sl_mbDown - DATA sl_mbUp - DATA sl_motion - DATA sl_rbClick - DATA sl_rbDblClick - DATA sl_rbDown - DATA sl_rbUp - DATA sl_wheel + VAR sl_enter + VAR sl_leave + VAR sl_lbClick + VAR sl_lbDblClick + VAR sl_lbDown + VAR sl_lbUp + VAR sl_mbClick + VAR sl_mbDblClick + VAR sl_mbDown + VAR sl_mbUp + VAR sl_motion + VAR sl_rbClick + VAR sl_rbDblClick + VAR sl_rbDown + VAR sl_rbUp + VAR sl_wheel - DATA sl_helpRequest - DATA sl_keyboard - DATA sl_killInputFocus - DATA sl_move - DATA sl_paint - DATA sl_quit - DATA sl_resize - DATA sl_setInputFocus - DATA sl_dragEnter - DATA sl_dragMotion - DATA sl_dragLeave - DATA sl_dragDrop + VAR sl_helpRequest + VAR sl_keyboard + VAR sl_killInputFocus + VAR sl_move + VAR sl_paint + VAR sl_quit + VAR sl_resize + VAR sl_setInputFocus + VAR sl_dragEnter + VAR sl_dragMotion + VAR sl_dragLeave + VAR sl_dragDrop - DATA sl_close - DATA sl_setDisplayFocus - DATA sl_killDisplayFocus + VAR sl_close + VAR sl_setDisplayFocus + VAR sl_killDisplayFocus - DATA hBrushBG - DATA is_hidden INIT .F. - DATA is_enabled INIT .T. - DATA title INIT " " - DATA icon INIT 0 - DATA closable INIT .T. - DATA resizable INIT .T. - DATA resizeMode INIT 0 - DATA style INIT WS_OVERLAPPEDWINDOW - DATA exStyle INIT 0 - DATA lModal INIT .F. - DATA pGTp - DATA pGT - DATA objType INIT objTypeNone - DATA className INIT "" + VAR hBrushBG + VAR is_hidden INIT .F. + VAR is_enabled INIT .T. + VAR title INIT " " + VAR icon INIT 0 + VAR closable INIT .T. + VAR resizable INIT .T. + VAR resizeMode INIT 0 + VAR style INIT WS_OVERLAPPEDWINDOW + VAR exStyle INIT 0 + VAR lModal INIT .F. + VAR pGTp + VAR pGT + VAR objType INIT objTypeNone + VAR className INIT "" - DATA hWnd - DATA pWnd - DATA aPos INIT { 0, 0 } - DATA aSize INIT { 0, 0 } - DATA aPresParams INIT {} - DATA lHasInputFocus INIT .F. - DATA nFrameState INIT 0 /* normal */ + VAR hWnd + VAR pWnd + VAR aPos INIT { 0, 0 } + VAR aSize INIT { 0, 0 } + VAR aPresParams INIT {} + VAR lHasInputFocus INIT .F. + VAR nFrameState INIT 0 /* normal */ - DATA maxCol INIT 79 - DATA maxRow INIT 24 - DATA mouseMode INIT 1 + VAR maxCol INIT 79 + VAR maxRow INIT 24 + VAR mouseMode INIT 1 - DATA nID INIT 0 - DATA nControlID INIT 5000 - DATA nOldProc INIT 0 + VAR nID INIT 0 + VAR nControlID INIT 5000 + VAR nOldProc INIT 0 - DATA oMenu + VAR oMenu - DATA nTop - DATA nLeft - DATA nBottom - DATA nRight + VAR nTop + VAR nLeft + VAR nBottom + VAR nRight - DATA hWndTT + VAR hWndTT METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -547,9 +547,8 @@ METHOD WvgWindow:setPos( aPos, lPaint ) OTHERWISE aPosSz := ::getPosAndSize( aPos ) WVG_SetWindowPosition( ::hWnd, aPosSz[ 1 ], aPosSz[ 2 ], lPaint ) - EXIT - END + ENDSWITCH ENDIF RETURN Self @@ -581,9 +580,8 @@ METHOD WvgWindow:setPosAndSize( aPos, aSize, lPaint ) OTHERWISE aPosSz := ::getPosAndSize( aPos, aSize ) WVG_SetWindowPosAndSize( ::hWnd, aPosSz[ 1 ], aPosSz[ 2 ], aPosSz[ 3 ], aPosSz[ 4 ], lPaint ) - EXIT - END + ENDSWITCH ENDIF RETURN Self @@ -605,9 +603,8 @@ METHOD WvgWindow:setSize( aSize, lPaint ) OTHERWISE aPosSz := ::getPosAndSize( , aSize ) WVG_SetWindowSize( ::hWnd, aPosSz[ 3 ], aPosSz[ 4 ], lPaint ) - EXIT - END + ENDSWITCH ENDIF RETURN Self diff --git a/harbour/contrib/hbnf/doc/en/amedian.txt b/harbour/contrib/hbnf/doc/en/amedian.txt index 6492ab2103..164ecf2304 100644 --- a/harbour/contrib/hbnf/doc/en/amedian.txt +++ b/harbour/contrib/hbnf/doc/en/amedian.txt @@ -31,12 +31,12 @@ * more reflect a more useful average when there are extreme * values in the set. * $EXAMPLES$ - * FT_AMEDIAN( aArray ) // Return Median for entire array + * FT_AMEDIAN( aArray ) // Return Median for entire array * - * FT_AMEDIAN( aArray, 2) // Return Median for elements from 2 to end + * FT_AMEDIAN( aArray, 2 ) // Return Median for elements from 2 to end * - * FT_AMEDIAN( aArray, ,9) // Return Median for 1st 9 elements + * FT_AMEDIAN( aArray, , 9 ) // Return Median for 1st 9 elements * - * FT_AMEDIAN( aArray,8,40 ) // Return Median for elements 8 to 40 + * FT_AMEDIAN( aArray, 8, 40 ) // Return Median for elements 8 to 40 * $END$ */ diff --git a/harbour/contrib/hbnf/doc/en/ftidle.txt b/harbour/contrib/hbnf/doc/en/ftidle.txt index 9208a4c0a5..87222bd3e7 100644 --- a/harbour/contrib/hbnf/doc/en/ftidle.txt +++ b/harbour/contrib/hbnf/doc/en/ftidle.txt @@ -30,13 +30,13 @@ * this fact makes you uncomfortable then don't use this function, you * miserable jello-spined lump of human debris. * $EXAMPLES$ - * while Whatever // Some batch process + * DO WHILE Whatever // Some batch process * * Something() // Create 'n' discard a bunch of stuff * * FT_Idle() // Take out the garbage * - * end + * ENDDO * $SEEALSO$ * FT_OnIdle() * $END$ diff --git a/harbour/contrib/hbnf/doc/en/iamidle.txt b/harbour/contrib/hbnf/doc/en/iamidle.txt index 739ef5f646..62e8e5aa0f 100644 --- a/harbour/contrib/hbnf/doc/en/iamidle.txt +++ b/harbour/contrib/hbnf/doc/en/iamidle.txt @@ -25,13 +25,13 @@ * you can cause Clipper to automatically release the CPU whenever * Clipper itself detects an idle state. * $EXAMPLES$ - * while inkey() != K_ESC + * DO WHILE Inkey() != K_ESC * FT_IAmIdle() // Wait for ESC and announce idleness - * end + * ENDDO * * * Here's another way to do it: * - * FT_OnIdle( {|| FT_IAmIdle()} ) + * FT_OnIdle( {|| FT_IAmIdle() } ) * * Inkey( 0 ) // Automatically reports idleness until key * // is pressed! diff --git a/harbour/contrib/hbnf/tests/datecnfg.prg b/harbour/contrib/hbnf/tests/datecnfg.prg index 502065513c..9c0a6f499c 100644 --- a/harbour/contrib/hbnf/tests/datecnfg.prg +++ b/harbour/contrib/hbnf/tests/datecnfg.prg @@ -201,6 +201,6 @@ STATIC FUNCTION FT_CAL( dGivenDate, nType ) dTemp++ NEXT ? - END + ENDDO RETURN NIL diff --git a/harbour/contrib/hbsqlit3/tests/sl3_test.prg b/harbour/contrib/hbsqlit3/tests/sl3_test.prg index 8638f050ae..39da72dc4f 100644 --- a/harbour/contrib/hbsqlit3/tests/sl3_test.prg +++ b/harbour/contrib/hbsqlit3/tests/sl3_test.prg @@ -104,7 +104,7 @@ PROCEDURE t2() IF sqlite3_exec( db, TABLE_SQL ) == SQLITE_OK ? "CREATE TABLE t1 - Ok" - END + ENDIF sqlite3_exec( db, ; "BEGIN TRANSACTION;" + ; diff --git a/harbour/contrib/hbtip/tests/ftpadv.prg b/harbour/contrib/hbtip/tests/ftpadv.prg index 04df9a7f6f..236330f521 100644 --- a/harbour/contrib/hbtip/tests/ftpadv.prg +++ b/harbour/contrib/hbtip/tests/ftpadv.prg @@ -25,7 +25,7 @@ PROCEDURE Main( cUrl ) ? 'Use an ftp address with a file that you can delete.' ? QUIT - END + ENDIF oCon := TipClientFtp():New( oUrl ) oCon:nConnTimeout := 20000 @@ -54,7 +54,7 @@ PROCEDURE Main( cUrl ) ELSE ? "Error in connection:", hb_InetErrorDesc( oCon:SocketCon ) ENDIF - END + ENDIF ? "Done" ? diff --git a/harbour/contrib/hbtip/tests/httpadv.prg b/harbour/contrib/hbtip/tests/httpadv.prg index 166c8c856f..5946bb3c62 100644 --- a/harbour/contrib/hbtip/tests/httpadv.prg +++ b/harbour/contrib/hbtip/tests/httpadv.prg @@ -25,7 +25,7 @@ PROCEDURE Main( cUrl ) ? 'Use an http address.' ? QUIT - END + ENDIF oCon := TipClientHttp():New( oUrl ) oCon:nConnTimeout := 20000 @@ -53,7 +53,7 @@ PROCEDURE Main( cUrl ) ELSE ? "Error in connection:", hb_InetErrorDesc( oCon:SocketCon ) ENDIF - END + ENDIF ? "Done" ? diff --git a/harbour/contrib/xhb/hblog.prg b/harbour/contrib/xhb/hblog.prg index 61d1b89cf8..4d08c3ec79 100644 --- a/harbour/contrib/xhb/hblog.prg +++ b/harbour/contrib/xhb/hblog.prg @@ -215,10 +215,10 @@ FUNCTION HB_LogDateStamp() CLASS HB_Logger - DATA cProgName - DATA aLogToChannel INIT {} - DATA nStyle INIT -1 - DATA nDefaultPriority INIT HB_LOG_INFO + VAR cProgName + VAR aLogToChannel INIT {} + VAR nStyle INIT -1 + VAR nDefaultPriority INIT HB_LOG_INFO METHOD New() METHOD AddChannel( oChannel ) INLINE AAdd( ::aLogToChannel, oChannel ) @@ -311,7 +311,7 @@ METHOD PROCEDURE Log( cMessage, nPriority ) CLASS HB_Logger CLASS HB_LogChannel - DATA lOpened INIT .F. + VAR lOpened INIT .F. METHOD New( nLevel ) CONSTRUCTOR METHOD Open( cName ) VIRTUAL @@ -326,8 +326,8 @@ CLASS HB_LogChannel METHOD Send( nStyle, cMessage, cName, nPriority ) VIRTUAL HIDDEN: - DATA nLevel - DATA lActive INIT .T. + VAR nLevel + VAR lActive INIT .T. ENDCLASS @@ -431,7 +431,7 @@ CLASS HB_LogConsole FROM HB_LogChannel PROTECTED: METHOD Send( nStyle, cMessage, cName, nPriority ) - DATA lRealConsole INIT .T. + VAR lRealConsole INIT .T. ENDCLASS @@ -494,10 +494,10 @@ METHOD PROCEDURE Out( ... ) CLASS HB_LogConsole CLASS HB_LogFile FROM HB_LogChannel - DATA cFileName - DATA nFileHandle - DATA nFileLimit INIT -1 - DATA nBackup INIT 5 + VAR cFileName + VAR nFileHandle + VAR nFileLimit INIT -1 + VAR nBackup INIT 5 METHOD New( nLevel, cFilename, nMaxSize, nBackup ) METHOD Open( cProgName ) @@ -533,7 +533,7 @@ METHOD Open( cProgName ) CLASS HB_LogFile ::nFileHandle := FOpen( ::cFileName, FO_READWRITE ) IF ::nFileHandle != F_ERROR FSeek( ::nFileHandle, 0, FS_END ) - END + ENDIF ELSE ::nFileHandle := hb_FCreate( ::cFileName, FC_NORMAL, FO_READWRITE ) ENDIF @@ -602,10 +602,10 @@ METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogFile CLASS HB_LogDbf FROM HB_LogChannel - DATA cDBFName INIT "messages.dbf" - DATA cIndexName INIT "messages.cdx" - DATA cDriver INIT "DBFCDX" - DATA aStruct INIT { ; + VAR cDBFName INIT "messages.dbf" + VAR cIndexName INIT "messages.cdx" + VAR cDriver INIT "DBFCDX" + VAR aStruct INIT { ; { "PRIORITY", "N", 2, 0 } , ; { "PROGNAME", "C", 30, 0 } , ; { "MESSAGE" , "C", 250, 0 } , ; @@ -733,7 +733,7 @@ METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogDbf CLASS HB_LogSyslog FROM HB_LogChannel - DATA nId + VAR nId METHOD New( nLevel, nId ) METHOD Open( cName ) @@ -791,7 +791,7 @@ METHOD Send( nType, cMessage, cName, nPriority ) CLASS HB_LogSyslog CLASS HB_LogDebug FROM HB_LogChannel - DATA nMaxLevel + VAR nMaxLevel METHOD New( nLevel, nMaxLevel ) // Nothing to do in this version diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg index 16ee365eb4..759dc00a82 100644 --- a/harbour/contrib/xhb/htmutil.prg +++ b/harbour/contrib/xhb/htmutil.prg @@ -160,16 +160,16 @@ PROCEDURE htmlBrowse( oHtm, cAction, lUseLinks ) __defaultNIL( @cAction, "confirm('RECORD: '+this.name+'\nPlace your action here !!!')" ) __defaultNIL( @lUseLinks, .F. ) - /* -// browse caption... -oHtm:defineTable( 1, 1, 98 ) -oHtm:newTableRow("black") -oHtm:newTableCell(,,,3,"white") -oHtm:Write( htmlSpace( 5 ) +"Browsing Table: "+ALIAS()+"" ) -oHtm:endTableCell() -oHtm:endTableRow("black") -oHtm:endTable() -*/ +#if 0 + // browse caption... + oHtm:defineTable( 1, 1, 98 ) + oHtm:newTableRow( "black" ) + oHtm:newTableCell(,,, 3, "white" ) + oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) + oHtm:endTableCell() + oHtm:endTableRow( "black" ) + oHtm:endTable() +#endif oHtm:defineTable( FCount(), 1, 98 ) @@ -233,16 +233,17 @@ PROCEDURE htmlBrowseSql( oHtm, cAction, lUseLinks, cTarget, oServer, oQuery ) __defaultNIL( @cAction, "confirm('RECORD: '+this.name+'\nPlace your action here !!!')" ) __defaultNIL( @lUseLinks, .F. ) - /* -// browse caption... -oHtm:defineTable( 1, 1, 98 ) -oHtm:newTableRow("black") -oHtm:newTableCell(,,,3,"white") -oHtm:Write( htmlSpace( 5 ) +"Browsing Table: "+ALIAS()+"" ) -oHtm:endTableCell() -oHtm:endTableRow("black") -oHtm:endTable() -*/ +#if 0 + // browse caption... + oHtm:defineTable( 1, 1, 98 ) + oHtm:newTableRow( "black" ) + oHtm:newTableCell(,,, 3, "white" ) + oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) + oHtm:endTableCell() + oHtm:endTableRow( "black" ) + oHtm:endTable() +#endif + oquery := oServer:query( 'Select * from rafael' ) oHtm:defineTable( oQuery:FCount(), 1, 98 ) @@ -286,7 +287,7 @@ oHtm:endTable() oHtm:newTableCell( cAlign, , , , "black" ) oHtm:Write( greek2Html( htmlany2Str( oCurRow:FieldGet( i ) ) ) ) oHtm:EndTableCell() - END + NEXT oHtm:endTableRow() IF !oquery:EOF() oquery:skip() @@ -299,35 +300,33 @@ oHtm:endTable() #endif -//*** EOF ***// - CLASS JWindow - DATA nH - DATA Name INIT "" - DATA oHtm - DATA VarName INIT "" - DATA URL INIT "" - DATA Features INIT "" + VAR nH + VAR Name INIT "" + VAR oHtm + VAR VarName INIT "" + VAR URL INIT "" + VAR Features INIT "" - DATA ScreenX, ScreenY INIT 100 - DATA HEIGHT, WIDTH INIT 300 - DATA innerHeight, innerWidth, outerHeight INIT 0 - DATA alwaysRaised, alwaysLowered INIT .F. - DATA Menubar, personalBar INIT .F. - DATA location, directories, copyHistory INIT .F. - DATA Toolbar INIT .F. - DATA Status, TitleBar INIT .T. - DATA Scrollbars, Resizable, dependent INIT .T. + VAR ScreenX, ScreenY INIT 100 + VAR HEIGHT, WIDTH INIT 300 + VAR innerHeight, innerWidth, outerHeight INIT 0 + VAR alwaysRaised, alwaysLowered INIT .F. + VAR Menubar, personalBar INIT .F. + VAR location, directories, copyHistory INIT .F. + VAR Toolbar INIT .F. + VAR Status, TitleBar INIT .T. + VAR Scrollbars, Resizable, dependent INIT .T. - DATA TITLE - DATA aScriptSRC - DATA aServerSRC - DATA BGIMAGE, BGCOLOR, fontColor - DATA Style + VAR TITLE + VAR aScriptSRC + VAR aServerSRC + VAR BGIMAGE, BGCOLOR, fontColor + VAR Style - DATA onLoad - DATA onUnLoad + VAR onLoad + VAR onUnLoad METHOD New( cVarName, cUrl, cName, x, y, w, h ) @@ -376,7 +375,7 @@ CLASS JWindow ENDCLASS - /**** +/**** * * Start a new window definition * diff --git a/harbour/contrib/xhb/sprintf.prg b/harbour/contrib/xhb/sprintf.prg index bad6d1bcbf..7adc60332c 100644 --- a/harbour/contrib/xhb/sprintf.prg +++ b/harbour/contrib/xhb/sprintf.prg @@ -156,7 +156,7 @@ FUNCTION sprintf( ... ) nDec := Str( nLen ) DO WHILE Right( nDec, 1 ) == "0" nDec := Left( nDec, Len( nDec ) - 1 ) - END + ENDDO nDec := Val( SubStr( nDec, At( ".", nDec ) + 1 ) ) ELSE nDec := 0 diff --git a/harbour/doc/clipper.txt b/harbour/doc/clipper.txt index b235f971a5..6f0d918837 100644 --- a/harbour/doc/clipper.txt +++ b/harbour/doc/clipper.txt @@ -124,7 +124,7 @@ Harbour supports the following statement: WITH OBJECT expression ... - END + ENDWITH Inside this WITH OBJECT/END enclosure you can use the simplified form of sending messages to the object. You can use the syntax @@ -136,7 +136,7 @@ for example: WITH OBJECT myobj:a[1]:myitem :message( 1 ) :value := 9 - END + ENDWITH The above code is equivalent to: myobj:a[1]:myitem:message( 1 ) @@ -163,4 +163,4 @@ for example: ? :__withobject:name //also prints 'FOO' ? :__withobject := bar():new() ? :name //prints 'BAR' - END + ENDWITH diff --git a/harbour/extras/gtwvw/tests/ebtest7.prg b/harbour/extras/gtwvw/tests/ebtest7.prg index ac68b1648a..d77fef0241 100644 --- a/harbour/extras/gtwvw/tests/ebtest7.prg +++ b/harbour/extras/gtwvw/tests/ebtest7.prg @@ -139,7 +139,7 @@ PROCEDURE GetSession() cdebugreport += "cName:" + cName + hb_eol() cdebugreport += "cNickName:" + cNickName + hb_eol() cdebugreport += "dBirthDate:" + DToC( dBirthDate ) + hb_eol() - cdebugreport += "nBudget:" + transform( nBudget, "999,999.99" ) + hb_eol() + cdebugreport += "nBudget:" + Transform( nBudget, "999,999.99" ) + hb_eol() cdebugreport += "cRemark:" + cRemark MyMessageBox( nwinnum, cdebugreport ) @@ -251,24 +251,24 @@ PROCEDURE EBReadGets( nwinnum, aEBGets ) nmaxrow := 0 nmincol := 99999 FOR i := 1 TO nNumGets - lmultiline := aEBGets[i][__GET_LMULTILINE] + lmultiline := aEBGets[ i ][__GET_LMULTILINE] IF !lmultiline - nlen := Len( aEBGets[i][__GET_CPICT] ) + nlen := Len( aEBGets[ i ][__GET_CPICT] ) ELSE nlen := 30 ENDIF - clabel := aEBGets[i][__GET_CLABEL] - nrow1 := aEBGets[i][__GET_NROW] - ncol1 := aEBGets[i][__GET_NCOL] - nrow2 := iif( aEBGets[i][__GET_LMULTILINE], nrow1 + 3, nrow1 ) + clabel := aEBGets[ i ][__GET_CLABEL] + nrow1 := aEBGets[ i ][__GET_NROW] + ncol1 := aEBGets[ i ][__GET_NCOL] + nrow2 := iif( aEBGets[ i ][__GET_LMULTILINE], nrow1 + 3, nrow1 ) ncol2 := ncol1 + nlen - 1 @ nrow1, ncol1 - Len( clabel ) - 1 SAY clabel - aEBGets[i][__GET_NEBID] := wvw_ebcreate( nwinnum, nrow1, ncol1, nrow2, ncol2, ; - Transform( aEBGets[i][__GET_XINIT], aEBGets[i][__GET_CPICT] ), ; + aEBGets[ i ][__GET_NEBID] := wvw_ebcreate( nwinnum, nrow1, ncol1, nrow2, ncol2, ; + Transform( aEBGets[ i ][__GET_XINIT], aEBGets[ i ][__GET_CPICT] ), ; {| nWinNum, nId, nEvent | MaskEditBox( nWinNum, nId, nEvent, @aEBGets ) }, ; - aEBGets[i][__GET_LMULTILINE], ; //EBtype + aEBGets[ i ][__GET_LMULTILINE], ; //EBtype 0, ; //nmorestyle iif( lmultiline, NIL, nlen + 1 ), ; //nMaxChar NIL, NIL ) @@ -407,7 +407,7 @@ STATIC PROCEDURE EndGets( nwinnum, aEBGets, nOKbutton, nCancelbutton, nCloseButt // session ended FOR i := 1 TO Len( aEBGets ) - wvw_ebenable( nwinnum, aEBGets[i][__GET_NEBID], .F. ) + wvw_ebenable( nwinnum, aEBGets[ i ][__GET_NEBID], .F. ) NEXT wvw_pbenable( nwinnum, nOKbutton, .F. ) wvw_pbenable( nwinnum, nCancelbutton, .F. ) @@ -599,7 +599,7 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) LOCAL pFlag := .F. LOCAL ncp := 0 LOCAL NegativeZero := .F. - LOCAL Output := '' + LOCAL Output := "" LOCAL ol := 0 IF mcvaltype == "N" @@ -620,7 +620,7 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) pFlag := .F. //x for clarity IF mcvaltype == "N" // RL 104 - IF Left( AllTrim( InBuffer ) , 1 ) == '-' .AND. Val( InBuffer ) == 0 + IF Left( AllTrim( InBuffer ) , 1 ) == "-" .AND. Val( InBuffer ) == 0 NegativeZero := .T. ENDIF @@ -628,13 +628,13 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) // Point Count For Numeric InputMask FOR x := 1 TO Len( InBuffer ) CB := SubStr( InBuffer , x , 1 ) - IF CB == '.' .OR. CB == ',' + IF CB == "." .OR. CB == "," pc++ ENDIF NEXT x // RL 89 - IF Left( InBuffer, 1 ) == '.' .OR. Left( InBuffer, 1 ) == ',' + IF Left( InBuffer, 1 ) == "." .OR. Left( InBuffer, 1 ) == "," pFlag := .T. ENDIF @@ -658,9 +658,9 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) InBufferRight := Right( InBuffer , Len( InBuffer ) - icp ) - IF CharMaskTekstOK( InBufferLeft + ' ' + InBufferRight, mcvaltype, Mask ) .AND. ; + IF CharMaskTekstOK( InBufferLeft + " " + InBufferRight, mcvaltype, Mask ) .AND. ; !CharMaskTekstOK( InBufferLeft + InBufferRight, mcvaltype, Mask ) - InBuffer := InBufferLeft + ' ' + InBufferRight + InBuffer := InBufferLeft + " " + InBufferRight ELSE InBuffer := InBufferLeft + InBufferRight ENDIF @@ -684,9 +684,9 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) CM := SubStr( Mask , x , 1 ) DO CASE - CASE ( CM ) == 'A' .OR. ( CM ) == '!' - IF IsAlpha( CB ) .OR. CB == ' ' - IF ( CM ) == "!" + CASE CM == "A" .OR. CM == "!" + IF IsAlpha( CB ) .OR. CB == " " + IF CM == "!" OutBuffer := OutBuffer + Upper( CB ) ELSE OutBuffer := OutBuffer + CB @@ -696,14 +696,14 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) BadEntry := .T. OutBuffer := OutBuffer + OldChar ELSE - OutBuffer := OutBuffer + ' ' + OutBuffer := OutBuffer + " " ENDIF ENDIF - CASE CM == '9' - IF IsDigit( CB ) .OR. CB == ' ' .OR. ; + CASE CM == "9" + IF IsDigit( CB ) .OR. CB == " " .OR. ; ( mcvaltype == "N" .AND. ; //x - CB == '-' .AND. x == fnb .AND. PCount() > 1 ) + CB == "-" .AND. x == fnb .AND. PCount() > 1 ) OutBuffer := OutBuffer + CB ELSE @@ -711,24 +711,24 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) BadEntry := .T. OutBuffer := OutBuffer + OldChar ELSE - OutBuffer := OutBuffer + ' ' + OutBuffer := OutBuffer + " " ENDIF ENDIF - CASE CM == ' ' - IF CB == ' ' + CASE CM == " " + IF CB == " " OutBuffer := OutBuffer + CB ELSE IF x == icp BadEntry := .T. OutBuffer := OutBuffer + OldChar ELSE - OutBuffer := OutBuffer + ' ' + OutBuffer := OutBuffer + " " ENDIF ENDIF //x - CASE CM == 'X' + CASE CM == "X" OutBuffer := OutBuffer + CB OTHERWISE @@ -747,23 +747,23 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) // RL 104 IF NegativeZero == .T. - Output := Transform( GetValFromText( wvw_ebgettext(mnwinnum, mnebid ) , mcvaltype ) , Mask ) + Output := Transform( GetValFromText( wvw_ebgettext( mnwinnum, mnebid ), mcvaltype ) , Mask ) //x better: ol := Len( Output ) - Output := PadL( "-" + SubStr( Output, At('.',OutBuffer ) - 1 ), ol ) + Output := PadL( "-" + SubStr( Output, At( ".", OutBuffer ) - 1 ), ol ) // Replace Text wvw_ebsettext( mnwinnum, mnebid, Output ) - wvw_ebsetsel( mnwinnum, mnebid, At( '.',OutBuffer ) + dc, At( '.',OutBuffer ) + dc ) + wvw_ebsetsel( mnwinnum, mnebid, At( ".", OutBuffer ) + dc, At( ".", OutBuffer ) + dc ) ELSE - wvw_ebsettext( mnwinnum, mnebid, Transform( GetValFromText( wvw_ebgettext(mnwinnum, mnebid ) , mcvaltype ) , Mask ) ) - wvw_ebsetsel( mnwinnum, mnebid, At( '.',OutBuffer ) + dc, At( '.',OutBuffer ) + dc ) + wvw_ebsettext( mnwinnum, mnebid, Transform( GetValFromText( wvw_ebgettext( mnwinnum, mnebid ), mcvaltype ) , Mask ) ) + wvw_ebsetsel( mnwinnum, mnebid, At( ".", OutBuffer ) + dc, At( ".", OutBuffer ) + dc ) ENDIF ELSE IF pFlag == .T. - ncp := At( '.' , wvw_ebgettext( mnwinnum, mnebid ) ) + ncp := At( "." , wvw_ebgettext( mnwinnum, mnebid ) ) wvw_ebsetsel( mnwinnum, mnebid, ncp, ncp ) ELSE // Restore Initial CaretPos @@ -779,7 +779,7 @@ STATIC PROCEDURE ProcessCharMask( mnwinnum, mnebid, mcvaltype, mcpict ) CM := SubStr( Mask , icp + x , 1 ) IF !IsDigit( CB ) .AND. !IsAlpha( CB ) .AND. ; - ( !( CB == ' ' ) .OR. ( CB == ' ' .AND. CM == ' ' ) ) + ( !( CB == " " ) .OR. ( CB == " " .AND. CM == " " ) ) wvw_ebsetsel( mnwinnum, mnebid, icp + x, icp + x ) ELSE EXIT @@ -796,14 +796,13 @@ STATIC FUNCTION CharMaskTekstOK( cString, cvaltype, cMask ) LOCAL lPassed := .T. , CB, CM, x -//x BEGIN IF cvaltype == "D" FOR x := 1 TO Min( Len( cString ), Len( cMask ) ) CB := SubStr( cString , x , 1 ) CM := SubStr( cMask , x , 1 ) DO CASE - CASE CM == '9' - IF IsDigit( CB ) .OR. CB == ' ' + CASE CM == "9" + IF IsDigit( CB ) .OR. CB == " " // lPassed:=.T. ELSE RETURN .F. @@ -814,33 +813,32 @@ STATIC FUNCTION CharMaskTekstOK( cString, cvaltype, cMask ) NEXT i RETURN .T. ENDIF -//x END FOR x := 1 TO Min( Len( cString ), Len( cMask ) ) CB := SubStr( cString , x , 1 ) CM := SubStr( cMask , x , 1 ) DO CASE // JK - CASE ( CM ) == 'A' .OR. ( CM ) == '!' - IF IsAlpha( CB ) .OR. CB == ' ' - // lPassed:=.T. + CASE ( CM ) == "A" .OR. ( CM ) == "!" + IF IsAlpha( CB ) .OR. CB == " " + // lPassed := .T. ELSE RETURN .F. ENDIF - CASE CM == '9' - IF IsDigit( CB ) .OR. CB == ' ' - // lPassed:=.T. + CASE CM == "9" + IF IsDigit( CB ) .OR. CB == " " + // lPassed := .T. ELSE RETURN .F. ENDIF - CASE CM == ' ' - IF CB == ' ' - // lPassed:=.T. + CASE CM == " " + IF CB == " " + // lPassed := .T. ELSE RETURN .F. ENDIF OTHERWISE - // lPassed:=.T. + // lPassed := .T. ENDCASE NEXT i @@ -853,7 +851,6 @@ STATIC FUNCTION GetValFromText( Text , mcvaltype ) // eg. GetValFromText( "999,999.99" ) --> 999999.99 LOCAL x , c , s -//x BEGIN IF mcvaltype == "C" RETURN TEXT ENDIF @@ -862,24 +859,23 @@ STATIC FUNCTION GetValFromText( Text , mcvaltype ) s := CToD( Text ) RETURN s ENDIF -//x END // ASSUME numeric - s := '' + s := "" FOR x := 1 TO Len( Text ) c := SubStr( Text, x, 1 ) - //If c='0' .or. c='1' .or. c='2' .or. c='3' .or. c='4' .or. c='5' .or. c='6' .or. c='7' .or. c='8' .or. c='9' .or. c='.' .or. c='-' - IF c $ '0123456789' .OR. c $ '.-' - s := s + c + //If c="0" .or. c="1" .or. c="2" .or. c="3" .or. c="4" .or. c="5" .or. c="6" .or. c="7" .or. c="8" .or. c="9" .or. c="." .or. c="-" + IF c $ "0123456789" .OR. c $ ".-" + s += c ENDIF NEXT x - IF Left( AllTrim( Text ) , 1 ) == '(' .OR. Right( AllTrim( Text ) , 2 ) == 'DB' - s := '-' + s + IF Left( AllTrim( Text ), 1 ) == "(" .OR. Right( AllTrim( Text ), 2 ) == "DB" + s := "-" + s ENDIF //useless! -// s := Transform( Val( s ) , Getnummask( s_cmask, mcvaltype ) ) +// s := Transform( Val( s ), Getnummask( s_cmask, mcvaltype ) ) RETURN Val( s ) @@ -887,23 +883,22 @@ STATIC FUNCTION GetValFromText( Text , mcvaltype ) STATIC FUNCTION GetNumMask( Text, mcvaltype ) - // eg. GetNumMask("999,999.99") --> "999999.99" + // eg. GetNumMask( "999,999.99" ) --> "999999.99" LOCAL i , c , s -//x BEGIN + IF mcvaltype == "D" .OR. mcvaltype == "C" s := Text RETURN s ENDIF -//x END - s := '' + s := "" FOR i := 1 TO Len( Text ) c := SubStr( Text, i, 1 ) - IF c == '9' .OR. c == '.' - s := s + c + IF c == "9" .OR. c == "." + s += c ENDIF - IF c == '$' .OR. c == '*' - s := s + '9' + IF c == "$" .OR. c == "*" + s += "9" ENDIF NEXT i diff --git a/harbour/extras/gtwvw/tests/maximize.prg b/harbour/extras/gtwvw/tests/maximize.prg index 6fb90969c0..490dc4bad8 100644 --- a/harbour/extras/gtwvw/tests/maximize.prg +++ b/harbour/extras/gtwvw/tests/maximize.prg @@ -60,15 +60,15 @@ PROCEDURE updatescr() NEXT FOR i := 0 TO MaxCol() @ MaxRow(), i SAY "B" - //@ maxrow()-1,i say right(transform(i,"999"),1) +// @ Maxrow() - 1, i SAY Right( Transform( i, "999" ), 1 ) NEXT FOR i := 0 TO MaxRow() @ i, MaxCol() SAY "R" NEXT - @ Int( MaxRow()/2 ) + 0, 2 SAY PadC( "Press MAXIMIZE/RESTORE button to change dimension", MaxCol() + 1 - 4 ) - @ Int( MaxRow()/2 ) + 1, 2 SAY PadC( "Try also changing taskbar size/position", MaxCol() + 1 - 4 ) - @ Int( MaxRow()/2 ) + 3, 2 SAY PadC( "Press any key to redraw screen", MaxCol() + 1 - 4 ) - @ Int( MaxRow()/2 ) + 4, 2 SAY PadC( "Press ESC to quit", MaxCol() + 1 - 4 ) + @ Int( MaxRow() / 2 ) + 0, 2 SAY PadC( "Press MAXIMIZE/RESTORE button to change dimension", MaxCol() + 1 - 4 ) + @ Int( MaxRow() / 2 ) + 1, 2 SAY PadC( "Try also changing taskbar size/position", MaxCol() + 1 - 4 ) + @ Int( MaxRow() / 2 ) + 3, 2 SAY PadC( "Press any key to redraw screen", MaxCol() + 1 - 4 ) + @ Int( MaxRow() / 2 ) + 4, 2 SAY PadC( "Press ESC to quit", MaxCol() + 1 - 4 ) diminfo() RETURN diff --git a/harbour/extras/gtwvw/tests/prog0.prg b/harbour/extras/gtwvw/tests/prog0.prg index ddd10912f7..3ef83e4de9 100644 --- a/harbour/extras/gtwvw/tests/prog0.prg +++ b/harbour/extras/gtwvw/tests/prog0.prg @@ -103,20 +103,20 @@ FUNCTION xBrowse1() LOCAL nCursor := SetCursor( SC_NONE ) LOCAL nWin - USE '..\..\..\tests\test' NEW + USE "..\..\..\tests\test" NEW IF NetErr() RETURN NIL ENDIF info_ := dbStruct() - SetColor( 'N/W*,N/GR*,,,N/W* ' ) + SetColor( "N/W*,N/GR*,,,N/W* " ) oBrowse := TBrowseNew( nTop + 1, nLeft + 1, nBottom - 1, nRight - 1 ) oBrowse:ColSep := hb_UTF8ToStrBox( "│" ) oBrowse:HeadSep := hb_UTF8ToStrBox( "─" ) - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip, oBrowse ) } + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip, oBrowse ) } FOR i := 1 TO Len( info_ ) bBlock := VouBlockField( i ) @@ -166,7 +166,7 @@ FUNCTION xBrowse1() CASE nKey == K_CTRL_END oBrowse:panEnd() ENDCASE - end + ENDDO lMessage( "" ) diff --git a/harbour/extras/gtwvw/tests/prog1.prg b/harbour/extras/gtwvw/tests/prog1.prg index fbdba5eb49..ae7224a429 100644 --- a/harbour/extras/gtwvw/tests/prog1.prg +++ b/harbour/extras/gtwvw/tests/prog1.prg @@ -127,20 +127,20 @@ FUNCTION xBrowse1() LOCAL nCursor := SetCursor( SC_NONE ) LOCAL nWin - USE '..\..\..\tests\TEST' NEW + USE "..\..\..\tests\test" NEW IF NetErr() RETURN NIL ENDIF info_ := dbStruct() - SetColor( 'N/W*,N/GR*,,,N/W* ' ) + SetColor( "N/W*,N/GR*,,,N/W* " ) oBrowse := TBrowseNew( nTop + 1, nLeft + 1, nBottom - 1, nRight - 1 ) oBrowse:ColSep := hb_UTF8ToStrBox( "│" ) oBrowse:HeadSep := hb_UTF8ToStrBox( "═" ) - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip, oBrowse ) } + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip, oBrowse ) } FOR i := 1 TO Len( info_ ) bBlock := VouBlockField( i ) @@ -190,7 +190,7 @@ FUNCTION xBrowse1() CASE nKey == K_CTRL_END oBrowse:panEnd() ENDCASE - end + ENDDO lMessage( "" ) diff --git a/harbour/extras/gtwvw/tests/prog2.prg b/harbour/extras/gtwvw/tests/prog2.prg index 54323bb83f..afa89a2992 100644 --- a/harbour/extras/gtwvw/tests/prog2.prg +++ b/harbour/extras/gtwvw/tests/prog2.prg @@ -65,7 +65,7 @@ PROCEDURE Main() DispEnd() #else ResetMiscObjects( 0 ) //make sure we start with no GUI objects - AddMiscObjects( 0, {| nWindow | WVW_DrawImage( nWindow, 1, 0, nmaxrow, nmaxcol, 'vouch1.bmp' ) } ) + AddMiscObjects( 0, {| nWindow | WVW_DrawImage( nWindow, 1, 0, nmaxrow, nmaxcol, "vouch1.bmp" ) } ) #endif lboxmessage( "Welcome to our test program." + hb_eol() + ; @@ -139,13 +139,13 @@ FUNCTION xBrowse1() LOCAL aColumnsSep, tmp #endif - USE '..\..\..\tests\TEST' NEW + USE "..\..\..\tests\test" NEW IF NetErr() RETURN NIL ENDIF info_ := dbStruct() - SetColor( 'N/W*,N/GR*,,,N/W* ' ) + SetColor( "N/W*,N/GR*,,,N/W* " ) oBrowse := TBrowseNew( nTop + 1, nLeft + 1, nBottom - 1, nRight - 1 ) #ifndef __GTWVW__ @@ -155,13 +155,13 @@ FUNCTION xBrowse1() oBrowse:ColSep := " " //we'll draw a line between these spaces oBrowse:HeadSep := "__" #endif - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip, oBrowse ) } + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip, oBrowse ) } FOR i := 1 TO Len( info_ ) bBlock := VouBlockField( i ) - oBrowse:AddColumn( TBColumnNew( info_[ i,1 ], bBlock ) ) + oBrowse:AddColumn( TBColumnNew( info_[ i, 1 ], bBlock ) ) NEXT oBrowse:configure() diff --git a/harbour/extras/gtwvw/tests/wvwmouse.prg b/harbour/extras/gtwvw/tests/wvwmouse.prg index 987d1118c3..05584ca388 100644 --- a/harbour/extras/gtwvw/tests/wvwmouse.prg +++ b/harbour/extras/gtwvw/tests/wvwmouse.prg @@ -9,8 +9,8 @@ This is a sample of implementation of a pseudo GUI object in GTWVW, using GTWVW GUI primitives. - Example on how to use it is given in WVWTEST9.PRG. - eg. WVWMouseObject():New("Button1", maxrow()-1, 10, , , {|| tone(660,3) } ) + Example on how to use it is given in wvwtest9.prg. + eg. WVWMouseObject():New( "Button1", MaxRow() - 1, 10, , , {|| Tone( 660, 3 ) } ) NOTES: This is just a sample. You may not want to see it as a 'model'. diff --git a/harbour/extras/gtwvw/tests/wvwtest9.prg b/harbour/extras/gtwvw/tests/wvwtest9.prg index 88208a6ff7..deb3991547 100644 --- a/harbour/extras/gtwvw/tests/wvwtest9.prg +++ b/harbour/extras/gtwvw/tests/wvwtest9.prg @@ -250,7 +250,7 @@ PROCEDURE Main() CreateToolbar( nCurWindow ) ResetMiscObjects( nCurWindow ) - AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,40, cLabel,6,, rgb(255,255,255 ), rgb(198,198,198 ), 'Arial', s_afontinfo[2], , , , , .T. , .T. ) } ) + AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,40, cLabel,6,, rgb(255,255,255 ), rgb(198,198,198 ), "Arial", s_afontinfo[2], , , , , .T. , .T. ) } ) wvwm_ResetMouseObjects( nCurWindow ) wvwm_AddMouseObjects( nCurWindow, WVWMouseButton():New( "Info!", MaxRow() - 2,67, , , {|| xDebugInfo() } ) ) @@ -276,7 +276,7 @@ PROCEDURE Main() // 20070525 the real pushbutton, easier and better looking. Nothing to do with wvwmouse.prg. WVW_PBcreate( nCurWindow, MaxRow() - 4, 67 - 11 - 11 - 11 - 11 - 11, MaxRow() - 4, 67 + 9 - 11 - 11 - 11 - 11 - 11, "native", NIL, {||lboxmessage( "native pushbutton" ) }, NIL ) - SetColor( 'N/W,N/GR*,,,N/W*' ) + SetColor( "N/W,N/GR*,,,N/W*" ) CLS @ 0, 0 SAY "This is line 0" @ 1, 0 SAY "This is line 1" @@ -439,10 +439,10 @@ PROCEDURE Demo_Get() LOCAL nRight := 75 LOCAL nColGet := 8 LOCAL get_1 := SToD() - LOCAL get_2 := PadR( 'Pritpal Bedi', 35 ) - LOCAL get_3 := PadR( '60, New Professor Colony', 35 ) - LOCAL get_4 := PadR( 'Ludhiana, INDIA', 35 ) - LOCAL get_5 := PadR( 'http://www.vouchcac.com', 35 ) + LOCAL get_2 := PadR( "Pritpal Bedi", 35 ) + LOCAL get_3 := PadR( "60, New Professor Colony", 35 ) + LOCAL get_4 := PadR( "Ludhiana, INDIA", 35 ) + LOCAL get_5 := PadR( "http://www.vouchcac.com", 35 ) LOCAL get_6 := 20000 LOCAL nCursor := SetCursor( SC_NORMAL ) MEMVAR x @@ -454,14 +454,14 @@ PROCEDURE Demo_Get() RETURN ENDIF - WVW_SetIcon( , 'vr_1.ico' ) + WVW_SetIcon( , "vr_1.ico" ) ResetMiscObjects( nCurWindow ) - AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,nRight - nLeft, cLabel,2,, rgb(255,255,255 ), rgb(198,198,198 ), 'Arial', s_afontinfo[2], , , , , .T. , .T. ) } ) + AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawLabel( nWindow, 1,nRight - nLeft, cLabel,2,, rgb(255,255,255 ), rgb(198,198,198 ), "Arial", s_afontinfo[2], , , , , .T. , .T. ) } ) AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxRecessed( nWindow, 7 - nTop, 61 - nLeft, 13 - nTop, 70 - nLeft ) } ) AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxGroup( nWindow, 15 - nTop, 59 - nLeft, 18 - nTop, 72 - nLeft ) } ) AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxGroup( nWindow, 5 - nTop, 6 - nLeft, 19 - nTop, 44 - nLeft ) } ) - AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawImage( nWindow, 8 - nTop,62 - nLeft,12 - nTop,69 - nLeft, 'vouch1.bmp' ) } ) + AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawImage( nWindow, 8 - nTop,62 - nLeft,12 - nTop,69 - nLeft, "vouch1.bmp" ) } ) AddMiscObjects( nCurWindow, {| nWindow | WVW_DrawBoxRecessed( nWindow, 7 - nTop, 48 - nLeft, 13 - nTop, 55 - nLeft ) } ) AddMiscObjects( nCurWindow, {| nWindow | x := nWindow, AEval( GetList, {| oGet | WVW_DrawBoxGet( x, oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } ) } ) @@ -474,17 +474,17 @@ PROCEDURE Demo_Get() CLS - @ 6 - nTop, nColGet - nLeft SAY '< Date >' - @ 9 - nTop, nColGet - nLeft SAY '<' + PadC( 'Name', 33 ) + '>' - @ 12 - nTop, nColGet - nLeft SAY '<' + PadC( 'Address', 33 ) + '>' - @ 16 - nTop, 61 - nLeft SAY '< Salary >' + @ 6 - nTop, nColGet - nLeft SAY "< Date >" + @ 9 - nTop, nColGet - nLeft SAY "<" + PadC( "Name", 33 ) + ">" + @ 12 - nTop, nColGet - nLeft SAY "<" + PadC( "Address", 33 ) + ">" + @ 16 - nTop, 61 - nLeft SAY "< Salary >" @ 7 - nTop, nColGet - nLeft GET get_1 @ 10 - nTop, nColGet - nLeft GET get_2 //VALID ( VouChoice() < 7 ) @ 13 - nTop, nColGet - nLeft GET get_3 @ 15 - nTop, nColGet - nLeft GET get_4 @ 17 - nTop, nColGet - nLeft GET get_5 - @ 17 - nTop, 61 - nLeft GET get_6 PICTURE '@Z 9999999.99' + @ 17 - nTop, 61 - nLeft GET get_6 PICTURE "@Z 9999999.99" READ @@ -531,11 +531,11 @@ FUNCTION DEMO_Browse() ResetMiscObjects( nCurWindow ) wvwm_ResetMouseObjects( nCurWindow ) - cColor := SetColor( 'N/W' ) + cColor := SetColor( "N/W" ) CLS - SetColor( 'N/W*,N/GR*,,,N/W* ' ) + SetColor( "N/W*,N/GR*,,,N/W* " ) - USE '..\..\..\tests\TEST' NEW + USE "..\..\..\tests\test" NEW IF NetErr() WVW_lCloseWindow() RETURN NIL @@ -547,11 +547,11 @@ FUNCTION DEMO_Browse() oBrowse := TBrowseNew( 3, 2, MaxRow() - 3, MaxCol() - 3 ) - oBrowse:ColSep := ' ' - oBrowse:HeadSep := '__' - oBrowse:GoTopBlock := { || dbGoTop() } - oBrowse:GoBottomBlock := { || dbGoBottom() } - oBrowse:SkipBlock := { | nSkip | dbSkipBlock( nSkip, oBrowse ) } + oBrowse:ColSep := " " + oBrowse:HeadSep := "__" + oBrowse:GoTopBlock := {|| dbGoTop() } + oBrowse:GoBottomBlock := {|| dbGoBottom() } + oBrowse:SkipBlock := {| nSkip | dbSkipBlock( nSkip, oBrowse ) } FOR i := 1 TO Len( info_ ) bBlock := VouBlockField( i ) @@ -561,7 +561,7 @@ FUNCTION DEMO_Browse() oBrowse:configure() WVW_SetPen( nStyle, 0, rgb( 210,1210,210 ) ) - WVW_SetIcon( , 'DIA_EXCL.ico' ) + WVW_SetIcon( , "dia_excl.ico" ) aColumnsSep := Array( oBrowse:colCount ) FOR EACH tmp IN aColumnsSep @@ -580,7 +580,7 @@ FUNCTION DEMO_Browse() nHScrollBar := wvw_xbCreate( nCurWindow, 0, oBrowse:nBottom + 1, oBrowse:nLeft, oBrowse:nRight - oBrowse:nLeft + 1, /*aBlock*/ {| nWinNum, nXBid, nXBmsg, nXBpos | HXBscroller( oBrowse, nWinNum, nXBid, nXBmsg ) }, /*aOffset*/ NIL ) nVScrollBar := wvw_xbCreate( nCurWindow, 1, oBrowse:nTop, oBrowse:nRight + 1, oBrowse:nBottom - oBrowse:nTop + 1, /*aBlock*/ {| nWinNum, nXBid, nXBmsg, nXBpos | VXBscroller( oBrowse, nWinNum, nXBid, nXBmsg ) }, /*aOffset*/ NIL ) - hb_DispOutAt( nTop + 1 - nTop, nleft - nleft, PadC( hb_CurDrive() + ':\' + CurDir() + '\' + 'test.dbf', nRight - nLeft + 1 ), 'W+/W' ) + hb_DispOutAt( nTop + 1 - nTop, nleft - nleft, PadC( hb_CurDrive() + ":" + hb_ps() + CurDir() + hb_ps() + "test.dbf", nRight - nLeft + 1 ), "W+/W" ) oBrowse:ForceStable() RefreshHXB( oBrowse, nCurWindow, nHScrollBar ) //20040704 @@ -876,7 +876,7 @@ STATIC FUNCTION TBPrev( oTbr ) STATIC FUNCTION VouBlockField( i ) - RETURN { || FieldGet( i ) } + RETURN {|| FieldGet( i ) } // // WVW_Paint() must be a FUNCTION in your application @@ -914,7 +914,7 @@ FUNCTION WVW_SetFocus( hWnd, nWinNum ) s_nGotFocus++ @ 0, 0 SAY s_nGotFocus IF s_nGotFocus % 3 == 0 - Alert( "Got focus " + transform( s_nGotFocus,"9999" ) + "th times" ) + Alert( "Got focus " + Transform( s_nGotFocus, "9999" ) + "th times" ) ENDIF RETURN NIL @@ -1225,15 +1225,15 @@ FUNCTION SetDefaultWindowSize() screenWidth := Wvw_GetScreenWidth() DO CASE CASE screenWidth >= 1024 - Result := Wvw_SetFont( , 'Terminal', 20, 10 ) + Result := Wvw_SetFont( , "Terminal", 20, 10 ) CASE screenWidth >= 800 IF hb_osIsWinNT() - Result := Wvw_SetFont( , 'Lucida Console', 16, - 8 ) + Result := Wvw_SetFont( , "Lucida Console", 16, - 8 ) ELSE - Result := Wvw_SetFont( , 'System', 16, - 8 ) + Result := Wvw_SetFont( , "System", 16, - 8 ) ENDIF OTHERWISE - Result := Wvw_SetFont( , 'Terminal', 12, 6 ) + Result := Wvw_SetFont( , "Terminal", 12, 6 ) ENDCASE IF Result Wvw_SetCodePage( , 255 ) // #define OEM_CHARSET 255 - from wingdi.h @@ -1256,7 +1256,7 @@ STATIC FUNCTION isWinNT() PROCEDURE ErrorSys() - ErrorBlock( { |e| MyError( e ) } ) + ErrorBlock( {| e | MyError( e ) } ) RETURN diff --git a/harbour/extras/hbdoc/hbdoc.prg b/harbour/extras/hbdoc/hbdoc.prg index 9c95b74f76..9247f8c8f1 100644 --- a/harbour/extras/hbdoc/hbdoc.prg +++ b/harbour/extras/hbdoc/hbdoc.prg @@ -182,7 +182,7 @@ PROCEDURE Main( ... ) ELSE AAdd( p_hsSwitches[ "format" ], arg ) ENDIF - END + ENDIF CASE cArgName == "-output-single" ; p_hsSwitches[ "output" ] := "single" CASE cArgName == "-output-category" ; p_hsSwitches[ "output" ] := "category" CASE cArgName == "-output-entry" ; p_hsSwitches[ "output" ] := "entry" diff --git a/harbour/extras/httpsrv/cookie.prg b/harbour/extras/httpsrv/cookie.prg index e9db894384..eb2452e9c4 100644 --- a/harbour/extras/httpsrv/cookie.prg +++ b/harbour/extras/httpsrv/cookie.prg @@ -52,12 +52,6 @@ #include "hbclass.ch" -#command IF THEN <*statement*> =>; - IF () ; ; END - -#command IF THEN ELSE =>; - IF () ; ; ELSE ; ; END - MEMVAR _COOKIE FUNCTION uhttpd_CookieNew( cDomain, cPath, nExpireDays, nExpireSecs ) @@ -89,10 +83,18 @@ ENDCLASS // ------------------------------ METHOD SetCookieDefaults( cDomain, cPath, nExpireDays, nExpireSecs ) CLASS uhttpd_Cookie - IF cDomain != NIL THEN ::cDomain := cDomain - IF cPath != NIL THEN ::cPath := cPath - IF nExpireDays != NIL THEN ::nExpireDays := nExpireDays - IF nExpireSecs != NIL THEN ::nExpireSecs := nExpireSecs + IF cDomain != NIL + ::cDomain := cDomain + ENDIF + IF cPath != NIL + ::cPath := cPath + ENDIF + IF nExpireDays != NIL + ::nExpireDays := nExpireDays + ENDIF + IF nExpireSecs != NIL + ::nExpireSecs := nExpireSecs + ENDIF RETURN NIL METHOD SetCookie( cCookieName, xValue, cDomain, cPath, cExpires, lSecure, lHttpOnly ) CLASS uhttpd_Cookie diff --git a/harbour/extras/httpsrv/session.prg b/harbour/extras/httpsrv/session.prg index 20e5d19019..4e2c7e5964 100644 --- a/harbour/extras/httpsrv/session.prg +++ b/harbour/extras/httpsrv/session.prg @@ -54,12 +54,6 @@ #include "fileio.ch" #include "directry.ch" -#command IF THEN <*statement*> =>; - IF () ; ; END - -#command IF THEN ELSE =>; - IF () ; ; ELSE ; ; END - #xtranslate SetNewValueReturnOld(

, ) => LOCAL xOld, xOld :=

, iif( != NIL,

:= , ), xOld #xtranslate DEFAULT(

, ) => (

:= iif(

== NIL, ,

) ) @@ -380,10 +374,18 @@ METHOD CacheLimiter( cNewLimiter ) CLASS uhttpd_Session RETURN cOldLimiter METHOD SetCookieParams( nLifeTime, cPath, cDomain, lSecure ) CLASS uhttpd_Session - IF nLifeTime != NIL THEN ::nCookie_LifeTime := nLifeTime - IF cPath != NIL THEN ::cCookie_Path := cPath - IF cDomain != NIL THEN ::cCookie_Domain := cDomain - IF lSecure != NIL THEN ::lCookie_Secure := lSecure + IF nLifeTime != NIL + ::nCookie_LifeTime := nLifeTime + ENDIF + IF cPath != NIL + ::cCookie_Path := cPath + ENDIF + IF cDomain != NIL + ::cCookie_Domain := cDomain + ENDIF + IF lSecure != NIL + ::lCookie_Secure := lSecure + ENDIF RETURN NIL METHOD RegenerateID() CLASS uhttpd_Session @@ -566,18 +568,34 @@ METHOD CheckSID( cSID, cCRCKey ) CLASS uhttpd_Session // ------------------------------ METHOD SetSaveHandler( bOpen, bClose, bRead, bWrite, bDestroy, bGC ) CLASS uhttpd_Session - IF bOpen != NIL THEN ::bOpen := bOpen - IF bClose != NIL THEN ::bClose := bClose - IF bRead != NIL THEN ::bRead := bRead - IF bWrite != NIL THEN ::bWrite := bWrite - IF bDestroy != NIL THEN ::bDestroy := bDestroy - IF bGC != NIL THEN ::bGC := bGC + IF bOpen != NIL + ::bOpen := bOpen + ENDIF + IF bClose != NIL + ::bClose := bClose + ENDIF + IF bRead != NIL + ::bRead := bRead + ENDIF + IF bWrite != NIL + ::bWrite := bWrite + ENDIF + IF bDestroy != NIL + ::bDestroy := bDestroy + ENDIF + IF bGC != NIL + ::bGC := bGC + ENDIF RETURN NIL METHOD SessionOpen( cPath, cName ) CLASS uhttpd_Session //TraceLog( "SessionOpen() - cName", cName ) - IF cPath != NIL THEN ::cSavePath := cPath - IF cName != NIL THEN ::cName := cName + IF cPath != NIL + ::cSavePath := cPath + ENDIF + IF cName != NIL + ::cName := cName + ENDIF RETURN .T. @@ -785,7 +803,9 @@ METHOD Encode() CLASS uhttpd_Session FOR EACH cKey IN _SESSION:Keys xVal := _SESSION[ cKey ] - IF xVal != NIL THEN aAdd( aSerial, { cKey, xVal } ) + IF xVal != NIL + AAdd( aSerial, { cKey, xVal } ) + ENDIF NEXT ENDIF diff --git a/harbour/src/rtl/tbrowse.prg b/harbour/src/rtl/tbrowse.prg index 8251d0cbf0..f98b7128b0 100644 --- a/harbour/src/rtl/tbrowse.prg +++ b/harbour/src/rtl/tbrowse.prg @@ -845,7 +845,7 @@ METHOD forceStable() CLASS TBROWSE * be changed. I'll change it in the future but first I will have * to revert my stupid modifications in Harbour core code. Looking * at old TBrowse implementation I replaced some: - * DO WHILE !oBrw:stabilize(); END + * DO WHILE !oBrw:stabilize(); ENDDO * with: * oBrw:forceStable() * In Clipper it's not the same because oBrw:forceStable() diff --git a/harbour/tests/destruct.prg b/harbour/tests/destruct.prg index 5547e91cb8..6baddd5a9e 100644 --- a/harbour/tests/destruct.prg +++ b/harbour/tests/destruct.prg @@ -56,7 +56,7 @@ STATIC PROCEDURE SIMPLETEST( type ) ? "=> o := NIL" BEGIN SEQUENCE o := NIL - END + END SEQUENCE RETURN @@ -73,11 +73,11 @@ STATIC PROCEDURE GCFREETEST( type ) ? "=> o := NIL" BEGIN SEQUENCE o := NIL - END + END SEQUENCE ? "=> hb_gcAll()" BEGIN SEQUENCE hb_gcAll() - END + END SEQUENCE RETURN diff --git a/harbour/tests/switch.prg b/harbour/tests/switch.prg index d40ddfad1b..262d7445a1 100644 --- a/harbour/tests/switch.prg +++ b/harbour/tests/switch.prg @@ -4,6 +4,7 @@ #ifdef __XHARBOUR__ #define OTHERWISE DEFAULT +#define ENDSWITCH END #endif PROCEDURE Main() @@ -15,7 +16,7 @@ PROCEDURE Main() #ifndef __XHARBOUR__ SWITCH a - END + ENDSWITCH #endif ? @@ -23,7 +24,7 @@ PROCEDURE Main() SWITCH a CASE 1 ? "FOUND: 1" - END + ENDSWITCH ? ? "2222222222222222222222222222222" @@ -33,7 +34,7 @@ PROCEDURE Main() EXIT CASE "2" ? a - END + ENDSWITCH ? ? "3333333333333333333333333333333" @@ -44,7 +45,7 @@ PROCEDURE Main() ? "FOUND: 2" OTHERWISE ? "other" - END + ENDSWITCH #ifndef __XHARBOUR__ ? @@ -52,7 +53,7 @@ PROCEDURE Main() SWITCH a OTHERWISE ? "OTHERWISE" - END + ENDSWITCH #endif ? @@ -92,7 +93,7 @@ PROCEDURE Main() EXIT OTHERWISE ? "NOT FOUND: running OTHER" - END + ENDSWITCH #endif ? @@ -113,10 +114,10 @@ PROCEDURE Main() EXIT OTHERWISE ? "Nested OTHERWISE" - END + ENDSWITCH ?? "In CASE 1" ? a - END + ENDSWITCH ? "=========================================" diff --git a/harbour/tests/t1.prg b/harbour/tests/t1.prg index 74168bc178..eaf86a3c43 100644 --- a/harbour/tests/t1.prg +++ b/harbour/tests/t1.prg @@ -13,6 +13,6 @@ PROCEDURE Main() ? i Eval( cb ) i++ - END + ENDDO RETURN diff --git a/harbour/tests/testbrw.prg b/harbour/tests/testbrw.prg index 272e50fdbf..2020642e98 100644 --- a/harbour/tests/testbrw.prg +++ b/harbour/tests/testbrw.prg @@ -127,7 +127,7 @@ PROCEDURE Main() ENDCASE - end + ENDDO #endif SetPos( nRow, nCol ) SetColor( cColor ) diff --git a/harbour/tests/tstuse.prg b/harbour/tests/tstuse.prg index 6c7fd69134..fc73ba1599 100644 --- a/harbour/tests/tstuse.prg +++ b/harbour/tests/tstuse.prg @@ -51,7 +51,7 @@ PROCEDURE mkTest( lNewArea, cRdd, cFile, cAlias, lShared, lReadOnly ) dbUseArea( lNewArea, cRdd, cFile, cAlias, lShared, lReadOnly ) RECOVER USING oErr ? "Error:", oErr:subCode, oErr:description, oErr:operation, oErr:osCode - END + END SEQUENCE ? Select(), Alias(), NetErr(), Used() ErrorBlock( cbErr ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 704e04567c..a6a37b98c6 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -8738,7 +8738,7 @@ STATIC PROCEDURE PlugIn_Load( hbmk, cFileName ) hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile ) cType := I_( "(compiled)" ) lOK := .T. - END + END /* SEQUENCE */ ENDIF IF ! lOK .AND. !( Lower( cExt ) == ".hrb" ) /* Optimization: Don't try to load it as .prg if the extension is .hrb */ cType := I_( "(source)" ) @@ -8978,7 +8978,7 @@ STATIC FUNCTION PlugIn_call_low( hbmk, cName, hrb, ctx ) IF ! hbmk[ _HBMK_lQuiet ] _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'" ), cName, hbmk_ErrorMessage( oError ), oError:cargo[ 1 ], oError:cargo[ 2 ] ) ) ENDIF - END + END /* SEQUENCE */ RETURN lSuccess @@ -10484,7 +10484,7 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem, cFileName ) IF ! hbmk[ _HBMK_lQuiet ] _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Error in filter expression: '%1$s'" ), cFilterSrc ) ) ENDIF - END + END /* SEQUENCE */ RETURN cRetVal ENDIF @@ -12766,7 +12766,7 @@ STATIC FUNCTION __hbshell_plugins_load( hPlugins, aParams ) RECOVER USING oError plugin[ _PLUGIN_hHRB ] := NIL OutErr( hb_StrFormat( I_( "Error: Loading shell plugin: %1$s\n'%2$s'" ), cFile:__enumKey(), hbmk_ErrorMessage( oError ) ) + _OUT_EOL ) - END + END /* SEQUENCE */ ENDIF IF ! Empty( plugin[ _PLUGIN_hHRB ] ) @@ -13116,7 +13116,7 @@ STATIC PROCEDURE __hbshell_Exec( cCommand ) ENDIF ENDIF - END + END /* SEQUENCE */ s_nRow := Row() s_nCol := Col() diff --git a/harbour/utils/hbtest/rt_math.prg b/harbour/utils/hbtest/rt_math.prg index d93f07eef0..33a55ba359 100644 --- a/harbour/utils/hbtest/rt_math.prg +++ b/harbour/utils/hbtest/rt_math.prg @@ -459,8 +459,8 @@ PROCEDURE Main_MATH() #ifdef __HARBOUR__ - o:=errornew() - s:="oscode" + o := ErrorNew() + s := "oscode" o:&s := 1 TEST_LINE( o:&(s) , 1 ) o:&s++ @@ -473,7 +473,7 @@ PROCEDURE Main_MATH() TEST_LINE( o:&(s) , 15 ) TEST_LINE( o:&(s)+=200 , 215 ) - WITH OBJECT errornew() + WITH OBJECT ErrorNew() :&(s) := 1 TEST_LINE( :&(s) , 1 ) :&(s)++ @@ -485,9 +485,9 @@ PROCEDURE Main_MATH() :&(s)+=10 TEST_LINE( :&(s) , 15 ) TEST_LINE( :&(s)+=200 , 215 ) - END + ENDWITH - WITH OBJECT errornew() + WITH OBJECT ErrorNew() :oscode := 1 TEST_LINE( :oscode , 1 ) :oscode++ @@ -499,7 +499,7 @@ PROCEDURE Main_MATH() :oscode+=10 TEST_LINE( :oscode , 15 ) TEST_LINE( :oscode+=200 , 215 ) - END + ENDWITH &s0 := 1 TEST_LINE( &s0 , 1 )