From a1fd45bdedaca4176ab0c19211c500cb04ecb70c Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Tue, 17 Aug 2021 17:11:02 +0200 Subject: [PATCH 1/2] offset should have been taken into account (like earlier) new changes should not break old functionality --- PRIVATE | 2 +- src/YAML_parse.f90 | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/PRIVATE b/PRIVATE index 4ce625b4a..3abca9c1d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 4ce625b4ac0da9d490620f8cf1694d0a057cfa47 +Subproject commit 3abca9c1db05b76bff72b38b24897b881fd23077 diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90 index 5ee38691c..608fed1ee 100644 --- a/src/YAML_parse.f90 +++ b/src/YAML_parse.f90 @@ -360,18 +360,19 @@ end subroutine remove_line_break !-------------------------------------------------------------------------------------------------- !> @brief return the scalar list item without line break !-------------------------------------------------------------------------------------------------- -subroutine list_item_inline(blck,s_blck,inline) !ToDo: SR: merge with remove_line_break eventually +subroutine list_item_inline(blck,s_blck,inline,offset) - character(len=*), intent(in) :: blck !< YAML in mixed style - integer, intent(inout) :: s_blck - character(len=:), allocatable, intent(out) :: inline + character(len=*), intent(in) :: blck !< YAML in mixed style + integer, intent(inout) :: s_blck + character(len=:), allocatable, intent(out) :: inline + integer, intent(inout) :: offset character(len=:), allocatable :: line integer :: indent,indent_next + indent = indentDepth(blck(s_blck:),offset) line = IO_rmComment(blck(s_blck:s_blck + index(blck(s_blck:),IO_EOL) - 2)) - indent = indentDepth(blck(s_blck:)) - inline = line(indent+3:) + inline = line(indent-offset+3:) s_blck = s_blck + index(blck(s_blck:),IO_EOL) indent_next = indentDepth(blck(s_blck:)) @@ -563,9 +564,9 @@ recursive subroutine lst(blck,flow,s_blck,s_flow,offset) else ! list item in the same line line = line(indentDepth(line)+3:) if(isScalar(line)) then - call list_item_inline(blck,s_blck,inline) - call line_toFlow(flow,s_flow,inline) + call list_item_inline(blck,s_blck,inline,offset) offset = 0 + call line_toFlow(flow,s_flow,inline) elseif(isFlow(line)) then s_blck = s_blck + index(blck(s_blck:),'-') if(isFlowList(line)) then From 66953a7c04a624b417b8b24fc93cf73ba359c3e5 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Tue, 17 Aug 2021 18:56:24 +0200 Subject: [PATCH 2/2] test repo updated --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 3abca9c1d..6037ed541 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 3abca9c1db05b76bff72b38b24897b881fd23077 +Subproject commit 6037ed541710fc84699ee2ca1d36a69d7fa20f0f