diff --git a/lemon/bfs.h b/lemon/bfs.h --- a/lemon/bfs.h +++ b/lemon/bfs.h @@ -51,7 +51,7 @@ typedef typename Digraph::template NodeMap PredMap; ///Instantiates a PredMap. - ///This function instantiates a PredMap. + ///This function instantiates a PredMap. ///\param g is the digraph, to which we would like to define the ///PredMap. static PredMap *createPredMap(const Digraph &g) @@ -80,8 +80,7 @@ ///The type of the map that indicates which nodes are reached. - ///The type of the map that indicates which nodes are reached. - ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. + ///The type of the map that indicates which nodes are reached.///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. typedef typename Digraph::template NodeMap ReachedMap; ///Instantiates a ReachedMap. diff --git a/lemon/list_graph.h b/lemon/list_graph.h --- a/lemon/list_graph.h +++ b/lemon/list_graph.h @@ -840,8 +840,8 @@ explicit Arc(int pid) { id = pid;} public: - operator Edge() const { - return id != -1 ? edgeFromId(id / 2) : INVALID; + operator Edge() const { + return id != -1 ? edgeFromId(id / 2) : INVALID; } Arc() {} diff --git a/lemon/smart_graph.h b/lemon/smart_graph.h --- a/lemon/smart_graph.h +++ b/lemon/smart_graph.h @@ -464,8 +464,8 @@ explicit Arc(int id) { _id = id;} public: - operator Edge() const { - return _id != -1 ? edgeFromId(_id / 2) : INVALID; + operator Edge() const { + return _id != -1 ? edgeFromId(_id / 2) : INVALID; } Arc() {} diff --git a/scripts/unify-sources.sh b/scripts/unify-sources.sh --- a/scripts/unify-sources.sh +++ b/scripts/unify-sources.sh @@ -88,13 +88,24 @@ function check_action() { if ! diff -q $1 $2 >/dev/null then - echo -n " [$3 failed]" + echo + echo -n " $3 failed at line(s): " + echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | + sed "s/,/-/g" | paste -s -d',') FAILED=YES fi } function check_warning() { - echo -n " [$2 warning]" + echo + if [ "$2" == 'long lines' ] + then + echo -n " $2 warning at line(s): " + echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | + cut -f 1 | paste -s -d',') + else + echo -n " $2 warning" + fi WARNED=YES }