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

probably not needed 

We remove blank spaces while converting to flow YAML.
This commit is contained in:
Sharan Roongta 2021-07-23 18:37:45 +02:00
parent c347688410
commit a5c4e7232c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/YAML_parse.f90
View File

@ -54,7 +54,7 @@ recursive function parse_flow(YAML_flow) result(node)
myVal myVal
character(len=:), allocatable :: & character(len=:), allocatable :: &
flow_string, & flow_string, &
key, line key
integer :: & integer :: &
e, & ! end position of dictionary or list e, & ! end position of dictionary or list
s, & ! start position of dictionary or list s, & ! start position of dictionary or list
@ -97,9 +97,8 @@ recursive function parse_flow(YAML_flow) result(node)
allocate(tScalar::node) allocate(tScalar::node)
select type (node) select type (node)
class is (tScalar) class is (tScalar)
line = trim(adjustl(flow_string)) if(flow_string(1:1) == '"') then
if(line(1:1) == '"') then node = trim(adjustl(flow_string(2:len(flow_string)-1)))
node = line(2:len(line)-1)
else else
node = trim(adjustl(flow_string)) node = trim(adjustl(flow_string))
endif endif
@ -362,7 +361,7 @@ subroutine list_item_inline(blck,s_blck,inline) !ToDo: SR: merge with remove_
do while(indent_next > indent) do while(indent_next > indent)
inline = inline//' '//trim(adjustl(IO_rmComment(blck(s_blck:s_blck + index(blck(s_blck:),IO_EOL) - 2)))) inline = inline//' '//trim(adjustl(IO_rmComment(blck(s_blck:s_blck + index(blck(s_blck:),IO_EOL) - 2))))
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:))
enddo enddo
@ -849,9 +848,9 @@ subroutine selfTest
character(len=*), parameter :: flow_multi = & character(len=*), parameter :: flow_multi = &
'%YAML 1.1'//IO_EOL//& '%YAML 1.1'//IO_EOL//&
'---'//IO_EOL//& '---'//IO_EOL//&
'a: ["b",'//IO_EOL//& 'a: ["b",'//IO_EOL//&
'c: '//IO_EOL//& 'c: '//IO_EOL//&
'"d", "e"]'//IO_EOL '"d", "e"]'//IO_EOL
character(len=*), parameter :: flow = & character(len=*), parameter :: flow = &
'{a: ["b", {c: "d"}, "e"]}' '{a: ["b", {c: "d"}, "e"]}'