Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 29 Oct 2008 06:22:21 +0000
changeset 34785820a499b76
parent 346 7f26c4b32651
parent 344 236b1902e5cc
child 349 2ef43a5d1e49
Merge
     1.1 --- a/tools/lemon-0.x-to-1.x.sh	Tue Oct 28 23:10:27 2008 +0100
     1.2 +++ b/tools/lemon-0.x-to-1.x.sh	Wed Oct 29 06:22:21 2008 +0000
     1.3 @@ -12,8 +12,14 @@
     1.4  do
     1.5      echo Update $i...
     1.6      TMP=`mktemp`
     1.7 -    sed -e "s/undirected graph/_gr_aph_label_/g"\
     1.8 -        -e "s/undirected edge/_ed_ge_label_/g"\
     1.9 +    sed -e "s/\<undirected graph\>/_gr_aph_label_/g"\
    1.10 +        -e "s/\<undirected graphs\>/_gr_aph_label_s/g"\
    1.11 +        -e "s/\<undirected edge\>/_ed_ge_label_/g"\
    1.12 +        -e "s/\<undirected edges\>/_ed_ge_label_s/g"\
    1.13 +        -e "s/\<directed graph\>/_digr_aph_label_/g"\
    1.14 +        -e "s/\<directed graphs\>/_digr_aph_label_s/g"\
    1.15 +        -e "s/\<directed edge\>/_ar_c_label_/g"\
    1.16 +        -e "s/\<directed edges\>/_ar_c_label_s/g"\
    1.17          -e "s/UGraph/_Gr_aph_label_/g"\
    1.18          -e "s/u[Gg]raph/_gr_aph_label_/g"\
    1.19          -e "s/\<Graph\>/_Digr_aph_label_/g"\
    1.20 @@ -44,6 +50,10 @@
    1.21          -e "s/B-[Nn]ode/_Blu_e_label_/g"\
    1.22          -e "s/a[Nn]ode/_re_d_label_/g"\
    1.23          -e "s/b[Nn]ode/_blu_e_label_/g"\
    1.24 +        -e "s/\<UGRAPH_TYPEDEFS\([ \t]*([ \t]*\)typename[ \t]/TEMPLATE__GR_APH_TY_PEDE_FS_label_\1/g"\
    1.25 +        -e "s/\<GRAPH_TYPEDEFS\([ \t]*([ \t]*\)typename[ \t]/TEMPLATE__DIGR_APH_TY_PEDE_FS_label_\1/g"\
    1.26 +        -e "s/\<UGRAPH_TYPEDEFS\>/_GR_APH_TY_PEDE_FS_label_/g"\
    1.27 +        -e "s/\<GRAPH_TYPEDEFS\>/_DIGR_APH_TY_PEDE_FS_label_/g"\
    1.28          -e "s/_Digr_aph_label_/Digraph/g"\
    1.29          -e "s/_digr_aph_label_/digraph/g"\
    1.30          -e "s/_Gr_aph_label_/Graph/g"\
    1.31 @@ -57,6 +67,8 @@
    1.32          -e "s/_Blu_e_label_/Blue/g"\
    1.33          -e "s/_re_d_label_/red/g"\
    1.34          -e "s/_blu_e_label_/blue/g"\
    1.35 +        -e "s/_GR_APH_TY_PEDE_FS_label_/GRAPH_TYPEDEFS/g"\
    1.36 +        -e "s/_DIGR_APH_TY_PEDE_FS_label_/DIGRAPH_TYPEDEFS/g"\
    1.37          -e "s/DigraphToEps/GraphToEps/g"\
    1.38          -e "s/digraphToEps/graphToEps/g"\
    1.39          -e "s/\<DefPredMap\>/SetPredMap/g"\