Changeset 3804

Timestamp:

Jan 11, 2020, 10:05:57 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Added FindLiteralPos to return the start and end of a quoted environment at position n.
• Changed syntax of IsLiteral. Second arg is now the position.

Location:

trunk/src/netlabs/macros

Files:

• alt_1.e (modified) (1 diff)
• stdprocs.e (modified) (1 diff)
• tabsspaces.e (modified) (2 diffs)

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

@@ -788 +788 @@
       endif
       -- Redetermine LeftLineStr
+      n = .col
       if .col <> CurCol then
          LeftLineStr  = leftstr( LineStr, .col - 1)
+         n = .col - 1
       endif
       -- End of repositioning cursor when cursor was on search string
 
-      if IsLiteral( LeftLineStr, leftstr( RightLineStr, 1)) then
+      if IsLiteral( LineStr, n) then
          SeparatorList = "'"||'"'
       else

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

@@ -1440 +1440 @@
 
 ; ---------------------------------------------------------------------------
-; Count quotes in LeftLine, e.g. in part of line before the cursor.
-; If odd, then char at cursor pos. must belong to a string.
-; Syntax: fLiteral = IsLiteral( [<LeftLine>[, <Quotes>]])
-;         fLiteral is 0 | 1.
-;         <Quotes> is a space-separated list of quote chars.
-;         Default value is " '.
-defproc IsLiteral
-   LeftLineStr = arg( 1)
-   if LeftLineStr = '' then
-      LeftLineStr = leftstr( textline( .line), .col)
-   endif
-   CurChar = arg( 2)
-   if CurChar = '' then
-      CurChar = substr( textline( .line), .col, 1)
-   endif
+; Finds quote environment in LineStr around position n. The default quote
+; chars are double quote and single quote. Returns begin and end position
+; of the found quotes.
+defproc FindLiteralPos( LineStr, n)
+   RevLineStr = reverse( LineStr)
+   LineLen    = length( LineStr)
+   pStart     = n
+   pRevStart  = LineLen - pStart + 1
+
+   DQ = '"'
+   SQ = "'"
    Quotes = arg( 3)
    if Quotes = '' then
-      Quotes = '"' || " '"
-   endif
-
-
+      Quotes = DQ SQ
+   endif
+
+   pBegin = 0
+   pEnd   = 0
+
+   do w = 1 to words( Quotes)
+      if pStart < 1 then
+         leave
+      endif
+      if pStart > LineLen then
+         leave
+      endif
+      Quote = word( Quotes, w)
+
+      -- Handle position pStart on a quote char
+      if substr( LineStr, pStart, 1) = Quote then
+         -- Count number of quotes until start position is reached
+         numQ = 0
+         pStartQ = 1
+         do forever
+            pQ = pos( Quote, LineStr, pStartQ)
+            if pQ = 0 then
+               leave
+            elseif pQ > pStart then
+               leave
+            endif
+            numQ = numQ + 1
+            pStartQ = pQ + 1
+         enddo
+
+         if numQ // 2 = 0 then
+            -- Even number: pEnd = pStart, advance pRevStart
+            pEnd = pStart
+            pRevStart = pRevStart + 1
+         else
+            -- Odd number: pBegin = pStart, advance pStart
+            pBegin = pStart
+            pStart = pStart + 1
+         endif
+      endif
+
+      -- Find begin and end
+      if pBegin = 0 then
+         pRevBegin = pos( Quote, RevLineStr, pRevStart)
+         pBegin    = LineLen - pRevBegin + 1
+      endif
+      if pEnd = 0 then
+         pEnd = pos( Quote, LineStr, pStart)
+      endif
+
+      -- Ensure to return 0 0 if quote chars were not found
+      if pBegin > LineLen | pEnd > LineLen | pBegin = 0 | pEnd = 0 then
+         pBegin = 0
+         pEnd = 0
+      endif
+
+      if pBegin <> 0 & pEnd <> 0 then
+         leave
+      endif
+   enddo
+
+   return pBegin pEnd
+
+; ---------------------------------------------------------------------------
+; Checks if position n in LineStr is a literal. LineStr must at least be
+; specified up to the end quote char. Uses cursor position if LineStr and n
+; are not specified. Default quote chars are double quote and single quote.
+defproc IsLiteral
    fLiteral = 0
-   do w = 1 to words( Quotes)
-      Quote = word( Quotes, w)
-      numQ = 0
-      pStartQ = 1
-
-      if CurChar = Quote then
-         fLiteral = 1
-         leave
-      endif
-
-      do forever
-         pQ = pos( Quote, LeftLineStr, pStartQ)
-         if pQ = 0 then
-            leave
-         endif
-         numQ = numQ + 1
-         pStartQ = pQ + 1
-      enddo
-
-      if (numQ // 2 <> 0) then
-         fLiteral = 1
-         leave
-      endif
-   enddo
+   LineStr = arg( 1)
+   if LineStr = '' then
+      LineStr = textline( .line)
+   endif
+   n = arg( 2)
+   if n = '' then
+      n = .col
+   endif
+   Quotes = arg( 3)
+
+   FoundPos = FindLiteralPos( LineStr, n, Quotes)
+
+   if FoundPos <> '0 0' then
+      fLiteral = 1
+   endif
 
    return fLiteral
 
 ; ---------------------------------------------------------------------------
-; Tests whether the "filename" is actually a printer
-; device, so we'll know whether to test printer readiness first.
-; Called by savefile() in SAVELOAD.E.  Returns 0 if not, else printer number.
+; Tests whether the "filename" is actually a printer device, so we'll know
+; whether to test printer readiness first.
+; Returns 0 if not, else printer number.
+; Called by savefile() in SAVELOAD.E.
 defproc Check_For_Printer( name)
    if not name then

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

@@ -570 +570 @@
 
       -- Don't process enquoted string
-      if IsLiteral( TmpLineStr, leftstr( RightPart, 1)) then  -- TmpLineStr is here only left part before current doublespace
+      if IsLiteral( TmpLineStr''RightPart, Col) then  -- TmpLineStr is here only left part before current doublespace
          TmpLineStr = TmpLineStr''copies( ' ', SpaceLen)
          Col = Col + SpaceLen
@@ -703 +703 @@
 
          -- Don't process enquoted string
-         if IsLiteral( LeftLineStr, leftstr( RightLineStr, 1)) then
+         if IsLiteral( LeftLineStr''RightLineStr, .col) then
             .col = .col + length( TwoSpc)
             iterate