X-Git-Url: http://git.droids-corp.org/?p=protos%2Flibecoli.git;a=blobdiff_plain;f=libshell%2Flibecoli.sh;fp=libshell%2Flibecoli.sh;h=8e14a1e3d8075678168744ed0f10bf62b71533f3;hp=fdb642dcb8599059864657435e57db9c3c24304d;hb=984760622f2c8472fd2667e24bcceb543bdb1aff;hpb=ae32f7f2fd1bc44a5388e1984f7c96bc29d3fdc2 diff --git a/libshell/libecoli.sh b/libshell/libecoli.sh index fdb642d..8e14a1e 100644 --- a/libshell/libecoli.sh +++ b/libshell/libecoli.sh @@ -15,39 +15,39 @@ ec_debug() } # $1: node sequence number (ex: ec_node4) -ec_parse_get_first_child() +ec_pnode_get_first_child() { local first_child=${1}_first_child ec_echo $(eval 'ec_echo ${'$first_child'}') } # $1: node sequence number (ex: ec_node4) -ec_parse_get_next() +ec_pnode_get_next() { local next=${1}_next ec_echo $(eval 'ec_echo ${'$next'}') } # $1: node sequence number (ex: ec_node4) -ec_parse_iter_next() +ec_pnode_iter_next() { local seq=${1#ec_node} seq=$((seq+1)) local next=ec_node${seq} - if [ "$(ec_parse_get_id $next)" != "" ]; then + if [ "$(ec_pnode_get_id $next)" != "" ]; then ec_echo $next fi } # $1: node sequence number (ex: ec_node4) -ec_parse_get_id() +ec_pnode_get_id() { local id=${1}_id ec_echo $(eval 'ec_echo ${'$id'}') } # $1: node sequence number (ex: ec_node4) -ec_parse_get_strvec_len() +ec_pnode_get_strvec_len() { local strvec_len=${1}_strvec_len ec_echo $(eval 'ec_echo ${'$strvec_len'}') @@ -55,7 +55,7 @@ ec_parse_get_strvec_len() # $1: node sequence number (ex: ec_node4) # $2: index in strvec -ec_parse_get_str() +ec_pnode_get_str() { if [ $# -ne 2 ]; then return @@ -66,18 +66,18 @@ ec_parse_get_str() # $1: node sequence number (ex: ec_node4) # $2: node id (string) -ec_parse_find_first() +ec_pnode_find_first() { if [ $# -ne 2 ]; then return fi local node_seq=$1 while [ "$node_seq" != "" ]; do - local id=$(ec_parse_get_id $node_seq) + local id=$(ec_pnode_get_id $node_seq) if [ "$id" = "$2" ]; then ec_echo $node_seq return 0 fi - node_seq=$(ec_parse_iter_next $node_seq) + node_seq=$(ec_pnode_iter_next $node_seq) done }