Changeset 2867

Timestamp:

Dec 31, 2017, 2:48:12 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed logic when Locate replaces parts of LastChangeArgs. The previous code never apllied, because it had reset and set it in one pass.
• Added rc to Change if the replace part in its arg string is missing.
• Checked that rc in defs that execute Change.

File:

• trunk/src/netlabs/macros/locate.e (modified) (5 diffs)

trunk/src/netlabs/macros/locate.e ¶

@@ -620 +620 @@
    -- Save last args
    call SetLastSearchArgs( SearchArgs)
-   if search_string <> cSearchString | fid <> LastFid then
-      -- Reset LastChangeArgs if search has changed
-      --dprintf( 'Reset LastChangeArgs')
-      ChangeArgs = ''
-      call SetLastChangeArgs( ChangeArgs)
-   endif
    if search_string = cSearchString then
       -- Reset the SearchOptios in LastChangeArgs for the next Change while
@@ -752 +746 @@
    if not p2 then
       sayerror NO_REP__MSG  -- 'No replacement string specified' (Rather the missing delimiter is checked.)
-      return
+      -- A defc must use "return myrc" or use "rc = myrc" to set the
+      -- global var rc. When "return" is used only, rc would be set to empty.
+      -- Another option is to omit return for a defc. Then rc will be kept as well.
+      -- A defproc may return its own rcx, without overriding the global rc.
+      rc = -257  -- Invalid number of parameters
+      return rc
    endif
    parse value args with (delim)search_string(delim)replace_string(delim)user_options
@@ -1276 +1275 @@
    'SearchDirection +'
    'RepeatChange'
-   'RepeatFind'
+   if not rc then
+      'RepeatFind'
+   endif
 
 ; ---------------------------------------------------------------------------
@@ -1282 +1283 @@
    'SearchDirection -'
    'RepeatChange'
-   'RepeatFind'
+   if not rc then
+      'RepeatFind'
+   endif
 
 ; ---------------------------------------------------------------------------
@@ -1442 +1445 @@
             call prestore_pos( savedpos)
          endif
+      elseif rc = -257 then  -- Invalid number of parameters
+         return rc
       else
          -- Not found