223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/YAML-bug-fix' into development

This commit is contained in:
Martin Diehl 2021-08-18 13:06:42 +02:00
parent 64ba6da5fa 93d23fa6bb
commit 13159caf4a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 7d783328ff5deac313eb7de951d51d19b5883b84 Subproject commit 6037ed541710fc84699ee2ca1d36a69d7fa20f0f

17
src/YAML_parse.f90
View File

@ -360,18 +360,19 @@ end subroutine remove_line_break
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief return the scalar list item without 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 character(len=*), intent(in) :: blck !< YAML in mixed style
integer, intent(inout) :: s_blck integer, intent(inout) :: s_blck
character(len=:), allocatable, intent(out) :: inline character(len=:), allocatable, intent(out) :: inline
integer, intent(inout) :: offset
character(len=:), allocatable :: line character(len=:), allocatable :: line
integer :: indent,indent_next 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)) line = IO_rmComment(blck(s_blck:s_blck + index(blck(s_blck:),IO_EOL) - 2))
indent = indentDepth(blck(s_blck:)) inline = line(indent-offset+3:)
inline = line(indent+3:)
s_blck = s_blck + index(blck(s_blck:),IO_EOL) s_blck = s_blck + index(blck(s_blck:),IO_EOL)
indent_next = indentDepth(blck(s_blck:)) 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 else ! list item in the same line
line = line(indentDepth(line)+3:) line = line(indentDepth(line)+3:)
if(isScalar(line)) then if(isScalar(line)) then
call list_item_inline(blck,s_blck,inline) call list_item_inline(blck,s_blck,inline,offset)
call line_toFlow(flow,s_flow,inline)
offset = 0 offset = 0
call line_toFlow(flow,s_flow,inline)
elseif(isFlow(line)) then elseif(isFlow(line)) then
s_blck = s_blck + index(blck(s_blck:),'-') s_blck = s_blck + index(blck(s_blck:),'-')
if(isFlowList(line)) then if(isFlowList(line)) then