September 2008 - Olena-patches

2292: Update line graph psite.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/core/image/line_graph_psite.hh (mln::line_graph_psite): Inherit from mln::internal::pseudo_site_base_. (mln::line_graph_psite::line_graph_psite): Adjust ctors. (mln::line_graph_psite::first) (mln::line_graph_psite::second) (mln::line_graph_psite::first_id) (mln::line_graph_psite::second_id): Adjust methods. (operator==(const line_graph_psite&, const line_graph_psite&)) (operator< (const line_graph_psite&, const line_graph_psite&)): Adjust operators. (mln::line_graph_psite::super_): Adjust. (mln::line_graph_psite::target): New typedef. (mln::line_graph_psite::dim) (mln::line_graph_psite::coord) (mln::line_graph_psite::point) (mln::line_graph_psite::dpoint) (mln::line_graph_psite::mesh): Remove typedefs. (mln::line_graph_psite::line_graph_psite(const self_&)) (mln::line_graph_psite::self_& operator=) (mln::line_graph_psite::to_psite) (mln::line_graph_psite::to_point) (mln::line_graph_psite::operator point) (mln::line_graph_psite::operator[]) (mln::line_graph_psite::plg): Remove methods. (mln::line_graph_psite::invalidate) (mln::line_graph_psite::site_set) (mln::line_graph_psite::target_) (mln::line_graph_psite::change_target) (mln::line_graph_psite::subj_) (mln::line_graph_psite::update_) (mln::line_graph_psite::change_edge_id) (mln::line_graph_psite::inc_edge_id) (mln::line_graph_psite::dec_edge_id): New methods. (mln::line_graph_psite::id): Rename as... (mln::line_graph_psite::edge_id): ...this. (mln::line_graph_psite::plg_): Change type to `const target*'. (mln::line_graph_psite::p_): Change type to site_pair. (operator!=(const line_graph_psite&, const line_graph_psite&)): New operator. --- milena/ChangeLog | 50 ++++++ milena/mln/core/image/line_graph_psite.hh | 263 ++++++++++++++++++----------- 2 files changed, 212 insertions(+), 101 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7d3f79a..ae13b3c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,55 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update line graph psite. + + * mln/core/image/line_graph_psite.hh + (mln::line_graph_psite): Inherit from + mln::internal::pseudo_site_base_. + (mln::line_graph_psite::line_graph_psite): + Adjust ctors. + (mln::line_graph_psite::first) + (mln::line_graph_psite::second) + (mln::line_graph_psite::first_id) + (mln::line_graph_psite::second_id): + Adjust methods. + (operator==(const line_graph_psite&, const line_graph_psite&)) + (operator< (const line_graph_psite&, const line_graph_psite&)): + Adjust operators. + (mln::line_graph_psite::super_): Adjust. + (mln::line_graph_psite::target): New typedef. + (mln::line_graph_psite::dim) + (mln::line_graph_psite::coord) + (mln::line_graph_psite::point) + (mln::line_graph_psite::dpoint) + (mln::line_graph_psite::mesh): + Remove typedefs. + (mln::line_graph_psite::line_graph_psite(const self_&)) + (mln::line_graph_psite::self_& operator=) + (mln::line_graph_psite::to_psite) + (mln::line_graph_psite::to_point) + (mln::line_graph_psite::operator point) + (mln::line_graph_psite::operator[]) + (mln::line_graph_psite::plg): + Remove methods. + (mln::line_graph_psite::invalidate) + (mln::line_graph_psite::site_set) + (mln::line_graph_psite::target_) + (mln::line_graph_psite::change_target) + (mln::line_graph_psite::subj_) + (mln::line_graph_psite::update_) + (mln::line_graph_psite::change_edge_id) + (mln::line_graph_psite::inc_edge_id) + (mln::line_graph_psite::dec_edge_id): + New methods. + (mln::line_graph_psite::id): Rename as... + (mln::line_graph_psite::edge_id): ...this. + (mln::line_graph_psite::plg_): Change type to `const target*'. + (mln::line_graph_psite::p_): Change type to site_pair. + (operator!=(const line_graph_psite&, const line_graph_psite&)): + New operator. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Create an util::ordpair_-based container usable as a site. * mln/util/site_pair.hh: New. diff --git a/milena/mln/core/image/line_graph_psite.hh b/milena/mln/core/image/line_graph_psite.hh index 8d65963..c3f51af 100644 --- a/milena/mln/core/image/line_graph_psite.hh +++ b/milena/mln/core/image/line_graph_psite.hh @@ -31,6 +31,9 @@ /// \file mln/core/image/line_graph_psite.hh /// \brief Definition of a line graph-based point site. +# include <mln/core/internal/pseudo_site_base.hh> + +# include <mln/util/site_pair.hh> # include <mln/core/site_set/p_line_graph.hh> /* FIXME: This class shares a lot with graph_psite. Factor as much as @@ -42,76 +45,102 @@ namespace mln // Fwd decl. template <typename P> class p_line_graph; + template <typename P> class line_graph_psite; + // FIXME: Rename as line_graph_psite as p_line_graph_psite. - /// \brief Point site associated to a mln::graph_image. + /// \brief Point site associated to a mln::line_graph_image. + /// + /// \arg \p P The type of the site. template <typename P> - class line_graph_psite : public Point_Site< line_graph_psite > + class line_graph_psite + : public internal::pseudo_site_base_< const site_pair&, + line_graph_psite > { typedef line_graph_psite self_; - typedef Point_Site<self_> super_; + typedef internal::pseudo_site_base_< P, self_ > super_; public: - typedef P point; - // FIXME: Dummy. - typedef void mesh; - enum { dim = point::dim }; - // FIXME: Dummy. - typedef void dpoint; - typedef mln_coord(point) coord; + // This associated type is important to know that this particular + // pseudo site knows the site set it refers to. + typedef p_line_graph target; /// Construction and assignment. /// \{ line_graph_psite(); line_graph_psite(const p_line_graph& plg, util::edge_id id); - line_graph_psite(const self_& rhs); - self_& operator= (const self_& rhs); /// \} - /// Access to psite. - const self_& to_psite() const; + /// Psite manipulators. + /// \{ + /// Is this psite valid? + bool is_valid() const; + /// Invalidate this psite. + void invalidate(); + /// \} + + /// Site set manipulators. + /// \{ + /// \brief Get the site set (shortcut for *target()). + /// \pre Member plg_ is non null. + const target& site_set() const; + + /// Get a pointer to the target site_set. + const target* target_() const; + /// Set the target site_set. + void change_target(const target& new_target); + /// \} - /// Access to point. + /// Proxy manipulators. /// \{ - const point& to_point() const; - operator point() const; - coord operator[](unsigned id) const; + /// Return the site corresponding to this psite. + const site_pair& subj_(); /// \} - /// Return the mln::p_line_graph this point site belongs to. - const p_line_graph& plg() const; + /// Edge id manipulators. + //// \{ /// Return the edge id of this point site. - util::edge_id id() const; + util::edge_id edge_id() const; + /// Set the edge id of this point site. + void change_edge_id(const util::edge_id& id); + /// Increment the edge id of this point site. + void inc_edge_id(); + /// Increment the edge id of this point site. + void dec_edge_id(); + /// \} + /// Accessors. + /// \{ /// Return the first associated vertex. P first() const; /// Return the second associated vertex. P second() const; /// Return the id of the first associated vertex. + // FIXME: Rename as first_vertex_id. util::vertex_id first_id() const; /// Return the id of the second associated vertex. + // FIXME: Rename as second_vertex_id. util::vertex_id second_id() const; + /// \} - /// Is this psite valid? - bool is_valid() const; + private: + /// Site-related members. + /// \{ + /// Update the site corresponding to this psite. + void update_(); + // The site corresponding to this psite. + site_pair p_; + /// \} private: + /// Graph-related members. + /// \{ /// The p_line_graph this point site belongs to. - const p_line_graph* plg_; + const target* plg_; /// The id of the edge this psite is pointing towards. util::edge_id id_; - /** \brief The point associated to this psite. - - Contrary to mln::graph_psite, this information is actually - stored in the mln::line_graph_psite. In mln::graph_psite, the - point is retrieved from the data associated with the - corresponding vertex in the graph. We cannot do this here, - since points associated to edges are computed on the fly - (storing them in the graph could be possible, but too costly - in space). */ - // FIXME: Actually, this is a dummy value! - point p_; + /// \} }; @@ -128,6 +157,14 @@ namespace mln bool operator==(const line_graph_psite& lhs, const line_graph_psite& rhs); + /// \brief Is \a lhs not equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::p_line_graph. + template <typename P> + bool + operator!=(const line_graph_psite& lhs, const line_graph_psite& rhs); + /// \brief Is \a lhs ``less'' than \a rhs? /// /// This comparison is required by algorithms sorting psites. @@ -140,31 +177,19 @@ namespace mln /// \} - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ template <typename P> inline std::ostream& operator<<(std::ostream& ostr, const line_graph_psite& p); -# ifndef MLN_INCLUDE_ONLY - /* Careful, the current interface of line_graph_psite allows the - construction of ill-formed psites (i.e., whose edge is is beyond - bounds). Actually, p_line_graph_piters *do* create ill-formed - psites at their initialization. */ +# ifndef MLN_INCLUDE_ONLY template <typename P> inline line_graph_psite::line_graph_psite() - // Dummy initializations. - : super_(), - plg_(0), - id_(-1), - p_() + : plg_(0) { } @@ -172,94 +197,109 @@ namespace mln inline line_graph_psite::line_graph_psite(const p_line_graph& plg, util::edge_id id) - : super_(), - plg_(&plg), - id_(id), - p_() + : plg_(&plg), + id_(id) { + update_(); } template <typename P> inline - line_graph_psite::line_graph_psite(const line_graph_psite& rhs) - : super_(rhs), - plg_(rhs.plg_), - id_(rhs.id_), - p_() + const p_line_graph& + line_graph_psite::site_set() const { + mln_precondition(plg_); + return *plg_; } template <typename P> inline - line_graph_psite& - line_graph_psite::operator=(const line_graph_psite& rhs) + const p_line_graph* + line_graph_psite::target_() const { - if (&rhs == this) - return *this; - plg_ = rhs.plg_; - id_ = rhs.id_; - return *this; + return plg_; } template <typename P> inline - bool - line_graph_psite::is_valid() const + void + line_graph_psite::change_target(const p_line_graph& new_target) { - return plg_ && id_ < plg_->gr_->nedges(); + plg_ = & new_target; + invalidate(); } template <typename P> inline - const line_graph_psite& - line_graph_psite::to_psite() const + const site_pair& + line_graph_psite::subj_() { - return *this; + // FIXME: p_ is not properly updated yet; we shouldn't call this + // method yet. + abort(); + return p_; } + template <typename P> inline - const P& - line_graph_psite::to_point() const + bool + line_graph_psite::is_valid() const { - // Dummy value. - abort(); - return p_; + /* FIXME: Instead of `plg_->gr_->nedges()', we should have + something like `run_->has_edge_id(id_)' (see the implementation of + p_run_psite. */ + return plg_ && id_ < plg_->gr_->nedges(); } template <typename P> inline - line_graph_psite::operator P() const + void + line_graph_psite::invalidate() { - // Dummy value. - abort(); - return p_; + /* FIXME: Instead of `plg_->gr_->nedges()', we should have + something like `run_->has_edge_id(id_)' (see the implementation of + p_run_psite. */ + id_ = plg_->gr_->nedges(); } + template <typename P> inline - mln_coord(P) - line_graph_psite::operator[](unsigned i) const + util::edge_id + line_graph_psite::edge_id() const { - mln_assertion(is_valid()); - return to_point()[i]; + return id_; } template <typename P> inline - const p_line_graph& - line_graph_psite::plg() const + void + line_graph_psite::change_edge_id(const util::edge_id& id) { - mln_assertion(plg_); - return *plg_; + id_ = id; + if (is_valid()) + update_(); } template <typename P> inline - util::edge_id - line_graph_psite::id() const + void + line_graph_psite::inc_edge_id() { - return id_; + ++id_.to_equiv(); + if (is_valid()) + update_(); + } + + template <typename P> + inline + void + line_graph_psite::dec_edge_id() + { + --id_.to_equiv(); + if (is_valid()) + update_(); } template <typename P> @@ -268,7 +308,8 @@ namespace mln line_graph_psite::first() const { mln_assertion(is_valid()); - return plg().gr_->vertex_data(first_id()); + // FIXME: Too low-level. + return plg_->gr_->vertex_data(first_id()); } template <typename P> @@ -277,17 +318,18 @@ namespace mln line_graph_psite::second() const { mln_assertion(is_valid()); - return plg().gr_->vertex_data(second_id()); + // FIXME: Too low-level. + return plg_->gr_->vertex_data(second_id()); } - template <typename P> inline util::vertex_id line_graph_psite::first_id() const { mln_assertion(is_valid()); - return plg().gr_->edge(id_).v1(); + // FIXME: Too low-level. + return plg_->gr_->edge(id_).v1(); } template <typename P> @@ -296,7 +338,19 @@ namespace mln line_graph_psite::second_id() const { mln_assertion(is_valid()); - return plg().gr_->edge(id_).v2(); + // FIXME: Too low-level. + return plg_->gr_->edge(id_).v2(); + } + + + template <typename P> + inline + void + line_graph_psite::update_() + { + mln_assertion(is_valid()); + p_.pair_.first = first(); + p_.pair_.second = second(); } @@ -308,16 +362,24 @@ namespace mln bool operator==(const line_graph_psite& lhs, const line_graph_psite& rhs) { - mln_assertion(&lhs.plg() == &rhs.plg()); - return lhs.id() == rhs.id(); + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.edge_id() == rhs.edge_id(); + } + + template <typename P> + bool + operator!=(const line_graph_psite& lhs, const line_graph_psite& rhs) + { + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.edge_id() != rhs.edge_id(); } template <typename P> bool operator< (const line_graph_psite& lhs, const line_graph_psite& rhs) { - mln_assertion(&lhs.plg() == &rhs.plg()); - return lhs.id() < rhs.id(); + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.edge_id() < rhs.edge_id(); } @@ -335,7 +397,6 @@ namespace mln # endif // ! MLN_INCLUDE_ONLY - } // end of mln #endif // MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH -- 1.6.0.1

1 0

2291: Create an util::ordpair_-based container usable as a site.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/util/site_pair.hh: New. --- milena/ChangeLog | 6 +++ milena/mln/util/site_pair.hh | 100 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) create mode 100644 milena/mln/util/site_pair.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 2a8833e..7d3f79a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Create an util::ordpair_-based container usable as a site. + + * mln/util/site_pair.hh: New. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update util::ordpair_. * mln/util/ordpair.hh diff --git a/milena/mln/util/site_pair.hh b/milena/mln/util/site_pair.hh new file mode 100644 index 0000000..76ab3ab --- /dev/null +++ b/milena/mln/util/site_pair.hh @@ -0,0 +1,100 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_UTIL_SITE_PAIR_HH +# define MLN_UTIL_SITE_PAIR_HH + +# include <mln/util/ordpair.hh> + +/// \file mln/util/site_pair.hh +/// \brief Definition of a site pair type. + +namespace mln +{ + /* FIXME: The class mln::internal::image_base requires its site + types to have a `coord' typedef, but util::ordpair_ has none. + Hence this small workaround. Remove as soon as image_base is + refurbished. */ + template <typename P> + struct site_pair : public mln::Object< site_pair > + { + site_pair(); + site_pair(const P& first, const P& second); + typedef mln_coord(P) coord; + util::ordpair_ pair_; + }; + + /* FIXME: The proxy mechanism requires these operators; why? It + seems its static assertions do not check the right guy. IMHO + (Roland's), it should look for line_graph_psite's operators, + not site_pair's. */ + template <typename P> + bool operator==(const site_pair& lhs, const site_pair& rhs); + + template <typename P> + bool operator< (const site_pair& lhs, const site_pair& rhs); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + site_pair::site_pair() + : pair_(P(), P()) + { + } + + template <typename P> + site_pair::site_pair(const P& first, const P& second) + : pair_(first, second) + { + } + + template <typename P> + inline + bool + operator==(const site_pair& lhs, const site_pair& rhs) + { + abort(); + return lhs.pair_ == rhs.pair_; + } + + template <typename P> + inline + bool + operator< (const site_pair& lhs, const site_pair& rhs) + { + abort(); + return lhs.pair_ < rhs.pair_; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_UTIL_SITE_PAIR_HH -- 1.6.0.1

1 0

2290: Update util::ordpair_.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/util/ordpair.hh (mln::util::ordpair_<T>::ordpair_) (operator< (const ordpair_<T>&, const ordpair_<T>&)) (operator<=(const ordpair_<T>&, const ordpair_<T>&)): Replace the use of operator < (resp. operator <=) by util::ord_strict (reps. util::ord_weak). --- milena/ChangeLog | 11 +++++++++++ milena/mln/util/ordpair.hh | 25 ++++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e4d7a70..2a8833e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update util::ordpair_. + + * mln/util/ordpair.hh + (mln::util::ordpair_<T>::ordpair_) + (operator< (const ordpair_<T>&, const ordpair_<T>&)) + (operator<=(const ordpair_<T>&, const ordpair_<T>&)): + Replace the use of operator < (resp. operator <=) by + util::ord_strict (reps. util::ord_weak). + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update util::gen_id. * mln/util/internal/graph_base.hh (mln::util::gen_id<Tag, Equiv>): diff --git a/milena/mln/util/ordpair.hh b/milena/mln/util/ordpair.hh index 9da142f..3798c80 100644 --- a/milena/mln/util/ordpair.hh +++ b/milena/mln/util/ordpair.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -34,6 +34,7 @@ */ # include <mln/core/concept/object.hh> +# include <mln/util/ord.hh> namespace mln @@ -48,6 +49,7 @@ namespace mln * ordering. * */ + // FIXME: Rename as ordpair. template <typename T> struct ordpair_ : public mln::Object< ordpair_<T> > { @@ -71,6 +73,7 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const ordpair_<T>& op); + // FIXME: Rename as make::ordpair. /// Routine to construct a ordpair on the fly. template <typename T> ordpair_<T> ordpair(const T& t1, const T& t2); @@ -82,17 +85,17 @@ namespace mln inline ordpair_<T>::ordpair_(const T& t1, const T& t2) { - if (t1 > t2) + if (util::ord_strict(t1, t2)) { - first = t2; - second = t1; + first = t1; + second = t2; } else { - first = t1; - second = t2; + first = t2; + second = t1; } - mln_postcondition(first <= second); + mln_postcondition(util::ord_weak(first, second)); } template <typename T> @@ -107,8 +110,8 @@ namespace mln bool operator< (const ordpair_<T>& lhs, const ordpair_<T>& rhs) { return - lhs.first < rhs.first || - (lhs.first == rhs.first && lhs.second < rhs.second); + util::ord_strict(lhs.first, rhs.first) || + (lhs.first == rhs.first && util::ord_strict(lhs.second, rhs.second)); } template <typename T> @@ -116,8 +119,8 @@ namespace mln bool operator<=(const ordpair_<T>& lhs, const ordpair_<T>& rhs) { return - lhs.first < rhs.first || - (lhs.first == rhs.first && lhs.second <= rhs.second); + util::ord_strict(lhs.first, rhs.first) || + (lhs.first == rhs.first && util::ord_weak(lhs.second, rhs.second)); } -- 1.6.0.1

1 0

2289: Update util::gen_id.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/util/internal/graph_base.hh (mln::util::gen_id<Tag, Equiv>): Inherit from Object< gen_id < Tag, Equiv > >. --- milena/ChangeLog | 7 +++++++ milena/mln/util/internal/graph_base.hh | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8cc0b25..e4d7a70 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update util::gen_id. + + * mln/util/internal/graph_base.hh (mln::util::gen_id<Tag, Equiv>): + Inherit from Object< gen_id < Tag, Equiv > >. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/contract.hh (HAS_NDEBUG): New preprocessor constant. [NDEBUG]: Expand as 1. [!NDEBUG]: Expand as 0. diff --git a/milena/mln/util/internal/graph_base.hh b/milena/mln/util/internal/graph_base.hh index fcb2ab8..97dd054 100644 --- a/milena/mln/util/internal/graph_base.hh +++ b/milena/mln/util/internal/graph_base.hh @@ -59,11 +59,13 @@ namespace mln /// /// https://svn.lrde.epita.fr/svn/vaucanson/trunk/include/vaucanson/automata/co… /// https://svn.lrde.epita.fr/svn/vaucanson/trunk/include/vaucanson/automata/co… - // - // \todo We /might/ want to integrate this into Milena's value system. + /// + /// \todo We /might/ want to integrate this into Milena's value system. + /// + /// \todo Move this class elsewhere? template <typename Tag, typename Equiv> - class gen_id + class gen_id : public Object< gen_id < Tag, Equiv > > { typedef gen_id<Tag, Equiv> self_t; -- 1.6.0.1

1 0

2288: * mln/core/contract.hh (HAS_NDEBUG): New preprocessor constant. [NDEBUG]: Expand as 1. [!NDEBUG]: Expand as 0.
by Roland Levillain 17 Sep '08

17 Sep '08

--- milena/ChangeLog | 6 ++++++ milena/mln/core/contract.hh | 9 +++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4fe4859..8cc0b25 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/core/contract.hh (HAS_NDEBUG): New preprocessor constant. + [NDEBUG]: Expand as 1. + [!NDEBUG]: Expand as 0. + 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add extension::fill routine and test. diff --git a/milena/mln/core/contract.hh b/milena/mln/core/contract.hh index c7d68da..e7a1a3b 100644 --- a/milena/mln/core/contract.hh +++ b/milena/mln/core/contract.hh @@ -35,6 +35,15 @@ # include <cassert> +// Define a preprocessor constant HAS_NDEBUG reflecting the existence +// of NDEBUG, as avised by the section Conditional Compilation of the +// GNU Coding Standards +// (http://www.gnu.org/prep/standards/html_node/Conditional-Compilation.html) +#ifdef NDEBUG +#define HAS_NDEBUG 1 +#else +#define HAS_NDEBUG 0 +#endif /// Assertion. # define mln_assertion(expr) assert(expr) -- 1.6.0.1

1 0

scool r88: Update the pretty printer regarding C++ AST changements
by Maxime van Noppen 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-17 Maxime van Noppen <yabo(a)lrde.epita.fr> Update the pretty printer regarding C++ AST changements * CxxDecl.str, * CxxExp.str: Replace CxxAffect by CxxAssign. * CxxId.str: Use the CxxId constructor. * CxxType.str: Update CxxFun constructor signature. CxxDecl.str | 2 +- CxxExp.str | 4 ++-- CxxId.str | 3 +++ CxxType.str | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxId.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxId.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxId.str (revision 88) @@ -9,4 +9,7 @@ where <is-string> x CxxIdToAbox: + CxxId(idf) -> S(idf) + + CxxIdToAbox: x -> <CxxTypeToAbox> x Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 88) @@ -23,10 +23,10 @@ CxxKeyword(idf, exp) -> <concat-strings> [idf, " ", <CxxExpToStr> exp] CxxExpToStr: - CxxAffect(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] + CxxAssign(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] CxxExpToStr: - CxxFunCall(idf, args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] + CxxFunCall([], idf, args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] CxxExpToStr: CxxProgram(exp) -> exp Index: branches/scool-ng/src/pp-cxx/CxxDecl.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxDecl.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxDecl.str (revision 88) @@ -18,7 +18,7 @@ // Declare a pointer on method : base_type (class::*idf)(); CxxTopLevelToAbox: - CxxAffect(CxxDecl(base_type, class, idf, args), exp) -> + CxxAssign(CxxDecl(base_type, class, idf, args), exp) -> H hs=0 [ H hs=1 [ ~<CxxTypeToAbox> base_type Index: branches/scool-ng/src/pp-cxx/CxxType.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxType.str (revision 87) +++ branches/scool-ng/src/pp-cxx/CxxType.str (revision 88) @@ -23,7 +23,7 @@ Typename -> S("typename") CxxTypeToAbox: - CxxFunCall(idf, args) -> H hs=0 [ ~<CxxIdToAbox>idf "(" H hs=1 [ ~*<CxxListToAbox(CxxTypeToAbox <+ CxxExpToAbox|",")>args ] ")"] + CxxFunCall([], idf, args) -> H hs=0 [ ~<CxxIdToAbox>idf "(" H hs=1 [ ~*<CxxListToAbox(CxxTypeToAbox <+ CxxExpToAbox|",")>args ] ")"] CxxTypeToAbox: CxxScope(idf1, idf2) -> H hs=0 [ ~<CxxTypeToAbox> idf1 "::" ~<CxxIdToAbox> idf2 ] -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r87: Add reference files for tests on functions and variables
by Maxime van Noppen 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-17 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on functions and variables * check.sh: Evaluate properly the test command. * config: Add a new test suite. * function/c++_src/declaration_001.cc: New. * function/c++_src/declaration_002.cc: New. * function/c++_src/declaration_003.cc: New. * function/c++_src/declaration_004.cc: New. * function/c++_src/declaration_005.cc: New. * function/c++_src/declaration_006.cc: New. * function/c++_src/declaration_007.cc: New. * function/c++_src/declaration_008.cc: New. * function/c++_src/definition_001.cc: New. * function/c++_src/definition_002.cc: New. * function/c++_src/definition_003.cc: New. * variable/c++_src/declaration_001.cc: New. * variable/c++_src/declaration_002.cc: New. * variable/c++_src/declaration_003.cc: New. * variable/c++_src/declaration_004.cc: New. * variable/c++_src/declaration_007.cc: New. check.sh | 2 +- config | 18 +++++++++++++++++- function/c++_src/declaration_001.cc | 1 + function/c++_src/declaration_002.cc | 1 + function/c++_src/declaration_003.cc | 1 + function/c++_src/declaration_004.cc | 3 +++ function/c++_src/declaration_005.cc | 2 ++ function/c++_src/declaration_006.cc | 2 ++ function/c++_src/declaration_007.cc | 2 ++ function/c++_src/declaration_008.cc | 2 ++ function/c++_src/definition_001.cc | 3 +++ function/c++_src/definition_002.cc | 4 ++++ function/c++_src/definition_003.cc | 4 ++++ variable/c++_src/declaration_001.cc | 1 + variable/c++_src/declaration_002.cc | 1 + variable/c++_src/declaration_003.cc | 1 + variable/c++_src/declaration_004.cc | 1 + variable/c++_src/declaration_007.cc | 1 + 18 files changed, 48 insertions(+), 2 deletions(-) Index: branches/scool-ng/tests/config =================================================================== --- branches/scool-ng/tests/config (revision 86) +++ branches/scool-ng/tests/config (revision 87) @@ -1,4 +1,4 @@ -number_of_tests=2 +number_of_tests=3 test_1 () { @@ -29,3 +29,19 @@ ref_dir="c++_ast" ref_extension=".aterm" } + +test_3 () +{ + desc="C++ pretty printer" + cmd='../../src/pp-cxx/pp-cxx -i $input_file | abox2text' + cmp='diff -EwbB -u $ref $output' + print_input_cmd='pp-aterm -i $input_file' + print_output_cmd='cat $input_file' + + input_files="c++_ast/*.aterm" + input_extension=".aterm" + + ref_dir="c++_src" + ref_extension=".cc" +} + Index: branches/scool-ng/tests/function/c++_src/declaration_007.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_007.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_007.cc (revision 87) @@ -0,0 +1,2 @@ +template < typename T, typename S > +void foo(const T& a, const S& b); Index: branches/scool-ng/tests/function/c++_src/declaration_008.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_008.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_008.cc (revision 87) @@ -0,0 +1,2 @@ +template < bool B > +void foo(); Index: branches/scool-ng/tests/function/c++_src/declaration_001.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_001.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_001.cc (revision 87) @@ -0,0 +1 @@ +void foo(); Index: branches/scool-ng/tests/function/c++_src/declaration_002.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_002.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_002.cc (revision 87) @@ -0,0 +1 @@ +void foo(int a); Index: branches/scool-ng/tests/function/c++_src/declaration_003.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_003.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_003.cc (revision 87) @@ -0,0 +1 @@ +void foo(int a, const bar& b); Index: branches/scool-ng/tests/function/c++_src/declaration_004.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_004.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_004.cc (revision 87) @@ -0,0 +1,3 @@ +void foo(); +float foo(int arg1); +char foo(const toto& arg1, double& arg2); Index: branches/scool-ng/tests/function/c++_src/definition_001.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/definition_001.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/definition_001.cc (revision 87) @@ -0,0 +1,3 @@ +void answer() +{ +} Index: branches/scool-ng/tests/function/c++_src/declaration_005.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_005.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_005.cc (revision 87) @@ -0,0 +1,2 @@ +template < typename T > +void foo(); Index: branches/scool-ng/tests/function/c++_src/definition_002.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/definition_002.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/definition_002.cc (revision 87) @@ -0,0 +1,4 @@ +void answer() +{ + const int i; +} Index: branches/scool-ng/tests/function/c++_src/declaration_006.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/declaration_006.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/declaration_006.cc (revision 87) @@ -0,0 +1,2 @@ +template < typename T > +void foo(const T& a); Index: branches/scool-ng/tests/function/c++_src/definition_003.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/definition_003.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/definition_003.cc (revision 87) @@ -0,0 +1,4 @@ +int answer() +{ + return 42; +} Index: branches/scool-ng/tests/variable/c++_src/declaration_007.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 0) +++ branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 87) @@ -0,0 +1 @@ +const int i; Index: branches/scool-ng/tests/variable/c++_src/declaration_001.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 0) +++ branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 87) @@ -0,0 +1 @@ +const int i; Index: branches/scool-ng/tests/variable/c++_src/declaration_002.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_002.cc (revision 0) +++ branches/scool-ng/tests/variable/c++_src/declaration_002.cc (revision 87) @@ -0,0 +1 @@ +const int i = 42; Index: branches/scool-ng/tests/variable/c++_src/declaration_003.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_003.cc (revision 0) +++ branches/scool-ng/tests/variable/c++_src/declaration_003.cc (revision 87) @@ -0,0 +1 @@ +int i; Index: branches/scool-ng/tests/variable/c++_src/declaration_004.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_004.cc (revision 0) +++ branches/scool-ng/tests/variable/c++_src/declaration_004.cc (revision 87) @@ -0,0 +1 @@ +int i = 42; Index: branches/scool-ng/tests/check.sh =================================================================== --- branches/scool-ng/tests/check.sh (revision 86) +++ branches/scool-ng/tests/check.sh (revision 87) @@ -47,7 +47,7 @@ if [ ! -r $ref -a $flush_sk -eq 0 ]; then return 1; fi - $rcmd > $cmd_log 2> $cmd_err + eval $rcmd > $cmd_log 2> $cmd_err cexit_val=$? if [ ! -r $ref ]; then -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

milena r2287: Add extension::fill routine and test
by Matthieu Garrigues 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add extension::fill routine and test. * mln/extension/fill.hh: New, implementation of extension::fill. * tests/Makefile.am: Add extension test directory. * tests/core/other/Makefile.am(line_piter): Rename as... * tests/core/other/Makefile.am(box_runstart_piter): ...this * tests/extension/Makefile.am: New. To test extension namespace * tests/extension/fill.cc: New, extension::fill basic test. * tests/extension: New, extension test directory --- mln/extension/fill.hh | 119 +++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 1 tests/core/other/Makefile.am | 4 - tests/extension/Makefile.am | 10 +++ tests/extension/fill.cc | 48 +++++++++++++++++ 5 files changed, 180 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/tests/core/other/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/core/other/Makefile.am (revision 2286) +++ branches/cleanup-2008/milena/tests/core/other/Makefile.am (revision 2287) @@ -3,6 +3,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + box_runstart_piter \ category \ clock_neighb2d \ clock_test \ @@ -12,7 +13,6 @@ graph_elt_window \ line_graph_elt_neighborhood \ line_graph_elt_window \ - line_piter \ neighb \ pixel \ pixter1d \ @@ -23,6 +23,7 @@ pixter3d_more \ point_set_compatibility +box_runstart_piter_SOURCES = box_runstart_piter.cc category_SOURCES = category.cc clock_neighb2d_SOURCES = clock_neighb2d.cc clock_test_SOURCES = clock_test.cc @@ -32,7 +33,6 @@ graph_elt_window_SOURCES = graph_elt_window.cc line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc line_graph_elt_window_SOURCES = line_graph_elt_window.cc -line_piter_SOURCES = line_piter.cc neighb_SOURCES = neighb.cc pixel_SOURCES = pixel.cc pixter1d_SOURCES = pixter1d.cc Index: branches/cleanup-2008/milena/tests/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/Makefile.am (revision 2286) +++ branches/cleanup-2008/milena/tests/Makefile.am (revision 2287) @@ -15,6 +15,7 @@ display \ draw \ estim \ + extension \ fun \ geom \ histo \ Index: branches/cleanup-2008/milena/tests/extension/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/extension/Makefile.am (revision 0) +++ branches/cleanup-2008/milena/tests/extension/Makefile.am (revision 2287) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + fill + +fill_SOURCES = fill.cc + +TESTS = $(check_PROGRAMS) Index: branches/cleanup-2008/milena/tests/extension/fill.cc =================================================================== --- branches/cleanup-2008/milena/tests/extension/fill.cc (revision 0) +++ branches/cleanup-2008/milena/tests/extension/fill.cc (revision 2287) @@ -0,0 +1,48 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/core/extension/fill.cc + * + * \brief Tests on mln::extension::fill. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/extension/fill.hh> +#include <mln/value/int_u8.hh> +#include <mln/debug/println_with_border.hh> + +int main() +{ + using namespace mln; + + const unsigned border = 2; + + image2d<value::int_u8> ima(3, 3, border); + extension::fill(ima, 42); + + debug::println_with_border(ima); +} Index: branches/cleanup-2008/milena/mln/extension/fill.hh =================================================================== --- branches/cleanup-2008/milena/mln/extension/fill.hh (revision 0) +++ branches/cleanup-2008/milena/mln/extension/fill.hh (revision 2287) @@ -0,0 +1,119 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + + +#ifndef MLN_CORE_EXTENSION_FILL_HH +# define MLN_CORE_EXTENSION_FILL_HH + +/*! \file mln/extension/fill.hh + * + * \brief Define function that fills domain extension. + * + */ + +# include <mln/core/concept/image.hh> +# include <mln/trait/image/props.hh> +# include <mln/border/fill.hh> +# include <mln/level/fill_with_value.hh> + +namespace mln +{ + + namespace extension + { + + /*! Fill the domain extension of image \p ima with the + * single value \p v. + * + * \param[in,out] ima The image whose domain extension is to be filled. + * \param[in] v The value to assign. + * + * \pre \p ima has to be initialized. + * + * \todo Optimize with memset if possible. + */ + template <typename I> + void fill(const Image& ima, const mln_value(I)& v); + + namespace impl + { + template <typename I> + void fill_fixed_extension(const Image& ima, const mln_value(I)& v); + } + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + void fill(const Image& ima, const mln_value(I)& v) + { + // Case of ext_io::read_only. + if (mlc_equal(mln_trait_image_ext_io(I), + mln::trait::image::ext_io::read_only)::value == true) + return; // No-op. + + // Case of ext_domain::none. + if (mlc_equal(mln_trait_image_ext_domain(I), + mln::trait::image::ext_domain::none)::value == true) + return; // No-op. + + // Case of ext_domain::extendable. + if (mlc_equal(mln_trait_image_ext_domain(I), + mln::trait::image::ext_domain::extendable)::value == true) + return mln::border::fill(ima, v); + + + // Case of ext_domain::fixed. + if (mlc_equal(mln_trait_image_ext_domain(I), + mln::trait::image::ext_domain::fixed)::value == true) + + // Case of ext_value::single. + if (mlc_equal(mln_trait_image_ext_value(I), + mln::trait::image::ext_value::single)::value == true) + return impl::fill_fixed_extension(const_cast<I&>(exact(ima)), v); + else + return mln::level::fill_with_value(const_cast<I&>(exact(ima)), v); + + } + + namespace impl + { + template <typename I> + void fill_fixed_extension(Image& ima_, const mln_value(I)& v) + { + I& ima = exact(ima_); + ima.extension() = v; + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::extension + +} // end of namespace mln + + +#endif // ! MLN_CORE_EXTENSION_FILL_HH

1 0

cleanup-2008 r2286: Add tests/extension to configure.ac
by Matthieu Garrigues 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 ChangeLog: 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * configure.ac: Add tests/extension to configure.ac. --- configure.ac | 1 + 1 file changed, 1 insertion(+) Index: branches/cleanup-2008/configure.ac =================================================================== --- branches/cleanup-2008/configure.ac (revision 2285) +++ branches/cleanup-2008/configure.ac (revision 2286) @@ -179,6 +179,7 @@ milena/tests/display/Makefile milena/tests/draw/Makefile milena/tests/estim/Makefile + milena/tests/extension/Makefile milena/tests/fun/Makefile milena/tests/fun/i2v/Makefile milena/tests/fun/p2b/Makefile

1 0

scool r86: Handle templates in function calls
by Maxime van Noppen 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-17 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle templates in function calls * scoolt/Expression.str: Factorize code and handle static expressions. * scoolt/Declaration.str: Handle templates in function calls. * scoolt/Function.str: Handle templates. * cxx-syn/CxxExp.sdf: Add grammar for templates in function calls * scl-syn/Expression.sdf: Use simpler constructor names. * scl-syn/Type.sdf, * scl-syn/Lexical.sdf: Factorize reject rules. cxx-syn/CxxExp.sdf | 3 ++- scl-syn/Expression.sdf | 11 ++++++----- scl-syn/Lexical.sdf | 31 ++++++++++++++++--------------- scl-syn/Type.sdf | 13 +------------ scoolt/Declaration.str | 6 +++--- scoolt/Expression.str | 30 ++++++++++++++++++++++++++---- scoolt/Function.str | 14 +++++++++++++- 7 files changed, 67 insertions(+), 41 deletions(-) Index: branches/scool-ng/src/scoolt/Expression.str =================================================================== --- branches/scool-ng/src/scoolt/Expression.str (revision 85) +++ branches/scool-ng/src/scoolt/Expression.str (revision 86) @@ -7,14 +7,25 @@ IdentifierToCxx: Identifier(idf) -> CxxId(idf) - ExpressionToCxx: + + BaseExpressionToCxx: idf -> cxx_idf where <IdentifierToCxx> idf => cxx_idf - ExpressionToCxx: + BaseExpressionToCxx: Integer(int) -> CxxInt(int) + + + ExpressionToCxx: + bexp -> cxx_bexp + where + <BaseExpressionToCxx> bexp => cxx_bexp + + ExpressionToCxx: + String(str) -> <un-double-quote> str + ExpressionToCxx: // |[ ~exp:e1 + ~exp:e2; ]| -> CxxSum(cxx_e1, cxx_e2) Sum(e1, e2) -> CxxSum(cxx_e1, cxx_e2) @@ -23,7 +34,18 @@ ; <ExpressionToCxx> e2 => cxx_e2 ExpressionToCxx: - FunctionCall(idf, params, args) -> CxxFunCall(cxx_idf, cxx_args) + FunctionCall(idf, params, args) -> CxxFunCall(cxx_params, cxx_idf, cxx_args) where <IdentifierToCxx> idf => cxx_idf - ; <ArgumentsToCxx> args => cxx_args // FIXME + ; <ParametersToCxx> params => cxx_params + ; <ArgumentsToCxx> args => cxx_args + + + + StaticExpressionToCxx: + bexp -> cxx_bexp + where + <BaseExpressionToCxx> bexp => cxx_bexp + + StaticExpressionToCxx: + SimpleType(type) -> CxxType(type) Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 85) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 86) @@ -50,10 +50,10 @@ ; <ArgumentsToCxx> <GetArguments> fun_type => cxx_args DeclarationToCxx: - |[ ~idf : ~ftype:fun_type = { ~fbody:body } ]| -> CxxFun([], cxx_ret_type, cxx_idf, cxx_args, cxx_body) + |[ ~idf : ~ftype:fun_type = { ~fbody:body } ]| -> CxxFun(cxx_params, cxx_ret_type, cxx_idf, cxx_args, cxx_body) where - <?FunctionType(None(), _, _)> fun_type // Ensure that there is no parameters - ; <IdentifierToCxx> idf => cxx_idf + <IdentifierToCxx> idf => cxx_idf ; <TypeToCxx> <GetReturnType> fun_type => cxx_ret_type + ; <ParametersToCxx> <GetParameters> fun_type => cxx_params ; <ArgumentsToCxx> <GetArguments> fun_type => cxx_args ; <map (DeclarationToCxx <+ FunctionStatementToCxx) <+ ExpressionToCxx> body => cxx_body Index: branches/scool-ng/src/scoolt/Function.str =================================================================== --- branches/scool-ng/src/scoolt/Function.str (revision 85) +++ branches/scool-ng/src/scoolt/Function.str (revision 86) @@ -23,11 +23,12 @@ // Convert parameters (templates) + // Parameters in function declarations ParametersToCxx: None() -> [] ParametersToCxx: - ParametersDeclaration(param_list) -> <map (ParameterToCxx)> param_list + ParametersDeclaration(params) -> <map (ParameterToCxx)> params ParameterToCxx: TypedId(idf, type) -> (cxx_type, cxx_idf) @@ -35,9 +36,16 @@ <IdentifierToCxx> idf => cxx_idf ; <TypeToCxx> type => cxx_type + // Parameters in function calls + ParametersToCxx: + Some(Parameters(params)) -> <map (StaticExpressionToCxx)> params + + + // Convert arguments + // Arguments in function declarations ArgumentsToCxx: ArgumentsDeclaration(arg_list) -> <map (ArgumentToCxx)> arg_list @@ -48,6 +56,10 @@ ; <IdentifierToCxx> idf => cxx_idf + // Arguments in function calls + ArgumentsToCxx: + Arguments(args) -> <map (ExpressionToCxx)> args + // Convert function statements Index: branches/scool-ng/src/scl-syn/Expression.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Expression.sdf (revision 85) +++ branches/scool-ng/src/scl-syn/Expression.sdf (revision 86) @@ -8,18 +8,19 @@ context-free syntax Id -> Expression {cons("Identifier")} - Id -> StaticExpression {cons("Identifier")} Integer -> Expression {cons("Integer")} + Integer -> StaticExpression {cons("Integer")} String -> Expression {cons("String")} - "[" {StaticExpression ","}* "]" -> StaticArguments {cons("StaticArguments")} - "(" {Expression ","}* ")" -> DynamicArguments {cons("DynamicArguments")} + SimpleType -> StaticExpression + "[" {StaticExpression ","}* "]" -> Parameters {cons("Parameters")} + "(" {Expression ","}* ")" -> Arguments {cons("Arguments")} - Identifier StaticArguments -> StaticFunctionCall {cons("StaticFunctionCall")} + Identifier Parameters -> StaticFunctionCall {cons("StaticFunctionCall")} StaticFunctionCall -> StaticExpression - Identifier StaticArguments? DynamicArguments -> Expression {cons("FunctionCall")} + Identifier Parameters? Arguments -> Expression {cons("FunctionCall")} Expression "+" Expression -> Expression {cons("Sum")} Expression "-" Expression -> Expression {cons("Substraction")} Index: branches/scool-ng/src/scl-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Lexical.sdf (revision 85) +++ branches/scool-ng/src/scl-syn/Lexical.sdf (revision 86) @@ -26,6 +26,7 @@ [\/] -> Slash [\*] -> Asterisk + "var" -> SimpleQualifier "final" -> ClassQualifier "models" -> TypeQualifier @@ -33,20 +34,23 @@ "decl" -> FunctionQualifier "abtract" -> MethodQualifier - context-free syntax + "class" -> Keyword + "concept" -> Keyword + "var" -> Keyword + "final" -> Keyword + "models" -> Keyword + "type" -> Keyword + "ref" -> Keyword + "public" -> Keyword + "protected" -> Keyword + "private" -> Keyword + "where" -> Keyword + + context-free syntax - "class" -> Identifier {reject} - "concept" -> Identifier {reject} - "var" -> Identifier {reject} - "final" -> Identifier {reject} - "models" -> Identifier {reject} - "type" -> Identifier {reject} - "ref" -> Identifier {reject} - "public" -> Identifier {reject} - "protected" -> Identifier {reject} - "private" -> Identifier {reject} - "where" -> Identifier {reject} + Id -> Identifier {cons("Identifier")} + Keyword -> Identifier {reject} "char" -> Identifier {reject} "int" -> Identifier {reject} @@ -54,9 +58,6 @@ "string" -> Identifier {reject} "void" -> Identifier {reject} - - Id -> Identifier {cons("Identifier")} - lexical restrictions Id -/- [A-Za-z0-9\_] Asterisk -/- [\/] Index: branches/scool-ng/src/scl-syn/Type.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Type.sdf (revision 85) +++ branches/scool-ng/src/scl-syn/Type.sdf (revision 86) @@ -29,15 +29,4 @@ ParametersDeclaration? ArgumentsDeclaration "->" Type -> FunctionType {cons("FunctionType")} - "class" -> SimpleType {reject} - "type" -> SimpleType {reject} - "concept" -> SimpleType {reject} - "var" -> SimpleType {reject} - "final" -> SimpleType {reject} - "models" -> SimpleType {reject} - "type" -> SimpleType {reject} - "ref" -> SimpleType {reject} - "public" -> SimpleType {reject} - "protected" -> SimpleType {reject} - "private" -> SimpleType {reject} - "where" -> SimpleType {reject} + Keyword -> SimpleType {reject} Index: branches/scool-ng/src/cxx-syn/CxxExp.sdf =================================================================== --- branches/scool-ng/src/cxx-syn/CxxExp.sdf (revision 85) +++ branches/scool-ng/src/cxx-syn/CxxExp.sdf (revision 86) @@ -8,7 +8,8 @@ context-free syntax CxxInt -> CxxExp {cons("CxxInt")} - CxxId "(" {CxxExp ","}* ")" -> CxxExp {cons("CxxFunCall")} + CxxId "<" {CxxType ","}* ">" "(" {CxxExp ","}* ")" -> CxxExp {cons("CxxFunCall")} + CxxId "<" {CxxInt ","}* ">" "(" {CxxExp ","}* ")" -> CxxExp {cons("CxxFunCall")} CxxId CxxExp ";" -> CxxExp {cons("CxxKeyword")} CxxExp "+" CxxExp -> CxxExp {cons("CxxSum")} "&" CxxExp -> CxxExp {cons("CxxAdressOf")} -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0