Changeset 3434 for trunk/src/netlabs/macros/edit.e

Timestamp:

Jan 29, 2019, 7:18:48 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Renamed select hooks and commands to filesloaded and fileswitched.
• Cosmetic changes.

File:

• trunk/src/netlabs/macros/edit.e (modified) (33 diffs)

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

@@ -76 +76 @@
 defproc PreLoadFile( FileSpec, Options)
    universal filestoload
-   universal filestoloadmax  -- still used for 'xcom e' and afterload
+   universal filestoloadmax  -- still used for 'xcom e' and ProcessFilesLoaded
    if filestoload = '' then
       filestoload = 0
@@ -132 +132 @@
       -- GetMode doesn't work here, because it tries to write the fid'.mode'
       -- array var. At this time the file is not loaded, so the fileid is not set.
-      -- But calling NepmdQueryDefaultMode(Filename) would work.
+      -- But calling NepmdQueryDefaultMode( Filename) would work.
       -- We should better determine the mode here, save it in a array var with the
       -- .filename as identifier, and replace the identifier with the fileid later
@@ -300 +300 @@
       endif
 
-      Codepage = upcase(Codepage)
+      Codepage = upcase( Codepage)
       if Codepage = 'CP1004' then
          Codepage = 'latin-1'
@@ -379 +379 @@
 ; ---------------------------------------------------------------------------
 ;compile if LINK_HOST_SUPPORT & (HOST_SUPPORT='EMUL' | HOST_SUPPORT='E3EMUL')
-; compile if not defined(MVS)
+; compile if not defined( MVS)
 ;    MVS = 0
 ; compile endif
-; compile if not defined(E3MVS)
+; compile if not defined( E3MVS)
 ;    E3MVS = 0
 ; compile endif
-; compile if not defined(HOST_LT_REQUIRED)
+; compile if not defined( HOST_LT_REQUIRED)
 ;    HOST_LT_REQUIRED = 0
 ; compile endif
@@ -498 +498 @@
 defc e, ed, Edit, epm
    universal default_edit_options
-   universal CurEditCmd
+   universal cureditcmd
    universal firstloadedfid  -- first file for this edit cmd, set here
    universal firstinringfid  -- first file in the ring, set by defmain
@@ -515 +515 @@
       -- Set current edit cmd to let other commands differ between several ways
       -- of file loading.
-      -- Other commands, that execute 'Edit', can set this universal var before
-      -- and then it will not be overwritten by 'Edit'. Afterload will reset it.
+      -- Other commands that execute 'Edit', can set this universal var before
+      -- and then it will not be overwritten by 'Edit'. ProcessFilesLoaded
+      -- will reset it.
       -- This is currently used for RestorePos and RingSavePos.
-      if CurEditCmd = '' then
-         CurEditCmd = 'EDIT'
+      if cureditcmd = '' then
+         cureditcmd = 'EDIT'
       endif
 
@@ -545 +546 @@
       error_reading = ''
       error_opening = ''
-      --  bad_paths     --> Non-existing path specified.
-      --  truncated     --> File contained lines longer than 255 characters.
-      --  access_denied --> If user tried to edit a subdirectory.
-      --  invalid_drive --> No such drive letter
-      --  error_reading --> Bad disk(ette).
-      --  error_opening --> Path contained invalid name.
+      --  bad_paths     --> non-existing path specified
+      --  truncated     --> file contained lines longer than 255 characters (EPM 5 only)
+      --  access_denied --> if user tried to edit a subdirectory
+      --  invalid_drive --> no such drive letter
+      --  error_reading --> bad disk(ette)
+      --  error_opening --> path contained invalid name
 
       fParseCmd = 1
@@ -569 +570 @@
 
          if ch = "'" & fParseCmd then
-            parse value rest with (ch) cmd (ch) rest
+            parse value rest with (ch) Cmd (ch) rest
             do while substr( rest, 1, 1) = ch & pos( ch, rest, 2)
                parse value rest with (ch) p (ch) rest
-               cmd = cmd''ch''p
+               Cmd = Cmd''ch''p
             enddo
-            CurEditCmd = cmd  -- set universal var to determine later in LOAD.E if pos shall be restored from EA
-            cmd
+            CurEditCmd = Cmd  -- set universal var to determine later in LOAD.E if pos shall be restored from EA
+            Cmd
 
          elseif ch = '/' then       -- Option
@@ -642 +643 @@
 
 ; Todo: rewrite that horrible message stuff:
-            if rc = -3 then        -- sayerror('Path not found')
+            if rc = -3 then        -- sayerror( 'Path not found')
                bad_paths = bad_paths', 'FileSpec
-            elseif rc = -2 then    -- sayerror('File not found')
+            elseif rc = -2 then    -- sayerror( 'File not found')
                not_found = not_found', 'FileSpec
-            elseif rc = -282 then  -- sayerror('New file')
+            elseif rc = -282 then  -- sayerror( 'New file')
                new_files = new_files', 'FileSpec
                new_files_loaded = new_files_loaded + 1
-            elseif rc = -278 then  --sayerror('Lines truncated') <-- never happens for EPM 6
+            elseif rc = -278 then  --sayerror( 'Lines truncated') <-- never happens for EPM 6
                getfileid truncid
-               do i = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
-                  if .modify then leave; endif  -- Need to do this if wildcards were specified.
+               do i = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
+                  if .modify then   -- Need to do this if wildcards were specified.
+                     leave
+                  endif
                   nextfile
                enddo
                truncated = truncated', '.filename
                .modify = 0
-            elseif rc = -5 then  -- sayerror('Access denied')
+            elseif rc = -5 then  -- sayerror( 'Access denied')
                access_denied = access_denied', 'FileSpec
-            elseif rc = -15 then  -- sayerror('Invalid drive')
+            elseif rc = -15 then  -- sayerror( 'Invalid drive')
                invalid_drive = invalid_drive', 'FileSpec
-            elseif rc = -286 then  -- sayerror('Error reading file')
+            elseif rc = -286 then  -- sayerror( 'Error reading file')
                error_reading = error_reading', 'FileSpec
-            elseif rc = -284 then  -- sayerror('Error opening file')
+            elseif rc = -284 then  -- sayerror( 'Error opening file')
                error_opening = error_opening', 'FileSpec
             endif  -- rc=-3
             --if first_file_loaded = '' then  -- useless: forever empty at this point
-               if rc <> -3   &  -- sayerror('Path not found')
-                  rc <> -2   &  -- sayerror('File not found')
-                  rc <> -5   &  -- sayerror('Access denied')
-                  rc <> -15     -- sayerror('Invalid drive')
+               if rc <> -3   &  -- sayerror( 'Path not found')
+                  rc <> -2   &  -- sayerror( 'File not found')
+                  rc <> -5   &  -- sayerror( 'Access denied')
+                  rc <> -15     -- sayerror( 'Invalid drive')
                   then
                   -- If rc = 0, then set first_file_loaded:
@@ -681 +684 @@
 
       if files_loaded > 1 then  -- If only one file, leave E3's message
-         if new_files_loaded > 1 then p = 'New files:'; else p = 'New file:'; endif
+         if new_files_loaded > 1 then
+            p = 'New files:'
+         else
+            p = 'New file:'
+         endif
          multiple_errors = (new_files || bad_paths || not_found || truncated ||
                             access_denied || error_reading || error_opening ||
@@ -692 +699 @@
                             error_reading || error_opening || invalid_drive)
 
-         if new_files then sayerror NEW_FILE__MSG substr(new_files,2); endif
-         if not_found then sayerror FILE_NOT_FOUND__MSG':' substr(not_found,2); endif
+         if new_files then
+            sayerror NEW_FILE__MSG substr( new_files, 2)
+         endif
+         if not_found then
+            sayerror FILE_NOT_FOUND__MSG':' substr( not_found, 2)
+         endif
       else
          multiple_errors = 0
       endif
-      if bad_paths then sayerror BAD_PATH__MSG':' substr(bad_paths,2); endif
-      if truncated then sayerror LINES_TRUNCATED__MSG':' substr(truncated,2); endif
-      if access_denied then sayerror ACCESS_DENIED__MSG':' substr(access_denied,2); endif
-      if invalid_drive then sayerror INVALID_DRIVE__MSG':' substr(invalid_drive,2); endif
-      if error_reading then sayerror ERROR_READING__MSG':' substr(error_reading,2); endif  -- __MSGs were
-      if error_opening then sayerror ERROR_OPENING__MSG':' substr(error_opening,2); endif  -- exchanged
+      if bad_paths then
+         sayerror BAD_PATH__MSG':' substr( bad_paths, 2)
+      endif
+      if truncated then
+         sayerror LINES_TRUNCATED__MSG':' substr( truncated, 2)
+      endif
+      if access_denied then
+         sayerror ACCESS_DENIED__MSG':' substr( access_denied, 2)
+      endif
+      if invalid_drive then
+         sayerror INVALID_DRIVE__MSG':' substr( invalid_drive, 2)
+      endif
+      if error_reading then
+         sayerror ERROR_READING__MSG':' substr( error_reading, 2)
+      endif
+      if error_opening then
+         sayerror ERROR_OPENING__MSG':' substr( error_opening, 2)
+      endif
+
       if multiple_errors then
-         messageNwait( MULTIPLE_ERRORS__MSG)
+         MessageNWait( MULTIPLE_ERRORS__MSG)
       endif
 
@@ -711 +735 @@
       if first_file_loaded <> '' then
 
-         -- activatefile is now executed in ProcessAfterLoad with postme.
+         -- activatefile is now executed in ProcessFilesLoaded with postme.
          -- This finally works properly. With activatefile here the ring would get messed.
          --activatefile first_file_loaded
-         -- Set fid for ProcessAfterLoad:
+         -- Set fid for ProcessFilesLoaded:
          firstloadedfid = first_file_loaded
 
@@ -723 +747 @@
       endif
 
-      if upcase( CurEditCmd) <> 'RESTORERING' then
+      if upcase( cureditcmd) <> 'RESTORERING' then
          'AtStartup AddToHistory EDIT' args
       endif
@@ -738 +762 @@
 defc o, Open
    fname = strip( arg( 1))                  -- Remove excess spaces
-   call parse_filename( fname, .filename)   -- Resolve '=', if any
+   call Parse_Filename( fname, .filename)   -- Resolve '=', if any
 
    call windowmessage( 0, getpminfo( APP_HANDLE),
                        5386,                   -- EPM_EDIT_NEWFILE
-                       put_in_buffer( fname),
+                       Put_In_Buffer( fname),
                        1)                      -- Tell EPM to free the buffer.
 
@@ -759 +783 @@
    parse arg Filename Pathname Rest
    if Pathname = '' | Pathname = '.' then
-      if filetype( Filename) = 'CMD' then
+      if FileType( Filename) = 'CMD' then
          PathnameList = 'PATH'
       else
@@ -769 +793 @@
    do w = 1 to words( PathnameList)
       Pathname = word( PathnameList, w)
-      call parse_filename( Filename,
+      call Parse_Filename( Filename,
                            substr( .filename, lastpos( '\', .filename) + 1))
       findfile Newfile, Filename, Pathname  -- find Filename in Pathname env var
@@ -784 +808 @@
 ; ---------------------------------------------------------------------------
 defc op, OPath, OpenPath
-   "Open 'ep "arg(1)"'"
+   "Open 'ep "arg( 1)"'"
 
 ; ---------------------------------------------------------------------------
@@ -816 +840 @@
       epmdir = directory()
 
-      call psave_pos( savedpos)
+      call pSave_Pos( savedpos)
       getsearch oldsearch
       -- search (reverse) in command shell buffer for the prompt and
@@ -827 +851 @@
          call ShellParsePromptLine( CurDir, Cmd)
       endif
-      ShellCmd = 'shell'
+      ShellCmd = 'Shell'
       if CurDir <> '' then
          ShellCmd = ShellCmd 'cdd' CurDir
       endif
       setsearch oldsearch
-      call prestore_pos( savedpos)
+      call pRestore_Pos( savedpos)
 
       fn = "'mc +cd "epmdir"+"shellcmd"'"
@@ -858 +882 @@
    endif
 
-   postmc = ''
+   PostMcArg = ''
    if fn <> '' then
-      call psave_pos( savedpos)
+      call pSave_Pos( savedpos)
       -- add arg for 'mc'
-      postmc = postmc';restorepos 'savedpos
+      PostMcArg = ';RestorePos 'savedpos
    endif
    -- Valid EPM commandline options are always regnized, even when they
@@ -868 +892 @@
    if GetMode() = 'BIN' then
       -- prepend 'binedit'
-      fn = "'binedit "fn"'"
-   endif
-   if postmc > '' then
-      "Open" fn "'postme mc "postmc"'"
+      fn = "'BinEdit "fn"'"
+   endif
+   if PostMcArg > '' then
+      "Open" fn "'PostMe mc "PostMcArg"'"
    else
       'Open' fn
@@ -893 +917 @@
    'HookAdd loadonce matchtab off'
    'HookAdd loadonce mode bin noea'
-   'e /t /64 /bin "'arg(1)'"'    -- options should go before filename                    <-- Todo: parse options and filename
+   'e /t /64 /bin "'arg( 1)'"'    -- options should go before filename                    <-- Todo: parse options and filename
                                  -- /64 doesn't work if run from a program object.
    'postme AvoidSaveOptions /e /s /t /o /l'
@@ -950 +974 @@
 
 ; ---------------------------------------------------------------------------
-; Finds EPM macro files <basename>.e in Dir of arg(1) and EPMMACROPATH.
+; Finds EPM macro files <basename>.e in Dir of arg( 1) and EPMMACROPATH.
 ; Opens listbox to select one file if multiple found.
-; <basename> is parsed from arg(1), so arg(1) may have any extension.
+; <basename> is parsed from arg( 1), so arg( 1) may have any extension.
 ; For association with *.ex (type: EX file) and *.e:
 ;    Program object:
@@ -1256 +1280 @@
 ;      Works now with temp files (starting with '.') as well.
 ;      Always returns 0.
-defproc parse_filename( var filename)
+defproc Parse_Filename( var filename)
 
    sourcefile = strip( arg( 2))
@@ -1275 +1299 @@
          parse value rest with "'"wrd"'" rest
          -- parse wrd again without the quotes (wrd may contain multiple wrds)
-         call parse_filename( wrd, sourcefile)
+         call Parse_Filename( wrd, sourcefile)
          resolved = resolved" '"wrd"'"
       elseif leftstr( rest, 1) = '"' then
@@ -1281 +1305 @@
          parse value rest with '"'wrd'"' rest
          -- wrd is ready to resolve '='
-         call parse_filename2( wrd, sourcefile)
+         call Parse_Filename2( wrd, sourcefile)
          resolved = resolved' "'wrd'"'
       else
@@ -1287 +1311 @@
          parse value rest with wrd rest
          -- wrd is ready to resolve '='
-         call parse_filename2( wrd, sourcefile)
+         call Parse_Filename2( wrd, sourcefile)
          resolved = resolved' 'wrd
       endif
@@ -1297 +1321 @@
 ; ---------------------------------------------------------------------------
 ; Resolve '=', '%' and ?: in a single word or word with spaces
-defproc parse_filename2( var wrd, sourcefile)
+defproc Parse_Filename2( var wrd, sourcefile)
 
    -- Parse sourcefile
@@ -1374 +1398 @@
 
    -- Get specified dir
-   StartDir = arg(2)
+   StartDir = arg( 2)
 
    -- Translate '/' to '\' if local masks specified
@@ -1456 +1480 @@
 ; Wrong: [Does *not* assume all options are specified before filenames.]
 ; Options must be specified before filename.
-defproc parse_leading_options( var rest, var options)
+defproc Parse_Leading_Options( var rest, var options)
    options = ''
    loop
@@ -1474 +1498 @@
 ; path or the fileid, which will be replaced by the corresponding part of the
 ; previous file (initially, the current filename).
-defproc parse_file_n_opts( argstr)
+defproc Parse_File_N_Opts( argstr)
    prev_filename = .filename
    output = ''
@@ -1486 +1510 @@
       endif
       if substr( filename, 1, 1) <> '/' then
-         call parse_filename( filename, prev_filename)
+         call Parse_Filename( filename, prev_filename)
          prev_filename = filename
       endif
@@ -1497 +1521 @@
 ; source file is modified.
 ; We can just execute 'get' to achieve the same result.
-defc insert_text_file
+defc Insert_Text_File
    'get 'arg( 1)