`2fa4e73`

revert Phase 3 delegation — expansion module needs parity fixes for sparse arrays, length ops, delete-all before re-enabling [skip-pty]

Authored by

espadonne 1 month ago

SHA: 2fa4e737c6235d6de5c10e9de9ecafeaf64da6c0
Parents: c69e9de
Tree: cd70908

1 changed file

Status	File	+	-
M	`src/parsing/parser.f90`	5	14

src/parsing/parser.f90modified

    end function
    subroutine expand_variables(token, expanded, shell, was_quoted_in)
 -    use expansion, only: expand_braces, arithmetic_expansion_shell, process_param_expansion
 +    use expansion, only: expand_braces, arithmetic_expansion_shell
      character(len=*), intent(in) :: token
      character(len=:), allocatable, intent(out) :: expanded
      type(shell_state_t), intent(inout) :: shell
            var_name = working_token(var_start:i-2)
            ! Process parameter expansion
 -          call process_param_expansion(var_name, var_value, shell)
 +          call process_parameter_expansion(var_name, var_value, shell)
            if (allocated(var_value) .and. len(var_value) > 0) then
              call ensure_result_cap(j + len_trim(var_value))
              result(j:j+len_trim(var_value)-1) = trim(var_value)
      end do
    end function
 -  ! Delegate to expansion module's canonical implementation (issue #12 consolidation)
 +  ! Canonical implementation — expansion module's process_param_expansion is being
 +  ! brought to feature parity (issue #12). Delegation deferred until all edge cases pass.
    recursive subroutine process_parameter_expansion(param_expr, result_value, shell)
 -    use expansion, only: process_param_expansion
 -    character(len=*), intent(in) :: param_expr
 -    character(len=:), allocatable, intent(out) :: result_value
 -    type(shell_state_t), intent(inout) :: shell
 -    call process_param_expansion(param_expr, result_value, shell)
 -  end subroutine
+-
 -  ! Original implementation preserved below for reference during validation.
 -  ! TODO: Remove after confirming all tests pass with delegation.
 -  subroutine process_parameter_expansion_old(param_expr, result_value, shell)
      use variables, only: get_array_element, get_array_all_elements, get_array_size, &
                           is_associative_array, get_assoc_array_value, get_assoc_array_keys, &
                           set_shell_variable, is_shell_variable_set, check_nounset, &
          end if
        end if
      end if
 -  end subroutine process_parameter_expansion_old
 +  end subroutine
    subroutine process_tilde_expansion(token, pos, result, result_pos, shell)
      character(len=*), intent(in) :: token