Changeset 4732

Timestamp:

Oct 4, 2021, 1:37:56 PM (3 years ago)

Author:

Andreas Schnellbacher

Message:

• Added Shebangs and Signatures keys for mode determination.

Location:

trunk/src/netlabs

Files:

• bin/defaults.cfg (modified) (5 diffs)
• macros/mode.e (modified) (5 diffs)

trunk/src/netlabs/bin/defaults.cfg ¶

@@ -716 +716 @@
 \NEPMD\User\Mode\BIN\CaseSensitive                 = 1
 \NEPMD\User\Mode\BIN\Extensions                    = BIN EXE DLL LIB RES
+\NEPMD\User\Mode\BIN:*.INI\Signatures              = \xFF\xFF\xFF\xFF\x14\x00
 \NEPMD\User\Mode\BIN\Tabs                          = 1
 \NEPMD\User\Mode\BIN\MatchTab                      = 0
@@ -909 +910 @@
 \NEPMD\User\Mode\PERL\CaseSensitive                = 0
 \NEPMD\User\Mode\PERL\Extensions                   = PL PRL PERL PM
+\NEPMD\User\Mode\PERL:*.CMD\Shebangs               = *PERL*
+\NEPMD\User\Mode\PERL:*.\Shebangs                  = *PERL*
 \NEPMD\User\Mode\PERL\LineComment                  = #
 \NEPMD\User\Mode\PERL\LineCommentPos               = 0
@@ -917 +920 @@
 \NEPMD\User\Mode\PHP\CaseSensitive                 = 0
 \NEPMD\User\Mode\PHP\Extensions                    = PHP PHP3 PHP4
+\NEPMD\User\Mode\PHP:*.CMD\Shebangs                = *PHP*
+\NEPMD\User\Mode\PHP:*.\Shebangs                   = *PHP*
 \NEPMD\User\Mode\PHP\LineComment                   = # //
 \NEPMD\User\Mode\PHP\LineCommentPos                = 0 0
@@ -929 +934 @@
 \NEPMD\User\Mode\PYTHON\CaseSensitive              = 1
 \NEPMD\User\Mode\PYTHON\Extensions                 = PY
+\NEPMD\User\Mode\PYTHON:*.CMD\Shebangs             = *PYTHON*
+\NEPMD\User\Mode\PYTHON:*.\Shebangs                = *PYTHON*
 \NEPMD\User\Mode\PYTHON\LineComment                = #
 \NEPMD\User\Mode\PYTHON\LineCommentPos             = 0
@@ -955 +962 @@
 \NEPMD\User\Mode\REXX\CaseSensitive                = 0
 \NEPMD\User\Mode\REXX\Extensions                   = CWX ERX EXC EXEC KEX LX LXL R REX REXX RX RXX THE VRM VRS VRX X XEDIT ZRX
+\NEPMD\User\Mode\REXX:*.CMD\Signatures             = /*
 \NEPMD\User\Mode\REXX\MultiLineCommentStart        = /*
 \NEPMD\User\Mode\REXX\MultiLineCommentEnd          = */

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

@@ -73 +73 @@
       ModeList = NepmdQueryModeList()
 
-      -- Handle temp. epmkwds files
+      -- Handle temp. epmkwds files. The mode is the name.
       if upcase( GetFileSpec( 'DP', Filename)) = upcase( GetTmpPath()'nepmd\hilite\') then
          Next = upcase( Name)
@@ -82 +82 @@
       endif
 
-      -- Handle .hil files
+      -- Handle .hil files. The mode is the subdir name.
       if Ext = 'HIL' then
          HilFilePath      = upcase( GetFileSpec( 'DP', Filename))
@@ -99 +99 @@
             leave
          endif
-      endif
-
--- TODO:
--- Remove this when Extproc, Shebang, Signature keys are implemented
-      -- Handle REXX and INI
+         NepmdDevDir = Get_Env( 'NEPMD_DEVDIR')
+         if NepmdDevDir then
+            DevHiliteDir = upcase( NepmdDevDir'\src\netlabs\hilite')
+            if pos( DevHiliteDir, HilFilePath) = 1 then
+               Next = substr( HilFilePath, length( DevHiliteDir) + 2,
+                  length( HilFilePath) - length( DevHiliteDir) - 2)
+               FoundMode = Next
+               leave
+            endif
+         endif
+      endif
+
       SigStr = ''
 
+      -- Handle EXTPROC in .cmd files. This doesn't need a setting, because
+      -- EXTPROC exists only for CMD files. Only modes of ModeList are found.
       if Ext = 'CMD' then
          if SigStr = '' then
             SigStr = NepmdReadFilePart( Filename)
          endif
-         -- REXX
-         if leftstr( SigStr, 2) = '/' || '*' then
-            FoundMode = 'REXX'
-            leave
-         endif
          -- Extproc
          -- Replace tab, LF and CR with spaces
-         Next = translate( SigStr, \32\32\32, \9\10\13)
+         Next = upcase( translate( SigStr, \32\32\32, \9\10\13))
          -- First word must be 'EXTPROC'
-         if upcase( strip( word( Next, 1))) = 'EXTPROC' then
+         if strip( word( Next, 1)) = 'EXTPROC' then
             -- Get basename of second word
             Proc = strip( word( Next, 2))
             if Proc <> '' then
                ProcBase = GetFileSpec( 'B', Proc)
-               FoundMode = upcase( ProcBase)
-               leave
+               -- Mode must exist
+               if wordpos( ProcBase, ModeList) then
+                  FoundMode = upcase( ProcBase)
+                  leave
+               endif
             endif
          endif
-         -- OS/2 CMD
-         FoundMode = 'CMD'
-         leave
-      endif
-
-      if Ext = 'INI' then
-         if SigStr = '' then
-            SigStr = NepmdReadFilePart( Filename)
-         endif
-         -- OS/2 INI
-         if leftstr( SigStr, 6) = \xFF\xFF\xFF\xFF\x14\x00 then
-            FoundMode = 'BIN'
-            leave
-         endif
-         -- Text INI
-         FoundMode = 'INI'
-         leave
-      endif
-
-      -- Query extended mode list
+      endif
+
+      -- GetMatchModeFileMaskList matches a filemask against Filename.
+      -- After that, the begin of a file has to be read to check if it
+      -- matches the specified values for Shebangs or Signatures.
+      FoundModeFileMaskList = GetMatchModeFileMaskList( Filename)
+
+      -- Query extended mode list to get mode and type
       ExModeList = NepmdQueryModeList( 1)
       Rest = ExModeList
@@ -154 +149 @@
          ThisMode = strip( ThisMode)
 
--- TODO: Add Extproc, Shebang, Signature
+         -- Shebangs, Signatures
+         Sep = \0
+         RestModeFileMask = FoundModeFileMaskList
+         do while RestModeFileMask <> ''
+            parse value RestModeFileMask with ThisMode':'ThisFileMask (Sep) RestModeFileMask
+            -- Ignore * and *.* as ThisFileMask to avoid reading all files
+            if wordpos( ThisFileMask, '* *.*') then
+               iterate
+            endif
+            -- Filemasks of FoundModeFileMaskList already match filename.
+            -- Now check the file begin for a matching Shebang or signature.
+            SettingNames = 'Shebangs Signatures'
+            do s = 1 to words( SettingNames)
+               ThisSettingName = word( SettingNames, s)
+               FilterList = upcase( QueryModeKey( ThisMode':'ThisFileMask, ThisSettingName))
+               do w = 1 to words( FilterList)
+                  ThisFilter = word( FilterList, w)
+                  if SigStr = '' then
+                     SigStr = NepmdReadFilePart( Filename)
+                  endif
+                  CheckStr = upcase( strip( translate( SigStr, ' ', \9)))
+                  if ThisSettingName = 'Shebangs' then
+                     if leftstr( CheckStr, 2) = '!#' then
+                        CheckStr = strip( substr( CheckStr, 3))
+                     endif
+                  endif
+                  if StrMatch( ' 'CheckStr' ', ' 'ThisFilter' ') then
+                     FoundMode = ThisMode
+                     leave
+                  endif
+               enddo  -- w
+               if FoundMode <> '' then
+                  leave
+               endif
+            enddo  -- s
+            if FoundMode <> '' then
+               leave
+            endif
+         enddo  -- while RestModeFileMask
+         if FoundMode <> '' then
+            leave
+         endif
 
          -- Extensions
@@ -190 +226 @@
          endif
 
-      enddo
-   enddo
+      enddo  -- while Rest
+   enddo  -- once
 
    -- General default mode