[Prolint-cvs] SF.net SVN: prolint: [262] trunk/prolint
Brought to you by:
johnallengreen,
jurjen
Menu
▾
▴
[Prolint-cvs] SF.net SVN: prolint: [262] trunk/prolint
|
From: <ju...@us...> - 2006-03-14 21:02:50
|
Revision: 262 Author: jurjen Date: 2006-03-14 13:01:26 -0800 (Tue, 14 Mar 2006) ViewCVS: http://svn.sourceforge.net/prolint/?rev=262&view=rev Log Message: ----------- Clean-up: removed Progress 8 compatibility. We are now shamelessly using PUBLISH and SUBSCRIBE, super procedures, dynamic queries, flat buttons and so on. And I could also remove almost every GLOBAL-DEFINE. Modified Paths: -------------- trunk/prolint/checkrelease.p trunk/prolint/desktop.w trunk/prolint/dlc-version.i trunk/prolint/filterplugins.p trunk/prolint/filters/filterparams.i trunk/prolint/filters/ignoreab.p trunk/prolint/filters/nowarn.p trunk/prolint/help/newrule.htxt trunk/prolint/help/outputhandler.htxt trunk/prolint/lintsuper.p trunk/prolint/outputhandlers/PRO4mfile.p trunk/prolint/outputhandlers/dlgfilter.w trunk/prolint/outputhandlers/ed4win.p trunk/prolint/outputhandlers/logexcel.p trunk/prolint/outputhandlers/logfile.p trunk/prolint/outputhandlers/logwin.w trunk/prolint/outputhandlers/logwin8.w trunk/prolint/outputhandlers/prolintdb.p trunk/prolint/outputhandlers/regrlog.p trunk/prolint/outputhandlers/showhtml.p trunk/prolint/outputhandlers/tabfile.p trunk/prolint/prolint.p trunk/prolint/prolint.properties.p trunk/prolint/prolintdb/dirstats.w trunk/prolint/prolintdb/incstats.w trunk/prolint/prolintdb/rulestats.w trunk/prolint/prolintdb/runffq.p trunk/prolint/publish.i trunk/prolint/publish_char.i trunk/prolint/publish_log.i trunk/prolint/publish_result.i trunk/prolint/rtb/checkin-handler.p trunk/prolint/ruleparams.i trunk/prolint/rules/_template.p trunk/prolint/rules/abbrevkwd.p trunk/prolint/rules/abbrevtable.p trunk/prolint/rules/alertmessage.p trunk/prolint/rules/allfinds.p trunk/prolint/rules/backslash.p trunk/prolint/rules/blocklabel.p trunk/prolint/rules/colon-t.p trunk/prolint/rules/contains.p trunk/prolint/rules/create.p trunk/prolint/rules/dbtrigger.p trunk/prolint/rules/defaultname.p trunk/prolint/rules/do1.p trunk/prolint/rules/dotcomment.p trunk/prolint/rules/emptyblock.p trunk/prolint/rules/endtype.p trunk/prolint/rules/errortext.p trunk/prolint/rules/findstate-tt.p trunk/prolint/rules/findstate.p trunk/prolint/rules/fnusage.p trunk/prolint/rules/groupassign.p trunk/prolint/rules/i18nlength.p trunk/prolint/rules/idiskeyword.p trunk/prolint/rules/ifindent.p trunk/prolint/rules/ifparens.p trunk/prolint/rules/lexcolon.p trunk/prolint/rules/matches.p trunk/prolint/rules/maxchar.p trunk/prolint/rules/message.p trunk/prolint/rules/messagetype.p trunk/prolint/rules/namecheck.p trunk/prolint/rules/nameconv.p trunk/prolint/rules/nobrackets.p trunk/prolint/rules/nocomment.p trunk/prolint/rules/noeffect.p trunk/prolint/rules/noerror.p trunk/prolint/rules/noundo.p trunk/prolint/rules/nowhere.p trunk/prolint/rules/obsoletenodes.p trunk/prolint/rules/oflink.p trunk/prolint/rules/query.p trunk/prolint/rules/runargs.p trunk/prolint/rules/runasnotfound.p trunk/prolint/rules/runname.p trunk/prolint/rules/runnotfound.p trunk/prolint/rules/sepdbui.p trunk/prolint/rules/sequence.p trunk/prolint/rules/shared.p trunk/prolint/rules/sharelock.p trunk/prolint/rules/sortaccess.p trunk/prolint/rules/strattrib.p trunk/prolint/rules/substitute.p trunk/prolint/rules/tablename.p trunk/prolint/rules/tableusage.p trunk/prolint/rules/ttlock.p trunk/prolint/rules/ttnoindex.p trunk/prolint/rules/undoretry.p trunk/prolint/rules/uninproc.p trunk/prolint/rules/unquoted.p trunk/prolint/rules/use-index.p trunk/prolint/rules/varusage.p trunk/prolint/rules/weakchar.p trunk/prolint/rules/when.p trunk/prolint/rules/where-udf.p trunk/prolint/rules/wholeindex.p trunk/prolint/selectfiles.w trunk/prolint/subscribe.i trunk/prolint/unsubscribe.i trunk/prolint/v8pubsub.i trunk/prolint/v8pubsub.p Modified: trunk/prolint/checkrelease.p =================================================================== --- trunk/prolint/checkrelease.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/checkrelease.p 2006-03-14 21:01:26 UTC (rev 262) @@ -28,12 +28,6 @@ DEFINE VARIABLE LocalRelease AS INTEGER NO-UNDO. DEFINE VARIABLE RemoteAvail AS LOGICAL NO-UNDO INITIAL YES. -IF {&dlc-version} < 9 THEN DO: - MESSAGE "Sorry, need at least Progress 9 for this feature." - VIEW-AS ALERT-BOX. - RETURN. -END. - IF NOT (OPSYS MATCHES "win*") THEN DO: MESSAGE "Sorry, need Windows for this feature." VIEW-AS ALERT-BOX. Modified: trunk/prolint/desktop.w =================================================================== --- trunk/prolint/desktop.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/desktop.w 2006-03-14 21:01:26 UTC (rev 262) @@ -548,11 +548,12 @@ &ANALYZE-SUSPEND _UIB-CODE-BLOCK _CONTROL Btn_results C-Win ON CHOOSE OF Btn_results IN FRAME DEFAULT-FRAME /* Results Window */ DO: - &IF {&dlc-version}=8 &THEN - RUN prolint/outputhandlers/logwin8.w PERSISTENT. - &ELSE - RUN prolint/outputhandlers/logwin.w PERSISTENT. - &ENDIF + DEFINE VARIABLE hpProperties AS HANDLE NO-UNDO. + DEFINE VARIABLE progname AS CHARACTER NO-UNDO. + RUN prolint/propsuper.p PERSISTENT SET hpProperties. + progname = DYNAMIC-FUNCTION("ProlintProperty", "outputhandlers.resultwindow"). + DELETE PROCEDURE hpProperties. + RUN VALUE(progname) PERSISTENT. END. /* _UIB-CODE-BLOCK-END */ @@ -646,8 +647,6 @@ ------------------------------------------------------------------------------*/ DEFINE VARIABLE htmlfile AS CHARACTER NO-UNDO. -&IF {&dlc-version}<>8 &THEN - IF SEARCH("adecomm/adestds.i":U)=? OR SEARCH("adecomm/peditor.i":U)=? THEN DO: /* Only give error if not compiled */ IF SEARCH("prolint/desktop.r":U)=? THEN DO: @@ -662,8 +661,6 @@ END. END. -&ENDIF - END PROCEDURE. /* _UIB-CODE-BLOCK-END */ Modified: trunk/prolint/dlc-version.i =================================================================== --- trunk/prolint/dlc-version.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/dlc-version.i 2006-03-14 21:01:26 UTC (rev 262) @@ -17,14 +17,4 @@ ELSE SessionWindowSystem=SESSION:DISPLAY-TYPE. -/* Which 4GL features are unsupported, based on dlc-version? */ -&IF {&dlc-version}<9 &THEN - &IF DEFINED(EXCLUDE-superprocedure)=0 &THEN - &GLOBAL-DEFINE EXCLUDE-superprocedure - &ENDIF - &GLOBAL-DEFINE pubsub FALSE -&ELSE - &GLOBAL-DEFINE pubsub TRUE -&ENDIF - \ No newline at end of file Modified: trunk/prolint/filterplugins.p =================================================================== --- trunk/prolint/filterplugins.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/filterplugins.p 2006-03-14 21:01:26 UTC (rev 262) @@ -23,7 +23,6 @@ ------------------------------------------------------------------ */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE INPUT PARAMETER pProfileDirectory AS CHARACTER NO-UNDO. @@ -46,7 +45,6 @@ INDEX idx_1 AS PRIMARY SourceFile RuleID LineNumber. ON "CLOSE":U OF THIS-PROCEDURE DO: - {prolint/unsubscribe.i} FOR EACH tt_filters : APPLY "CLOSE":U TO tt_filters.hpFilter. END. @@ -54,7 +52,7 @@ END. RUN InitializePlugins. -{prolint/subscribe.i "Prolint_Status_FileEnd"} +SUBSCRIBE TO "Prolint_Status_FileEnd" ANYWHERE. RETURN. /* ------------------------ internal procedures ------------------------------ */ Modified: trunk/prolint/filters/filterparams.i =================================================================== --- trunk/prolint/filters/filterparams.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/filters/filterparams.i 2006-03-14 21:01:26 UTC (rev 262) @@ -23,7 +23,6 @@ ------------------------------------------------------------------ */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE INPUT PARAMETER ProfileDirectory AS CHARACTER NO-UNDO. Modified: trunk/prolint/filters/ignoreab.p =================================================================== --- trunk/prolint/filters/ignoreab.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/filters/ignoreab.p 2006-03-14 21:01:26 UTC (rev 262) @@ -29,7 +29,6 @@ IgnoreAppbuilderstuff = LOGICAL ( DYNAMIC-FUNCTION ("ProlintProperty", "filters.IgnoreAppbuilderstuff")). ON "CLOSE":U OF THIS-PROCEDURE DO: - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END. @@ -40,7 +39,7 @@ FIELD lastline AS INTEGER INDEX idx AS PRIMARY sourcefile firstline. - {prolint/subscribe.i "Prolint_Status_FileEnd"} + SUBSCRIBE TO "Prolint_Status_FileEnd" ANYWHERE. /* ------------------------------------------------------------------------------------ maintenance procedures for tt_codesection Modified: trunk/prolint/filters/nowarn.p =================================================================== --- trunk/prolint/filters/nowarn.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/filters/nowarn.p 2006-03-14 21:01:26 UTC (rev 262) @@ -118,12 +118,7 @@ ELSE DO: FILE-INFORMATION:FILE-NAME = vname. - &IF {&dlc-version}>8 &THEN size_ok = FILE-INFORMATION:FILE-SIZE = buf_ignore.LineNumber. - &ELSE - /* FILE-INFO:FILE-SIZE is not supported in Progress 8. Let's just trust _file-size */ - size_ok = TRUE. - &ENDIF END. IF NOT size_ok THEN FOR EACH buf_ignore EXCLUSIVE-LOCK WHERE buf_ignore.SourceFile = vname : Modified: trunk/prolint/help/newrule.htxt =================================================================== --- trunk/prolint/help/newrule.htxt 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/help/newrule.htxt 2006-03-14 21:01:26 UTC (rev 262) @@ -56,8 +56,8 @@ <p> When the rule finds a statement or a situation where it wants to raise a warning about, you should run procedure PublishResult. <br> -Procedure PublishResult is implemented in prolint/lintsuper.p which is a super-procedure to every rule, but even though it's a super you should still specify {&insuper} for -Progress 8 support. +Procedure PublishResult is implemented in prolint/lintsuper.p which is +a super-procedure to every rule. <br> You should not "publish" the warning directly to the outputhandlers using PUBLISH "Prolint_AddResult", because if you do you miss the extra functionality that lintsuper.p adds to it. Modified: trunk/prolint/help/outputhandler.htxt =================================================================== --- trunk/prolint/help/outputhandler.htxt 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/help/outputhandler.htxt 2006-03-14 21:01:26 UTC (rev 262) @@ -27,8 +27,6 @@ <p> Each outputhandler is loaded persistently by prolint.p, but prolint will never delete the procedure. The outputhandler has to delete itself when ready, usually from within the event-procedure for event "Prolint_FinalizeResults". -<br> -<b>important:</b> just before the procedure deletes itself it is important to include {prolint/unsubscribe.i}. <p> The outputhandler subscribes to, and responds to (some) of the following published events: <hr size=1> Modified: trunk/prolint/lintsuper.p =================================================================== --- trunk/prolint/lintsuper.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/lintsuper.p 2006-03-14 21:01:26 UTC (rev 262) @@ -23,23 +23,11 @@ ------------------------------------------------------------------ */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE INPUT PARAMETER hparser AS HANDLE NO-UNDO. DEFINE INPUT PARAMETER hpFilterPlugins AS HANDLE NO-UNDO. {proparse/api/proparse.i hparser} - -/* does this DLC version support super-procedures or not? */ -&IF DEFINED(EXCLUDE-superprocedure)>0 &THEN - DEFINE VARIABLE hActiveRule AS HANDLE NO-UNDO. - &GLOBAL-DEFINE targetprocedure hActiveRule - &GLOBAL-DEFINE thisprocedure THIS-PROCEDURE -&ELSE - &GLOBAL-DEFINE targetprocedure TARGET-PROCEDURE - &GLOBAL-DEFINE thisprocedure TARGET-PROCEDURE -&ENDIF - - + DEFINE VARIABLE IgnoreAB AS LOGICAL NO-UNDO INITIAL FALSE. DEFINE VARIABLE ActivePragma AS INTEGER NO-UNDO. DEFINE VARIABLE ActiveSeverity AS INTEGER NO-UNDO. @@ -56,7 +44,6 @@ DEFINE VARIABLE SearchPath AS CHARACTER NO-UNDO. ON "CLOSE":U OF THIS-PROCEDURE DO: - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END. @@ -223,11 +210,7 @@ DEFINE INPUT PARAMETER pActivePragma AS INTEGER NO-UNDO. DEFINE INPUT PARAMETER pActiveSeverity AS INTEGER NO-UNDO. DEFINE INPUT PARAMETER pIgnoreAB AS LOGICAL NO-UNDO. - &IF DEFINED(EXCLUDE-superprocedure)>0 &THEN - DEFINE INPUT PARAMETER pActiveRule AS HANDLE NO-UNDO. - ASSIGN hActiveRule = pActiveRule. - &ENDIF - + ASSIGN AbortSearch = FALSE IgnoreAB = pIgnoreAB @@ -251,9 +234,9 @@ /* searching a tree (recursive) is probably faster than a query if no nodetypes are specified */ /* actually this may not be true anymore with the latest version of proparse, have to test that */ IF NodeTypesToInspect="" OR NodeTypesToInspect=? THEN - RUN SearchNodeTree IN {&THISPROCEDURE} (theNode, ipCallBack, NodeTypesToInspect). + RUN SearchNodeTree IN TARGET-PROCEDURE (theNode, ipCallBack, NodeTypesToInspect). ELSE - RUN searchNodeQueries IN {&THISPROCEDURE} (theNode, ipCallBack, NodeTypesToInspect). + RUN searchNodeQueries IN TARGET-PROCEDURE (theNode, ipCallBack, NodeTypesToInspect). END PROCEDURE. @@ -283,9 +266,9 @@ /* skip node if marked by FindProparseDirectives in prolint.p */ IF parserQueryGetResult(queryname, i, childnode) THEN IF 0=parserAttrGetI(childnode,ActivePragma) THEN - RUN VALUE(ipCallBack) IN {&TARGETPROCEDURE} (childnode, - OUTPUT AbortSearch, - OUTPUT SearchChildren). + RUN VALUE(ipCallBack) IN TARGET-PROCEDURE (childnode, + OUTPUT AbortSearch, + OUTPUT SearchChildren). IF AbortSearch THEN LEAVE loop_results. END. parserQueryClear(queryname). @@ -315,9 +298,9 @@ IF 0=parserAttrGetI(theNode,ActivePragma) THEN IF (NodetypesToInspect=?) OR (LOOKUP(parserGetNodeType(theNode),NodetypesToInspect) GT 0) THEN - RUN VALUE(ipCallBack) IN {&TARGETPROCEDURE} (theNode, - OUTPUT AbortSearch, - OUTPUT SearchChildren). + RUN VALUE(ipCallBack) IN TARGET-PROCEDURE (theNode, + OUTPUT AbortSearch, + OUTPUT SearchChildren). IF SearchChildren AND (NOT AbortSearch) THEN DO: ASSIGN nodetype = parserNodeFirstChild(theNode,child). @@ -325,7 +308,7 @@ /* if child is a new node head, run searchNodeTree with it (recursion) */ IF parserNodeFirstChild(child, grandchild)<>"" THEN - RUN searchNodeTree IN {&THISPROCEDURE} (child, ipCallBack, NodetypesToInspect). + RUN searchNodeTree IN TARGET-PROCEDURE (child, ipCallBack, NodetypesToInspect). nodetype = parserNodeNextSibling(child,child). END. END. @@ -345,9 +328,7 @@ DEFINE INPUT PARAMETER pDescription AS CHAR NO-UNDO. /* human-readable hint */ DEFINE INPUT PARAMETER pRuleID AS CHAR NO-UNDO. /* defines rule-program and maps to help */ - /* note: have to run IN THIS-PROCEDURE, else no way to get it work in Progress 8. - otherwise it should have been IN {&TARGETPROCEDURE} */ - RUN PublishResultSeverity IN THIS-PROCEDURE + RUN PublishResultSeverity IN TARGET-PROCEDURE (pCompilationunit, pSource, pLineNumber, @@ -399,12 +380,12 @@ IF filteredby <> "" THEN RETURN. /* TODO: send filteredby to outputhandlers */ - {prolint/publish_result.i} (pCompilationunit, - RelativeSource, - pLineNumber, - REPLACE(pDescription,"~n":U," ":U), - pRuleID, - severity). + PUBLISH "Prolint_AddResult":U (pCompilationunit, + RelativeSource, + pLineNumber, + REPLACE(pDescription,"~n":U," ":U), + pRuleID, + severity). END PROCEDURE. @@ -438,12 +419,12 @@ IF filteredby <> "" THEN RETURN. /* TODO: send filteredby to outputhandlers */ - {prolint/publish_result.i} (pCompilationunit, - pSource, - pLineNumber, - REPLACE(pDescription,"~n":U," ":U), - pRuleID, - severity). + PUBLISH "Prolint_AddResult":U (pCompilationunit, + pSource, + pLineNumber, + REPLACE(pDescription,"~n":U," ":U), + pRuleID, + severity). END PROCEDURE. Modified: trunk/prolint/outputhandlers/PRO4mfile.p =================================================================== --- trunk/prolint/outputhandlers/PRO4mfile.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/PRO4mfile.p 2006-03-14 21:01:26 UTC (rev 262) @@ -6,15 +6,14 @@ by : Jurjen Dijkstra & Yuriy Setrko (PRO4m adjustment) ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE logfile AS CHARACTER NO-UNDO. DEFINE VARIABLE delim AS CHARACTER NO-UNDO. delim = CHR(9). /* tab */ -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -72,7 +71,6 @@ /* In this case there are no open resources, so we're done. */ /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/dlgfilter.w =================================================================== --- trunk/prolint/outputhandlers/dlgfilter.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/dlgfilter.w 2006-03-14 21:01:26 UTC (rev 262) @@ -276,11 +276,6 @@ tg_Persistent = fltPersistent. RUN enable_UI. - &IF {&dlc-version}=8 &THEN - ASSIGN - tg_Persistent:VISIBLE = FALSE - tg_Persistent:HIDDEN = TRUE. - &ENDIF WAIT-FOR GO OF FRAME {&FRAME-NAME}. END. Modified: trunk/prolint/outputhandlers/ed4win.p =================================================================== --- trunk/prolint/outputhandlers/ed4win.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/ed4win.p 2006-03-14 21:01:26 UTC (rev 262) @@ -25,11 +25,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. define variable numWarnings as integer no-undo initial 0. RETURN. @@ -82,7 +81,6 @@ PUBLISH "EndEd4WindowsConversation":U. - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/logexcel.p =================================================================== --- trunk/prolint/outputhandlers/logexcel.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/logexcel.p 2006-03-14 21:01:26 UTC (rev 262) @@ -23,14 +23,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ====================================================================== */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE logfile AS CHAR NO-UNDO INITIAL "prolint.xml":U. DEFINE VARIABLE chExcel AS COM-HANDLE. -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -42,7 +41,6 @@ CREATE "Excel.Application.11":U chExcel NO-ERROR. IF chExcel=? THEN DO: MESSAGE "Sorry, 'Prolint output to Excel' only works with Excel version 11":T VIEW-AS ALERT-BOX. - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END. ELSE DO: @@ -196,7 +194,6 @@ END. - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/logfile.p =================================================================== --- trunk/prolint/outputhandlers/logfile.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/logfile.p 2006-03-14 21:01:26 UTC (rev 262) @@ -23,13 +23,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE logfile AS CHAR NO-UNDO. -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. logfile = SUBSTITUTE("&1prolint.log", DYNAMIC-FUNCTION("ProlintProperty", "outputhandlers.outputdirectory")). @@ -77,7 +76,6 @@ /* In this case there are no open resources, so we're done. */ /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/logwin.w =================================================================== --- trunk/prolint/outputhandlers/logwin.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/logwin.w 2006-03-14 21:01:26 UTC (rev 262) @@ -74,7 +74,6 @@ /* Local Variable Definitions --- */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE TEMP-TABLE tt_lint NO-UNDO FIELD ttDescription AS CHAR LABEL "description":T FORMAT "x(150)":U @@ -489,7 +488,6 @@ RUN destroyObject IN ghCodePreview. ghCodePreview = ?. END. - {prolint/unsubscribe.i} APPLY "CLOSE":U TO THIS-PROCEDURE. RETURN NO-APPLY. END. @@ -863,16 +861,16 @@ RUN adecomm/_status.p (c-win:HANDLE, "40,30,10,20":U, FALSE, ?, OUTPUT hStatusbar, OUTPUT iStatusFields). hStatusBar:VISIBLE = YES. - {prolint/subscribe.i "Prolint_InitializeResults"} - {prolint/subscribe.i "Prolint_AddResult"} - {prolint/subscribe.i "Prolint_FinalizeResults"} - {prolint/subscribe.i "Prolint_Status_action"} - {prolint/subscribe.i "Prolint_Status_FileStart"} - {prolint/subscribe.i "Prolint_Status_Profile"} - {prolint/subscribe.i "Prolint_Status_Progress"} + SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. + SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. + SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_action" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_FileStart" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_Profile" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_Progress" ANYWHERE. - {prolint/subscribe.i "Prolint_Status_StartTimer"} - {prolint/subscribe.i "Prolint_Status_StopTimer"} + SUBSCRIBE TO "Prolint_Status_StartTimer" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_StopTimer" ANYWHERE. SUBSCRIBE TO "Prolint_SendLogWin_Ed4Win":U ANYWHERE. Modified: trunk/prolint/outputhandlers/logwin8.w =================================================================== --- trunk/prolint/outputhandlers/logwin8.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/logwin8.w 2006-03-14 21:01:26 UTC (rev 262) @@ -46,7 +46,6 @@ /* Local Variable Definitions --- */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE TEMP-TABLE tt_lint NO-UNDO FIELD ttDescription AS CHAR LABEL "description":T FORMAT "x(150)":U @@ -386,7 +385,6 @@ ON WINDOW-CLOSE OF C-Win /* Prolint results */ DO: /* This event will close the window and terminate the procedure. */ - {prolint/unsubscribe.i} APPLY "CLOSE":U TO THIS-PROCEDURE. RETURN NO-APPLY. END. @@ -662,9 +660,7 @@ ON VALUE-CHANGED OF tg_top IN FRAME DEFAULT-FRAME /* TopOnly */ DO: ASSIGN tg_top. - &IF {&dlc-version}>8 &THEN - c-win:TOP-ONLY = tg_top. - &ENDIF + c-win:TOP-ONLY = tg_top. END. /* _UIB-CODE-BLOCK-END */ @@ -690,8 +686,6 @@ /* Best default for GUI applications is... */ PAUSE 0 BEFORE-HIDE. -&IF {&dlc-version}>8 &THEN - /* cool GUI stuff for Progress 9 : */ /* must be done before enable_UI, else buttons are already realized */ ASSIGN btn_more:FLAT-BUTTON = TRUE @@ -711,7 +705,6 @@ ed_sourcefile:READ-ONLY = TRUE ed_rule:READ-ONLY = TRUE ed_severity:READ-ONLY = TRUE. -&ENDIF /* Now enable the interface and wait for the exit condition. */ /* (NOTE: handle ERROR and END-KEY so cleanup code will always fire. */ @@ -732,20 +725,18 @@ RUN adecomm/_status.p (c-win:HANDLE, "50,30,10,20,5":U, FALSE, ?, OUTPUT hStatusbar, OUTPUT iStatusFields). hStatusBar:VISIBLE = YES. - {prolint/subscribe.i "Prolint_InitializeResults"} - {prolint/subscribe.i "Prolint_AddResult"} - {prolint/subscribe.i "Prolint_FinalizeResults"} - {prolint/subscribe.i "Prolint_Status_action"} - {prolint/subscribe.i "Prolint_Status_FileStart"} - {prolint/subscribe.i "Prolint_Status_Profile"} - {prolint/subscribe.i "Prolint_Status_Progress"} + SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. + SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. + SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_action" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_FileStart" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_Profile" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_Progress" ANYWHERE. - {prolint/subscribe.i "Prolint_Status_StartTimer"} - {prolint/subscribe.i "Prolint_Status_StopTimer"} + SUBSCRIBE TO "Prolint_Status_StartTimer" ANYWHERE. + SUBSCRIBE TO "Prolint_Status_StopTimer" ANYWHERE. - &IF {&dlc-version}>8 &THEN SUBSCRIBE TO "Prolint_SendLogWin_Ed4Win":U ANYWHERE. - &ENDIF IF NOT THIS-PROCEDURE:PERSISTENT THEN WAIT-FOR CLOSE OF THIS-PROCEDURE. @@ -1140,8 +1131,6 @@ (using the current filter and current sorting) ------------------------------------------------------------------------------*/ - &IF {&dlc-version}>8 &THEN - DEFINE VARIABLE hEd4win AS HANDLE NO-UNDO. RUN prolint/outputhandlers/ed4win.p PERSISTENT SET hEd4win. @@ -1170,8 +1159,6 @@ RUN Prolint_FinalizeResults IN hEd4win. - &ENDIF - END PROCEDURE. /* _UIB-CODE-BLOCK-END */ Modified: trunk/prolint/outputhandlers/prolintdb.p =================================================================== --- trunk/prolint/outputhandlers/prolintdb.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/prolintdb.p 2006-03-14 21:01:26 UTC (rev 262) @@ -24,16 +24,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE cRuleList AS CHARACTER NO-UNDO. DEFINE VARIABLE dToday AS DATE NO-UNDO. dToday = TODAY. -{prolint/subscribe.i "Prolint_List_Rules"} -{prolint/subscribe.i "Prolint_Status_FileStart"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_List_Rules" ANYWHERE. +SUBSCRIBE TO "Prolint_Status_FileStart" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -116,7 +115,6 @@ /* purpose: close what is open. Free resources */ /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/regrlog.p =================================================================== --- trunk/prolint/outputhandlers/regrlog.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/regrlog.p 2006-03-14 21:01:26 UTC (rev 262) @@ -24,14 +24,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE tempdir AS CHAR NO-UNDO. DEFINE VARIABLE logfile AS CHAR NO-UNDO. -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -106,7 +105,6 @@ RUN proparse/utilities/resultswindow.p (tempdir + "diff.log":U). /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/showhtml.p =================================================================== --- trunk/prolint/outputhandlers/showhtml.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/showhtml.p 2006-03-14 21:01:26 UTC (rev 262) @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE logfile AS CHAR NO-UNDO. DEFINE VARIABLE oddrow AS LOGICAL NO-UNDO. @@ -41,11 +40,11 @@ INDEX ixrule AS PRIMARY UNIQUE ruleid. -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_Status_FileStart"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_Status_FileEnd"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_Status_FileStart" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_Status_FileEnd" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -159,7 +158,6 @@ RUN prolint/openhtml.p (fullname). /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/outputhandlers/tabfile.p =================================================================== --- trunk/prolint/outputhandlers/tabfile.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/outputhandlers/tabfile.p 2006-03-14 21:01:26 UTC (rev 262) @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE VARIABLE logfile AS CHARACTER NO-UNDO. DEFINE VARIABLE delim AS CHARACTER NO-UNDO. @@ -34,9 +33,9 @@ logfile = SUBSTITUTE("&1&2prolint.tab", DYNAMIC-FUNCTION("ProlintProperty", "outputhandlers.outputdirectory"), DYNAMIC-FUNCTION("ProlintProperty", "logincode")). -{prolint/subscribe.i "Prolint_InitializeResults"} -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_FinalizeResults"} +SUBSCRIBE TO "Prolint_InitializeResults" ANYWHERE. +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_FinalizeResults" ANYWHERE. RETURN. @@ -94,7 +93,6 @@ /* In this case there are no open resources, so we're done. */ /* This procedure will not be invoked again, so it can exit */ - {prolint/unsubscribe.i} DELETE PROCEDURE THIS-PROCEDURE. END PROCEDURE. Modified: trunk/prolint/prolint.p =================================================================== --- trunk/prolint/prolint.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolint.p 2006-03-14 21:01:26 UTC (rev 262) @@ -29,7 +29,6 @@ &SCOPED-DEFINE ProparseVersion "2.2b01":U {prolint/dlc-version.i} -{prolint/v8pubsub.i} DEFINE INPUT PARAMETER pSourcefile AS CHARACTER NO-UNDO. /* a single filename to lint */ DEFINE INPUT PARAMETER hSourcefileList AS HANDLE NO-UNDO. /* handle to a list of filenames to lint */ @@ -106,24 +105,21 @@ /* the place to read your custom settings from */ RUN GetProfileDirectory. - /* quickly subscribe to some event. This prevents v8pubsub.p from terminating itself - in case it does an internal garbage collect and finds out it has no subscribers... */ - /* We actually do need to subscribe to "Prolint_AddResult" because we want to set MaxSeverity */ - {prolint/subscribe.i "Prolint_AddResult"} + /* We need to subscribe to "Prolint_AddResult" because we want to set MaxSeverity */ + SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. /* Initialize a place to store results: a logfile, the 'Prolint result window', whatever */ RUN InitializeOutputhandler. IF RETURN-VALUE="no handlers":U THEN DO: {&_proparse_ prolint-nowarn(message)} MESSAGE "prolint: no valid outputhandlers specified":U VIEW-AS ALERT-BOX. - {prolint/unsubscribe.i} RUN DeleteTempdir. DELETE PROCEDURE hpProperties. RETURN. END. - {prolint/publish_char.i "Prolint_Status_Action" ""initializing..."":U} - {prolint/publish_char.i "Prolint_Status_Profile" "pCustomProfile"} + PUBLISH "Prolint_Status_Action" ("initializing..."). + PUBLISH "Prolint_Status_Profile" (pCustomProfile). /* Initialize the set of rules, eg populate tt_rules. If there are no rules there is no point in continuing */ @@ -131,12 +127,11 @@ /* are there any rules that need proparse but proparse isn't installed? */ IF NeedProparse AND (NOT HasProparse) THEN - {prolint/publish_result.i} ("":U, "":U,"0":U, "proparse required but not found":T, "noproparse":U, 0). + PUBLISH "Prolint_AddResult":U ("":U, "":U,"0":U, "proparse required but not found":T, "noproparse":U, 0). /* are there any rules at all? If not, close logfile and stop. */ IF NOT CAN-FIND(FIRST tt_rules) THEN DO: - {prolint/publish.i "Prolint_FinalizeResults"} - {prolint/unsubscribe.i} + PUBLISH "Prolint_FinalizeResults". RUN DeleteTempdir. DELETE PROCEDURE hpProperties. RETURN STRING(MaxSeverity). @@ -192,7 +187,7 @@ END. /* tell the logfile/result-window we are done with it */ - {prolint/publish.i "Prolint_FinalizeResults"} + PUBLISH "Prolint_FinalizeResults". /* release resources */ RUN ClearProparseResources. @@ -202,7 +197,6 @@ hpFilterPlugins = ?. RUN ReleaseProparseHandle. RUN DeleteTempdir. - {prolint/unsubscribe.i} IF hTurbolint<>0 THEN RUN FreeLibrary (hTurbolint). DELETE PROCEDURE hpProperties. @@ -455,20 +449,15 @@ LogwinRunning = TRUE. hw = hw:NEXT-SIBLING. END. - IF NOT LogwinRunning THEN DO: - &IF {&dlc-version}=8 &THEN - RUN prolint/outputhandlers/logwin8.w PERSISTENT. - &ELSE - RUN prolint/outputhandlers/logwin.w PERSISTENT. - &ENDIF - END. - END. + IF NOT LogwinRunning THEN + RUN VALUE(DYNAMIC-FUNCTION("ProlintProperty", "outputhandlers.resultwindow")) PERSISTENT. + END. OTHERWISE RUN VALUE("prolint/outputhandlers/":U + handler) PERSISTENT. END. END. - {prolint/publish_log.i "Prolint_InitializeResults" pClearOutput} + PUBLISH "Prolint_InitializeResults" (pClearOutput). END PROCEDURE. @@ -495,7 +484,7 @@ dllversion = parserGetVersion(). /* only compare the first four digits: release 1.0d is functionally similar to bugfix 1.0d02 */ IF SUBSTRING(dllversion,1,4) NE SUBSTRING({&ProparseVersion},1,4) THEN - {prolint/publish_result.i} ("", "","0":U, SUBSTITUTE("Expected proparse version &1, found &2":T, {&proparseversion}, dllversion), "version":U, 0). + PUBLISH "Prolint_AddResult":U ("", "","0":U, SUBSTITUTE("Expected proparse version &1, found &2":T, {&proparseversion}, dllversion), "version":U, 0). END. /* Look for the "jpplus" package, which provides @@ -542,7 +531,6 @@ END PROCEDURE. -&IF {&dlc-version}>8 &THEN PROCEDURE AddTemptableSourceFiles : /* purpose : if parameter hSourcefileList is a temp-table, then assume it is a list of sourcefiles to lint. The temp-table must have a field SourceFile, other @@ -569,7 +557,6 @@ END. END PROCEDURE. -&ENDIF PROCEDURE AddIPProvidedSourceFiles : @@ -598,7 +585,7 @@ FILE-INFO:FILE-NAME = p-SourceItem. IF FILE-INFO:FULL-PATHNAME = ? THEN - {prolint/publish_result.i} (p-SourceItem, p-SourceItem,"0":U, "file not found":T, "prolint":U, 9). + PUBLISH "Prolint_AddResult":U (p-SourceItem, p-SourceItem,"0":U, "file not found":T, "prolint":U, 9). ELSE IF FILE-INFO:FILE-TYPE MATCHES "*F*":U THEN RUN AddOneSourceFile(FILE-INFO:FULL-PATHNAME). @@ -651,14 +638,14 @@ IF maxFiles>1 THEN DO: done = " 0%":U. - {prolint/publish_char.i "Prolint_Status_Progress" "done"} + PUBLISH "Prolint_Status_Progress" ("done"). END. FOR EACH tt_files NO-LOCK : RUN LintOneSourceFile (tt_files.sourcefile). numFiles = numFiles + 1. done = STRING((100 * numFiles) / maxFiles, ">>9":U) + "%":U. - {prolint/publish_char.i "Prolint_Status_Progress" "done"} + PUBLISH "Prolint_Status_Progress" ("done"). END. END PROCEDURE. @@ -671,28 +658,28 @@ DEFINE VARIABLE ErrorMessage AS CHAR NO-UNDO. - {prolint/publish_char.i "Prolint_Status_FileStart" p-SourceFile} + PUBLISH "Prolint_Status_FileStart" (p-SourceFile). FILE-INFO:FILE-NAME = p-SourceFile. IF FILE-INFO:FULL-PATHNAME = ? THEN - {prolint/publish_result.i} (p-SourceFile, p-SourceFile,"0":U, "file not found":T, "prolint":U, 9). + PUBLISH "Prolint_AddResult":U (p-SourceFile, p-SourceFile,"0":U, "file not found":T, "prolint":U, 9). ELSE DO: p-SourceFile = FILE-INFO:FULL-PATHNAME. /* PreAnalyze creates compile listing, XREF file, token tree in proparse.dll, ... */ - {prolint/publish.i "Prolint_Status_StopTimer"} + PUBLISH "Prolint_Status_StopTimer". RUN PreAnalyze(p-SourceFile, OUTPUT ErrorMessage). - {prolint/publish.i "Prolint_Status_StartTimer"} + PUBLISH "Prolint_Status_StartTimer". IF ErrorMessage="":U THEN DO: IF hTurbolint<>0 THEN DO: - {prolint/publish_char.i "Prolint_Status_Action" "'running Turbolint...':T"} + PUBLISH "Prolint_Status_Action" ("running Turbolint..."). RUN Turbolint_RunRules (topnode, p-SourceFile). RUN PublishWarnings. END. FOR EACH tt_rules WHERE tt_rules.byturbolint=FALSE NO-LOCK : - {prolint/publish_char.i "Prolint_Status_Action" "SUBSTITUTE('testing rule: &1':T,tt_rules.RuleID)"} + PUBLISH "Prolint_Status_Action" (SUBSTITUTE('testing rule: &1':T,tt_rules.RuleID)). IF tt_rules.custom THEN RUN VALUE("prolint/custom/rules/":U + tt_rules.RuleID + ".p":U) (xreffile, @@ -725,7 +712,7 @@ RUN ProcedureListClear IN hLintSuper. END. /* file found */ - {prolint/publish.i "Prolint_Status_FileEnd"} + PUBLISH "Prolint_Status_FileEnd". END PROCEDURE. @@ -750,7 +737,7 @@ /* please do not produce new .r-code: - default location would be wrong if save into ... is required - special parameters might be required, like translation params */ - {prolint/publish_char.i "Prolint_Status_Action" ""compiling..."":U} + PUBLISH "Prolint_Status_Action" ("compiling...":U). IF NeedListing OR NeedXref THEN compiler-loop: DO compilerLoopNum = 1 TO 2: @@ -787,25 +774,23 @@ IF p-ErrorMessage EQ "":U THEN LEAVE compiler-loop. IF compilerLoopNum > 1 THEN DO: - &IF {&pubsub} &THEN - PUBLISH "WriteToEd4Windows":U (cErrorMsg). /* just in case ED is listening */ - &ENDIF + PUBLISH "WriteToEd4Windows":U (cErrorMsg). /* just in case ED is listening */ p-SourceFile = DYNAMIC-FUNCTION("RelativeFilename":U IN hLintSuper, p-SourceFile). - {prolint/publish_result.i} (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "compiler":U, 9). + PUBLISH "Prolint_AddResult":U (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "compiler":U, 9). END. END. /* compiler-loop */ /* parse sourcefile in proparse.dll */ IF NeedProparse AND HasProparse AND p-ErrorMessage="":U THEN DO: - {prolint/publish_char.i "Prolint_Status_Action" "'parsing...':T"} + PUBLISH "Prolint_Status_Action" ('parsing...':T). IF parserParse(p-Sourcefile) = FALSE THEN p-ErrorMessage = parserErrorGetText(). IF p-ErrorMessage<>"":U THEN DO: p-SourceFile = DYNAMIC-FUNCTION("RelativeFilename":U IN hLintSuper, p-SourceFile). - {prolint/publish_result.i} (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "proparse":U, 0). + PUBLISH "Prolint_AddResult":U (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "proparse":U, 0). /* These kinds of warnings should be reported to joanju.com */ END. ELSE DO: @@ -823,7 +808,7 @@ IF RETURN-VALUE <> "":U THEN DO: ASSIGN p-ErrorMessage = RETURN-VALUE. p-SourceFile = DYNAMIC-FUNCTION("RelativeFilename":U IN hLintSuper, p-SourceFile). - {prolint/publish_result.i} (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "proparse":U, 0). + PUBLISH "Prolint_AddResult":U (p-SourceFile, p-SourceFile,"0":U, p-ErrorMessage, "proparse":U, 0). END. END. @@ -1124,11 +1109,11 @@ UNLOAD "SOFTWARE". IF NUM-ENTRIES(NewProlintSetups) > 1 THEN - {prolint/publish_result.i} ("", - "", - "0":U, - "Prolint is installed more than once", - "prolint":U, 0). + PUBLISH "Prolint_AddResult":U ("", + "", + "0":U, + "Prolint is installed more than once", + "prolint":U, 0). END. END PROCEDURE. @@ -1179,7 +1164,7 @@ cList = cList + ",":U + tt_rules.ruleId. END. cList = TRIM(cList,",":U). - {prolint/publish_char.i "Prolint_List_Rules" "cList"} + PUBLISH "Prolint_List_Rules" (cList). END PROCEDURE. Modified: trunk/prolint/prolint.properties.p =================================================================== --- trunk/prolint/prolint.properties.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolint.properties.p 2006-03-14 21:01:26 UTC (rev 262) @@ -46,6 +46,12 @@ */ + /* "outputhandlers.resultwindow" + logwin.w is the default resultwindow with the treeview and other ActiveX controls. + logwin8.w is the old default that doesn't use any ActiveX controls */ + RUN SetProlintProperty ("outputhandlers.resultwindow", "prolint/outputhandlers/logwin8.w"). + + /* "outputhandlers.outputdirectory" the directory where outputhandlers save their outputfiles */ RUN SetProlintProperty ("outputhandlers.outputdirectory", SESSION:TEMP-DIR). Modified: trunk/prolint/prolintdb/dirstats.w =================================================================== --- trunk/prolint/prolintdb/dirstats.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolintdb/dirstats.w 2006-03-14 21:01:26 UTC (rev 262) @@ -45,7 +45,6 @@ /* Local Variable Definitions --- */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} /* _UIB-CODE-BLOCK-END */ &ANALYZE-RESUME @@ -536,23 +535,23 @@ /* send results to the logwin: simply publish warnings as if you are live linting */ - {prolint/publish_char.i "Prolint_Status_Profile" ""prolintdb""} - {prolint/publish_log.i "Prolint_InitializeResults" TRUE} + PUBLISH "Prolint_Status_Profile" ("prolintdb"). + PUBLISH "Prolint_InitializeResults" (TRUE). IF AVAILABLE prolintdb.lint_stat_ruledir THEN FOR EACH prolintdb.lint_warning NO-LOCK WHERE prolintdb.lint_warning.ruleid = prolintdb.lint_stat_ruledir.ruleid AND prolintdb.lint_warning.subdir = prolintdb.lint_stat_ruledir.subdir : - {prolint/publish_result.i} (prolintdb.lint_warning.compunit, - prolintdb.lint_warning.sourcefile, - prolintdb.lint_warning.linenumber, - prolintdb.lint_warning.comment, - prolintdb.lint_warning.ruleid, - prolintdb.lint_warning.severity). + PUBLISH "Prolint_AddResult":U (prolintdb.lint_warning.compunit, + prolintdb.lint_warning.sourcefile, + prolintdb.lint_warning.linenumber, + prolintdb.lint_warning.comment, + prolintdb.lint_warning.ruleid, + prolintdb.lint_warning.severity). END. - {prolint/publish.i "Prolint_FinalizeResults"} + PUBLISH "Prolint_FinalizeResults". END PROCEDURE. Modified: trunk/prolint/prolintdb/incstats.w =================================================================== --- trunk/prolint/prolintdb/incstats.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolintdb/incstats.w 2006-03-14 21:01:26 UTC (rev 262) @@ -42,7 +42,6 @@ /* *************************** Definitions ************************** */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} /* Parameters Definitions --- */ @@ -549,8 +548,8 @@ /* send results to the logwin: simply publish warnings as if you are live linting */ - {prolint/publish_char.i "Prolint_Status_Profile" ""prolintdb""} - {prolint/publish_log.i "Prolint_InitializeResults" TRUE} + PUBLISH "Prolint_Status_Profile" ("prolintdb"). + PUBLISH "Prolint_InitializeResults" (TRUE). IF AVAILABLE prolintdb.lint_stat_inc THEN FOR EACH prolintdb.lint_warning NO-LOCK @@ -568,16 +567,16 @@ END. FOR EACH tt_warning : - {prolint/publish_result.i} (tt_warning.compunit, - tt_warning.sourcefile, - tt_warning.linenumber, - tt_warning.comment, - tt_warning.ruleid, - tt_warning.severity). + PUBLISH "Prolint_AddResult":U (tt_warning.compunit, + tt_warning.sourcefile, + tt_warning.linenumber, + tt_warning.comment, + tt_warning.ruleid, + tt_warning.severity). END. - {prolint/publish.i "Prolint_FinalizeResults"} + PUBLISH "Prolint_FinalizeResults". FOR EACH tt_warning: Modified: trunk/prolint/prolintdb/rulestats.w =================================================================== --- trunk/prolint/prolintdb/rulestats.w 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolintdb/rulestats.w 2006-03-14 21:01:26 UTC (rev 262) @@ -45,7 +45,6 @@ /* Local Variable Definitions --- */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} /* _UIB-CODE-BLOCK-END */ &ANALYZE-RESUME @@ -536,23 +535,23 @@ /* send results to the logwin: simply publish warnings as if you are live linting */ - {prolint/publish_char.i "Prolint_Status_Profile" ""prolintdb""} - {prolint/publish_log.i "Prolint_InitializeResults" TRUE} + PUBLISH "Prolint_Status_Profile" ("prolintdb"). + PUBLISH "Prolint_InitializeResults" (TRUE). IF AVAILABLE prolintdb.lint_stat_ruledir THEN FOR EACH prolintdb.lint_warning NO-LOCK WHERE prolintdb.lint_warning.ruleid = prolintdb.lint_stat_ruledir.ruleid AND prolintdb.lint_warning.subdir = prolintdb.lint_stat_ruledir.subdir : - {prolint/publish_result.i} (prolintdb.lint_warning.compunit, - prolintdb.lint_warning.sourcefile, - prolintdb.lint_warning.linenumber, - prolintdb.lint_warning.comment, - prolintdb.lint_warning.ruleid, - prolintdb.lint_warning.severity). + PUBLISH "Prolint_AddResult":U (prolintdb.lint_warning.compunit, + prolintdb.lint_warning.sourcefile, + prolintdb.lint_warning.linenumber, + prolintdb.lint_warning.comment, + prolintdb.lint_warning.ruleid, + prolintdb.lint_warning.severity). END. - {prolint/publish.i "Prolint_FinalizeResults"} + PUBLISH "Prolint_FinalizeResults". END PROCEDURE. Modified: trunk/prolint/prolintdb/runffq.p =================================================================== --- trunk/prolint/prolintdb/runffq.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/prolintdb/runffq.p 2006-03-14 21:01:26 UTC (rev 262) @@ -27,7 +27,6 @@ {prolint/dlc-version.i} - {prolint/v8pubsub.i} DEFINE VARIABLE LogwinRunning AS LOGICAL NO-UNDO. DEFINE VARIABLE hw AS HANDLE NO-UNDO. @@ -46,23 +45,23 @@ /* send results to the logwin: simply publish warnings as if you are live linting */ - {prolint/publish_char.i "Prolint_Status_Profile" ""prolintdb""} - {prolint/publish_log.i "Prolint_InitializeResults" TRUE} + PUBLISH "Prolint_Status_Profile" ("prolintdb"). + PUBLISH "Prolint_InitializeResults" (TRUE). FOR EACH lint_warning NO-LOCK WHERE {prolintffq.tmp.i} : - {prolint/publish_result.i} (prolintdb.lint_warning.compunit, - prolintdb.lint_warning.sourcefile, - prolintdb.lint_warning.linenumber, - prolintdb.lint_warning.comment, - prolintdb.lint_warning.ruleid, - prolintdb.lint_warning.severity). + PUBLISH "Prolint_AddResult":U (prolintdb.lint_warning.compunit, + prolintdb.lint_warning.sourcefile, + prolintdb.lint_warning.linenumber, + prolintdb.lint_warning.comment, + prolintdb.lint_warning.ruleid, + prolintdb.lint_warning.severity). END. -{prolint/publish.i "Prolint_FinalizeResults"} +PUBLISH "Prolint_FinalizeResults". Modified: trunk/prolint/publish.i =================================================================== --- trunk/prolint/publish.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/publish.i 2006-03-14 21:01:26 UTC (rev 262) @@ -1,5 +1 @@ -&IF {&pubsub} &THEN - PUBLISH "{1}":U. -&ELSE - RUN Publish_noparams IN hPubsub (INPUT "{1}":U). -&ENDIF +TODO: delete this file Modified: trunk/prolint/publish_char.i =================================================================== --- trunk/prolint/publish_char.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/publish_char.i 2006-03-14 21:01:26 UTC (rev 262) @@ -1,5 +1 @@ -&IF {&pubsub} &THEN - PUBLISH "{1}":U (INPUT {2}). -&ELSE - RUN Publish_char IN hPubsub (INPUT "{1}":U, INPUT {2}). -&ENDIF +TODO: delete this file Modified: trunk/prolint/publish_log.i =================================================================== --- trunk/prolint/publish_log.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/publish_log.i 2006-03-14 21:01:26 UTC (rev 262) @@ -1,5 +1 @@ -&IF {&pubsub} &THEN - PUBLISH "{1}":U (INPUT {2}). -&ELSE - RUN Publish_log IN hPubsub (INPUT "{1}":U, INPUT {2}). -&ENDIF +TODO: delete this file Modified: trunk/prolint/publish_result.i =================================================================== --- trunk/prolint/publish_result.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/publish_result.i 2006-03-14 21:01:26 UTC (rev 262) @@ -1,5 +1 @@ -&IF {&pubsub} &THEN - PUBLISH "Prolint_AddResult":U -&ELSE - RUN Publish_AddResult IN hPubSub -&ENDIF +TODO: delete this file Modified: trunk/prolint/rtb/checkin-handler.p =================================================================== --- trunk/prolint/rtb/checkin-handler.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/rtb/checkin-handler.p 2006-03-14 21:01:26 UTC (rev 262) @@ -26,7 +26,6 @@ ======================================================================================= */ {prolint/dlc-version.i} -{prolint/v8pubsub.i} {rtb/g/rtbglobl.i} @@ -57,8 +56,8 @@ DEFINE VARIABLE ModuleToWatchFor AS CHARACTER NO-UNDO. DEFINE VARIABLE my-inc AS CHARACTER NO-UNDO INITIAL "programmer,manager,compltd-by":U. -{prolint/subscribe.i "Prolint_AddResult"} -{prolint/subscribe.i "Prolint_Status_Profile"} +SUBSCRIBE TO "Prolint_AddResult" ANYWHERE. +SUBSCRIBE TO "Prolint_Status_Profile" ANYWHERE. RETURN. @@ -309,11 +308,7 @@ DEFINE VARIABLE hw AS HANDLE NO-UNDO. DEFINE VARIABLE prevFile AS CHARACTER NO-UNDO. - &IF {&pubsub} &THEN - UNSUBSCRIBE TO ALL. - &ELSE - {prolint/unsubscribe.i} - &ENDIF + UNSUBSCRIBE TO ALL. /* launch logwin if it is not already running */ LogwinRunning = FALSE. @@ -325,33 +320,29 @@ hw = hw:NEXT-SIBLING. END. IF NOT LogwinRunning THEN - &IF {&dlc-version}=8 &THEN - RUN prolint/outputhandlers/logwin8.w PERSISTENT. - &ELSE - RUN prolint/outputhandlers/logwin.w PERSISTENT. - &ENDIF + RUN VALUE(DYNAMIC-FUNCTION("ProlintProperty", "outputhandlers.resultwindow")) PERSISTENT. /* show all messages in the logwin */ - {prolint/publish_char.i "Prolint_Status_Profile" "CurrentProfile"} - {prolint/publish_log.i "Prolint_InitializeResults" TRUE} + PUBLISH "Prolint_Status_Profile" ("CurrentProfile"). + PUBLISH "Prolint_InitializeResults" (TRUE). FOR EACH tt_lint : IF prevFile <> tt_lint.ttCompUnit THEN DO: prevFile = tt_lint.ttCompUnit. - {prolint/publish_char.i "Prolint_Status_FileStart" prevFile} + PUBLISH "Prolint_Status_FileStart" (prevFile). END. - {prolint/publish_result.i} (tt_lint.ttCompUnit, - tt_lint.ttSource, - tt_lint.ttLine, - tt_lint.ttDescription, - tt_lint.ttRuleID, - tt_lint.ttSeverity). + PUBLISH "Prolint_AddResult":U (tt_lint.ttCompUnit, + tt_lint.ttSource, + tt_lint.ttLine, + tt_lint.ttDescription, + tt_lint.ttRuleID, + tt_lint.ttSeverity). END. - {prolint/publish.i "Prolint_FinalizeResults"} + PUBLISH "Prolint_FinalizeResults". /* finally determine the return value. Modified: trunk/prolint/ruleparams.i =================================================================== --- trunk/prolint/ruleparams.i 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/ruleparams.i 2006-03-14 21:01:26 UTC (rev 262) @@ -43,15 +43,8 @@ IF LOGICAL(DYNAMIC-FUNCTION("ProlintProperty", "filters.IgnoreAppbuilderstuff"))=FALSE THEN IgnoreAB = FALSE. -/* use hLintSuper as super-procedure or as normal procedure? */ -&IF DEFINED(EXCLUDE-superprocedure)=0 &THEN - &GLOBAL-DEFINE insuper - RUN SetRuleParameters IN hLintSuper(pragma_number, severity, ignoreAB). - THIS-PROCEDURE:ADD-SUPER-PROCEDURE(hLintSuper). -&ELSE - &GLOBAL-DEFINE insuper IN hLintSuper - RUN SetRuleParameters IN hLintSuper(pragma_number, severity, ignoreAB, THIS-PROCEDURE:HANDLE). -&ENDIF +RUN SetRuleParameters IN hLintSuper(pragma_number, severity, ignoreAB). +THIS-PROCEDURE:ADD-SUPER-PROCEDURE(hLintSuper). {proparse/api/proparse.i hparser} Modified: trunk/prolint/rules/_template.p =================================================================== --- trunk/prolint/rules/_template.p 2006-03-14 00:16:02 UTC (rev 261) +++ trunk/prolint/rules/_template.p 2006-03-14 21:01:26 UTC (rev 262) @@ -40,7 +40,7 @@ */ - RUN searchNode {&insuper} (hTopnode, /* "Program_root" node */ + RUN searchNo... [truncated message content] |
