`f972ead`

fix: skip <<< (here-string) in heredoc detection — was consuming subsequent lines as heredoc content

Authored by

espadonne 1 month ago

Status	File	+	-
M	`src/fortsh.f90`	10	2
M	`src/parsing/parser.f90`	6	1

src/fortsh.f90modified

          in_double_quote = .not. in_double_quote
        end if
 -      ! Check for << when outside quotes
 +      ! Check for << when outside quotes (but NOT <<< which is here-string)
        if (.not. in_single_quote .and. .not. in_double_quote) then
          if (str(i:i+1) == '<<') then
 +          ! Skip <<< (here-string)
 +          if (i + 2 <= len_trim(str) .and. str(i+2:i+2) == '<') cycle
            has_heredoc = .true.
            return
          end if
              in_double_quote = .not. in_double_quote
            end if
 -          ! Check for << when outside quotes
 +          ! Check for << when outside quotes (but NOT <<< which is here-string)
            if (.not. in_single_quote .and. .not. in_double_quote) then
              if (cmd_line(search_pos:search_pos+1) == '<<') then
 +              ! Skip <<< (here-string)
 +              if (search_pos + 2 <= len_trim(cmd_line) .and. &
 +                  cmd_line(search_pos+2:search_pos+2) == '<') then
 +                search_pos = search_pos + 3
 +                cycle
 +              end if
                j = search_pos
                exit
              end if

src/parsing/parser.f90modified

          i = i + 1; cycle
        end if
 -      ! Look for << not inside quotes
 +      ! Look for << not inside quotes (but NOT <<< which is here-string)
        if (line(i:i) == '<' .and. i + 1 <= line_len .and. line(i+1:i+1) == '<') then
 +        ! Skip <<< (here-string, not heredoc)
 +        if (i + 2 <= line_len .and. line(i+2:i+2) == '<') then
 +          i = i + 3
 +          cycle
 +        end if
          i = i + 2
          ! Skip <<- (strip tabs variant)
          strip_tabs = .false.