Print the failed line numbers in the unifier script (ticket #138)
authorPeter Kovacs <kpeter@inf.elte.hu>
Mon, 20 Oct 2008 12:46:39 +0200
changeset 341d900fd1e760f
parent 340 cdbff91c2166
child 343 2f5c0c42a5cd
Print the failed line numbers in the unifier script (ticket #138)
lemon/bfs.h
lemon/list_graph.h
lemon/smart_graph.h
scripts/unify-sources.sh
     1.1 --- a/lemon/bfs.h	Mon Oct 20 12:17:24 2008 +0200
     1.2 +++ b/lemon/bfs.h	Mon Oct 20 12:46:39 2008 +0200
     1.3 @@ -51,7 +51,7 @@
     1.4      typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap;
     1.5      ///Instantiates a PredMap.
     1.6  
     1.7 -    ///This function instantiates a PredMap.
     1.8 +    ///This function instantiates a PredMap.  
     1.9      ///\param g is the digraph, to which we would like to define the
    1.10      ///PredMap.
    1.11      static PredMap *createPredMap(const Digraph &g)
    1.12 @@ -80,8 +80,7 @@
    1.13  
    1.14      ///The type of the map that indicates which nodes are reached.
    1.15  
    1.16 -    ///The type of the map that indicates which nodes are reached.
    1.17 -    ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
    1.18 +    ///The type of the map that indicates which nodes are reached.///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
    1.19      typedef typename Digraph::template NodeMap<bool> ReachedMap;
    1.20      ///Instantiates a ReachedMap.
    1.21  
     2.1 --- a/lemon/list_graph.h	Mon Oct 20 12:17:24 2008 +0200
     2.2 +++ b/lemon/list_graph.h	Mon Oct 20 12:46:39 2008 +0200
     2.3 @@ -840,8 +840,8 @@
     2.4        explicit Arc(int pid) { id = pid;}
     2.5  
     2.6      public:
     2.7 -      operator Edge() const { 
     2.8 -        return id != -1 ? edgeFromId(id / 2) : INVALID; 
     2.9 +      operator Edge() const {
    2.10 +        return id != -1 ? edgeFromId(id / 2) : INVALID;
    2.11        }
    2.12  
    2.13        Arc() {}
     3.1 --- a/lemon/smart_graph.h	Mon Oct 20 12:17:24 2008 +0200
     3.2 +++ b/lemon/smart_graph.h	Mon Oct 20 12:46:39 2008 +0200
     3.3 @@ -464,8 +464,8 @@
     3.4        explicit Arc(int id) { _id = id;}
     3.5  
     3.6      public:
     3.7 -      operator Edge() const { 
     3.8 -        return _id != -1 ? edgeFromId(_id / 2) : INVALID; 
     3.9 +      operator Edge() const {
    3.10 +        return _id != -1 ? edgeFromId(_id / 2) : INVALID;
    3.11        }
    3.12  
    3.13        Arc() {}
     4.1 --- a/scripts/unify-sources.sh	Mon Oct 20 12:17:24 2008 +0200
     4.2 +++ b/scripts/unify-sources.sh	Mon Oct 20 12:46:39 2008 +0200
     4.3 @@ -88,13 +88,24 @@
     4.4  function check_action() {
     4.5      if ! diff -q $1 $2 >/dev/null
     4.6      then
     4.7 -	echo -n " [$3 failed]"
     4.8 +	echo
     4.9 +	echo -n "      $3 failed at line(s): "
    4.10 +	echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | 
    4.11 +	          sed "s/,/-/g" | paste -s -d',')
    4.12  	FAILED=YES
    4.13      fi
    4.14  }
    4.15  
    4.16  function check_warning() {
    4.17 -    echo -n " [$2 warning]"
    4.18 +    echo
    4.19 +    if [ "$2" == 'long lines' ]
    4.20 +    then
    4.21 +        echo -n "      $2 warning at line(s): "
    4.22 +        echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | 
    4.23 +                  cut -f 1 | paste -s -d',')
    4.24 +    else
    4.25 +        echo -n "      $2 warning"
    4.26 +    fi
    4.27      WARNED=YES
    4.28  }
    4.29