Changeset 2880

Timestamp:

Jan 14, 2018, 10:52:43 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Removed .ex file searching from defc UnLink, because it's not required.

File:

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

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

@@ -35 +35 @@
 ;    >=0  linked successfully, the linked module number is returned, starting
 ;         with 0 for EPM.EX, followed by 1 etc.
-defc link
+defc Link
    universal menuloaded  -- only defined in newmenu yet
 
@@ -68 +68 @@
 ; user has to press 'OK' in order to continue. Other messages are always
 ; suppressed. Additionally, the modulename must be given.
-defc linkverify
+defc LinkVerify
    modulename = arg(1)
 
@@ -155 +155 @@
 ; Syntax: unlink [<path>][<modulename>][.ex]        Example:  unlink draw
 ; A front end to the unlink statement to allow command-line invocation.
-; The standard unlink statement doesn't search in EPMPATH and DPATH like the
-; link statement does. This is added here. ExFile is searched in
-; .;%EPMPATH%;%DPATH% until the linked file is found.
-defc unlink
-   FullPathName = ''
+defc UnLink
    ExFile = arg(1)
 
-   call parse_filename( ExFile)
-
-   if substr( ExFile, 2, 2) =  ':\' or substr( ExFile, 1, 2) =  '\\' then
-      FullPathName = ExFile
-   endif
-
-   if FullPathName = '' then
-
-      -- If no name given, use current file with '.ex' extension
-      if ExFile = '' then
-         p2 = lastpos( '.', .filename)
-         if upcase( substr( .filename, p2)) <> '.E' then
-            sayerror '"'.filename'" is not an .E file'
-            return
-         endif
-         ExFile = substr( .filename, 1, p2 - 1)'.ex'
-      endif
-
-      -- Strip path and append '.ex' if no extension
-      p1 = lastpos( '\', ExFile)
-      ExFileName = substr( ExFile, p1 + 1)
-      p2 = lastpos( '.', ExFileName)
-      if p2 = 0 then
-         ExFileName = ExFileName'.ex'
-      endif
-
-      -- Search ExFile in whole PathList, until linkedrc >= 0
-      PathList = '.;'Get_Env('EPMPATH')';'Get_Env('DPATH')';'  -- standard EPM
-      --PathList = Get_Env('EPMEXPATH')';'                       -- NEPMD
-      rest = PathList
-      do while rest <> ''
-         parse value rest with Path';'rest
-         if Path = '' then
-            iterate
-         endif
-         next = strip( Path, 'T', '\')'\'ExFileName
-         if Exist( next) then
-            linkedrc = linked( next)
-            if linkedrc >= 0 then
-               FullPathName = next
-               leave
-            endif
-         endif
-      enddo
-
-   endif
-
-   if FullPathName = '' then
-      FullPathName = arg(1)  -- try to unlink arg(1) if not found until here
-   endif
-
    display -2  -- Turn non-critical messages off, we give our own message.
-   unlink FullPathName
+   unlink ExFile
    unlinkrc = rc
    display 2
+
    if unlinkrc then
       if unlinkrc = -310 then
-         sayerror 'Module "'FullPathName'" not unlinked, unknown module.'
+         sayerror 'Module "'ExFile'" not unlinked, unknown module.'
       elseif unlinkrc = -301 then
-         sayerror 'Module "'FullPathName'" not unlinked, module in use (better restart EPM).'
+         sayerror 'Module "'ExFile'" not unlinked, module in use (better restart EPM).'
       elseif unlinkrc = -302 then
-         sayerror 'Module "'FullPathName'" not unlinked, defined keyset in use (better restart EPM).'
-      else
-         sayerror 'Module "'FullPathName'" not unlinked, rc = 'unlinkrc'.'
-      endif
-   else
-      sayerror 'Module "'FullPathName'" successfully unlinked.'
+         sayerror 'Module "'ExFile'" not unlinked, defined keyset in use (better restart EPM).'
+      else
+         sayerror 'Module "'ExFile'" not unlinked, rc = 'unlinkrc'.'
+      endif
+   else
+      sayerror 'Module "'ExFile'" successfully unlinked.'
    endif
 
@@ -244 +190 @@
 ;    -308                 if bad module name, can't be expanded.  Same as
 ;                         sayerror("Link: invalid filename").
-defc qlink, qlinked, ql
+defc QLink, QLinked, QL
    module = arg(1)
    call parse_filename( module)
@@ -286 +232 @@
 
 ; ---------------------------------------------------------------------------
-defc linkexec
+defc LinkExec
    parse arg ex_file cmd_name
    call link_exec( ex_file, cmd_name)