Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 27 Mar 2009 10:34:43 +0000
changeset 54607ed3735ce1b
parent 543 e7eb04ece02c
parent 545 b779c4dc7496
child 548 3bd0484f4cc2
Merge
     1.1 --- a/scripts/unify-sources.sh	Fri Mar 27 09:30:22 2009 +0000
     1.2 +++ b/scripts/unify-sources.sh	Fri Mar 27 10:34:43 2009 +0000
     1.3 @@ -88,7 +88,12 @@
     1.4  function check_action() {
     1.5      if [ "$3" == 'tabs' ]
     1.6      then
     1.7 -        PATTERN=$(echo -e '\t')
     1.8 +        if echo $2 | grep -q -v -E 'Makefile\.am$'
     1.9 +        then
    1.10 +            PATTERN=$(echo -e '\t')
    1.11 +        else
    1.12 +            PATTERN='        '
    1.13 +        fi
    1.14      elif [ "$3" == 'trailing spaces' ]
    1.15      then
    1.16          PATTERN='\ +$'
     2.1 --- a/tools/lemon-0.x-to-1.x.sh	Fri Mar 27 09:30:22 2009 +0000
     2.2 +++ b/tools/lemon-0.x-to-1.x.sh	Fri Mar 27 10:34:43 2009 +0000
     2.3 @@ -22,26 +22,25 @@
     2.4          -e "s/\<directed edges\>/_ar_c_label_s/g"\
     2.5          -e "s/UGraph/_Gr_aph_label_/g"\
     2.6          -e "s/u[Gg]raph/_gr_aph_label_/g"\
     2.7 -        -e "s/\<Graph\>/_Digr_aph_label_/g"\
     2.8 +        -e "s/Graph\>/_Digr_aph_label_/g"\
     2.9          -e "s/\<graph\>/_digr_aph_label_/g"\
    2.10 -        -e "s/\<Graphs\>/_Digr_aph_label_s/g"\
    2.11 +        -e "s/Graphs\>/_Digr_aph_label_s/g"\
    2.12          -e "s/\<graphs\>/_digr_aph_label_s/g"\
    2.13 -        -e "s/_Graph/__Gr_aph_label_/g"\
    2.14 -        -e "s/\([Gg]\)raph\([a-z_]\)/_\1r_aph_label_\2/g"\
    2.15 +        -e "s/\([Gg]\)raph\([a-z]\)/_\1r_aph_label_\2/g"\
    2.16          -e "s/\([a-z_]\)graph/\1_gr_aph_label_/g"\
    2.17          -e "s/Graph/_Digr_aph_label_/g"\
    2.18          -e "s/graph/_digr_aph_label_/g"\
    2.19          -e "s/UEdge/_Ed_ge_label_/g"\
    2.20          -e "s/u[Ee]dge/_ed_ge_label_/g"\
    2.21          -e "s/IncEdgeIt/_In_cEd_geIt_label_/g"\
    2.22 -        -e "s/\<Edge\>/_Ar_c_label_/g"\
    2.23 +        -e "s/Edge\>/_Ar_c_label_/g"\
    2.24          -e "s/\<edge\>/_ar_c_label_/g"\
    2.25 -        -e "s/\<Edges\>/_Ar_c_label_s/g"\
    2.26 +        -e "s/_edge\>/_ar_c_label_/g"\
    2.27 +        -e "s/Edges\>/_Ar_c_label_s/g"\
    2.28          -e "s/\<edges\>/_ar_c_label_s/g"\
    2.29 -        -e "s/_Edge/__Ed_ge_label_/g"\
    2.30 -        -e "s/Edge\([a-z_]\)/_Ed_ge_label_\1/g"\
    2.31 -        -e "s/edge\([a-z_]\)/_ed_ge_label_\1/g"\
    2.32 -        -e "s/\([a-z_]\)edge/\1_ed_ge_label_/g"\
    2.33 +        -e "s/_edges\>/_ar_c_label_s/g"\
    2.34 +        -e "s/\([Ee]\)dge\([a-z]\)/_\1d_ge_label_\2/g"\
    2.35 +        -e "s/\([a-z]\)edge/\1_ed_ge_label_/g"\
    2.36          -e "s/Edge/_Ar_c_label_/g"\
    2.37          -e "s/edge/_ar_c_label_/g"\
    2.38          -e "s/A[Nn]ode/_Re_d_label_/g"\
    2.39 @@ -116,6 +115,11 @@
    2.40          -e "s/\<arcSubGraphAdaptor\>/filterEdges/g"\
    2.41          -e "s/\<DirGraphAdaptor\>/Orienter/g"\
    2.42          -e "s/\<dirGraphAdaptor\>/orienter/g"\
    2.43 +        -e "s/\<LpCplex\>/CplexLp/g"\
    2.44 +        -e "s/\<MipCplex\>/CplexMip/g"\
    2.45 +        -e "s/\<LpGlpk\>/GlpkLp/g"\
    2.46 +        -e "s/\<MipGlpk\>/GlpkMip/g"\
    2.47 +        -e "s/\<LpSoplex\>/SoplexLp/g"\
    2.48      <$i > $TMP
    2.49      mv $TMP $i
    2.50  done