`f5614fe`

add word_len to case_data_t to preserve whitespace-only case values

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 2 months ago

Status	File	+	-
M	`src/parsing/command_tree.f90`	8	1
M	`src/parsing/grammar_parser.f90`	4	2

src/parsing/command_tree.f90modified

    ! =====================================
    type :: case_data_t
      character(len=MAX_TOKEN_LEN) :: word                      ! case $word in
 +    integer :: word_len = 0                                   ! Actual word length (for whitespace-only values)
      type(case_item_t), allocatable :: items(:)                ! Case items
      integer :: num_items = 0
    end type case_data_t
      node%for_loop%body => body
    end function create_for_loop
 -  function create_case_statement(word, items, num_items) result(node)
 +  function create_case_statement(word, items, num_items, word_len) result(node)
      character(len=*), intent(in) :: word
      type(case_item_t), intent(in) :: items(:)
      integer, intent(in) :: num_items
 +    integer, intent(in), optional :: word_len
      type(command_node_t), pointer :: node
      allocate(node)
      node%node_type = NODE_CASE
      allocate(node%case_stmt)
      node%case_stmt%word = word
 +    if (present(word_len)) then
 +      node%case_stmt%word_len = word_len
 +    else
 +      node%case_stmt%word_len = len_trim(word)
 +    end if
      allocate(node%case_stmt%items(num_items))
      node%case_stmt%items = items
      node%case_stmt%num_items = num_items

src/parsing/grammar_parser.f90modified

      type(command_node_t), pointer :: node, case_cmds
      character(len=MAX_TOKEN_LEN) :: word, patterns(10)
      type(case_item_t) :: items(20)
 -    integer :: num_items, num_patterns, i
 +    integer :: num_items, num_patterns, i, word_len
      type(token_t) :: tok
      nullify(node)
      num_items = 0
      tok = current_token(state)
      if (tok%token_type /= TOKEN_WORD) return
      word = tok%value
 +    word_len = tok%value_length
 +    if (word_len == 0) word_len = len_trim(word)
      call advance(state)
      call skip_newlines(state)
      if (.not. expect(state, 'in')) return
      end do
      if (.not. expect(state, 'esac')) return
 -    node => create_case_statement(word, items, num_items)
 +    node => create_case_statement(word, items, num_items, word_len)
    end function
    ! Parse commands in a case item until ;; or esac