- Olena-patches

2397: Get back to the previous, simpler interface of mln::complex_image.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/image/complex_image.hh (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): Remove operators. * tests/core/image/complex_image.cc: Update, and make use of p_complex_faces_iter's. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/complex_image.hh | 29 ----------------------------- milena/tests/core/image/complex_image.cc | 14 +++++++------- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 62fb495..6cd837a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,17 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Get back to the previous, simpler interface of mln::complex_image. + + * mln/core/image/complex_image.hh + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): + Remove operators. + * tests/core/image/complex_image.cc: Update, and make use of + p_complex_faces_iter's. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::p_complex known p_complex_faces_iter's. * mln/core/site_set/p_complex.hh: Add forward declarations for diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 0512d0f..09d6e13 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -148,13 +148,6 @@ namespace mln /// Read-write access of face value at point site \p p. lvalue operator()(const complex_psite<D, P>& p); - /// Read-only access of face value at point site \p p. - template <unsigned N> - rvalue operator()(const faces_psite<N, D, P>& p) const; - /// Read-write access of face value at point site \p p. - template <unsigned N> - lvalue operator()(const faces_psite<N, D, P>& p); - /// Accessors. /// \{ /// Return the domain of psites od the image. @@ -277,28 +270,6 @@ namespace mln } template <unsigned D, typename P, typename V> - template <unsigned N> - inline - typename complex_image<D, P, V>::rvalue - complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) const - { - /* FIXME: We should ensure data_->pc_ has P, but it is not - trivial: a daces_psite has no idea what a p_complex is. */ - return this->data_->values_[p.n()][p.face_id()]; - } - - template <unsigned D, typename P, typename V> - template <unsigned N> - inline - typename complex_image<D, P, V>::lvalue - complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) - { - /* FIXME: We should ensure data_->pc_ has P, but it is not - trivial: a daces_psite has no idea what a p_complex is. */ - return this->data_->values_[p.n()][p.face_id()]; - } - - template <unsigned D, typename P, typename V> inline const metal::vec< D + 1, std::vector<V> >& complex_image<D, P, V>::face_values() const diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 1b06036..24f0a2c 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -100,6 +100,10 @@ int main() | Faces-based psets. | `--------------------*/ + /* FIXME: Not that p_faces have become less interesting since the + introduction of p_complex_faces_{fwd,bkd}_piter_. Keep this part + of the test? */ + // Pset of 0-faces. p_faces<0, D, point2d> pf0(c); // Pset of 1-faces. @@ -164,14 +168,10 @@ int main() // that it can be referenced later by face_psites held by iterators // (as for windows and neighborhoods). - typedef p_faces<0, D, point2d> p0f_t; - p0f_t pf(ima.domain()); - mln_piter_(p0f_t) f0p(pf); + // FIXME: Sugar the name of the iterator. + p_complex_faces_fwd_piter_<0, D, point2d> f0p(ima.domain()); for_all(f0p) - /* FIXME: This explicit call to unproxy_() is not elegant... But - is required for ima() to work, since the target operator() is - templated. */ - std::cout << "ima(" << f0p << ") = " << ima(f0p.unproxy_()) << std::endl; + std::cout << "ima(" << f0p << ") = " << ima(f0p) << std::endl; /* FIXME: Implement other psite iterators, for instance: -- 1.6.0.1

1 0

2396: Have mln::p_complex known p_complex_faces_iter's.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_complex.hh: Add forward declarations for mln::p_complex_faces_fwd_piter_ and mln::p_complex_faces_bkd_piter_ --- milena/ChangeLog | 8 ++++++++ milena/mln/core/site_set/p_complex.hh | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e54d8c8..62fb495 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,14 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::p_complex known p_complex_faces_iter's. + + * mln/core/site_set/p_complex.hh: Add forward declarations for + mln::p_complex_faces_fwd_piter_ and + mln::p_complex_faces_bkd_piter_ + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add piters on n-faces able to convert to mln::complex_psite. * mln/core/site_set/p_complex_faces_piter.hh: New. diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 6c30c25..de6e0ad 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -37,6 +37,7 @@ # include <mln/core/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> +# include <mln/core/site_set/p_complex_faces_piter.hh> namespace mln @@ -48,6 +49,11 @@ namespace mln template <unsigned D, typename P> class p_complex_fwd_piter_; template <unsigned D, typename P> class p_complex_bkd_piter_; + template <unsigned N, unsigned D, typename P> + class p_complex_faces_fwd_piter_; + template <unsigned N, unsigned D, typename P> + class p_complex_faces_bkd_piter_; + namespace trait { @@ -136,6 +142,7 @@ namespace mln // simplify (and lighten) the implementation of piters, psites, // etc. + // FIXME: This method is probably useless now. /// Is this site set valid? bool is_valid() const; @@ -240,7 +247,7 @@ namespace mln return // Check whether P's complex is compatible with this pset's complex. (p.site_set() == *this) && - // Check whether the complex has the face associated to P. + // Check whether P is valid. (p.is_valid()); } -- 1.6.0.1

1 0

2395: Add piters on n-faces able to convert to mln::complex_psite.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_complex_faces_piter.hh: New. --- milena/ChangeLog | 6 + milena/mln/core/site_set/p_complex_faces_piter.hh | 157 +++++++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/site_set/p_complex_faces_piter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 8da4e88..e54d8c8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,12 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add piters on n-faces able to convert to mln::complex_psite. + + * mln/core/site_set/p_complex_faces_piter.hh: New. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Exercise complex_faces_iter's. * tests/core/other/complex.cc (test_complex_faces_iter): diff --git a/milena/mln/core/site_set/p_complex_faces_piter.hh b/milena/mln/core/site_set/p_complex_faces_piter.hh new file mode 100644 index 0000000..ef77272 --- /dev/null +++ b/milena/mln/core/site_set/p_complex_faces_piter.hh @@ -0,0 +1,157 @@ +// 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_CORE_SITE_SET_P_COMPLEX_FACES_PITER_HH +# define MLN_CORE_SITE_SET_P_COMPLEX_FACES_PITER_HH + +/// \file mln/core/site_set/p_complex_faces_piter.hh +/// \brief Definition of point iterator on the n-faces of a +/// complex-based pset. +/// +/// Types defined here are akin to parametrized typedefs: the code is +/// factored in mln::internal::p_complex_piter_base_. + +# include <mln/core/site_set/p_complex.hh> +# include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/core/complex_faces_iter.hh> + +/* FIXME: p_complex_faces_fwd_piter_ and p_complex_faces_bkd_piter_ + are really long names: find something shorter. */ + + +namespace mln +{ + + // Forward declarations. + template <unsigned N, unsigned D, typename P> class p_faces; + + template <unsigned N, unsigned D> class faces_fwd_iter_; + template <unsigned N, unsigned D> class faces_bkd_iter_; + + + /*--------------------------------------. + | p_complex_faces_fwd_piter_<N, D, P>. | + `--------------------------------------*/ + + /// \brief Forward iterator on the \p N-faces sites of an + /// mln::p_complex<D, P>. + template <unsigned N, unsigned D, typename P> + class p_complex_faces_fwd_piter_ + : public internal::p_complex_piter_base_< complex_faces_fwd_iter_<N, D>, + p_complex<D, P>, + P, + p_complex_faces_fwd_piter_<N, D, P> > + { + typedef p_complex_faces_fwd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< complex_faces_fwd_iter_<N, D>, + p_complex<D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_complex_faces_fwd_piter_(); + p_complex_faces_fwd_piter_(const p_complex<D, P>& pc); + /// \} + }; + + + /*--------------------------------------. + | p_complex_faces_bkd_piter_<N, D, P>. | + `--------------------------------------*/ + + /// \brief Backward iterator on the \p N-faces sites of an + /// mln::p_complex<D, P>. + template <unsigned N, unsigned D, typename P> + class p_complex_faces_bkd_piter_ + /* FIXME: Rename internal::p_complex_piter_base_ to something else, + as it is also used for p_faces piters! */ + : public internal::p_complex_piter_base_< complex_faces_bkd_iter_<N, D>, + p_complex<D, P>, + P, + p_complex_faces_bkd_piter_<N, D, P> > + { + typedef p_complex_faces_bkd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< complex_faces_bkd_iter_<N, D>, + p_complex<D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_complex_faces_bkd_piter_(); + p_complex_faces_bkd_piter_(const p_complex<D, P>& pc); + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*--------------------------------------. + | p_complex_faces_fwd_piter_<N, D, P>. | + `--------------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_complex_faces_fwd_piter_<N, D, P>::p_complex_faces_fwd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_complex_faces_fwd_piter_<N, D, P>::p_complex_faces_fwd_piter_(const p_complex<D, P>& pc) + : super_(pc) + { + } + + + /*--------------------------------------. + | p_complex_faces_bkd_piter_<N, D, P>. | + `--------------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_complex_faces_bkd_piter_<N, D, P>::p_complex_faces_bkd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_complex_faces_bkd_piter_<N, D, P>::p_complex_faces_bkd_piter_(const p_complex<D, P>& pc) + : super_(pc) + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_CORE_SITE_SET_P_COMPLEX_FACES_PITER_HH -- 1.6.0.1

1 0

2394: Exercise complex_faces_iter's.
by Roland Levillain 24 Sep '08

24 Sep '08

* tests/core/other/complex.cc (test_complex_faces_iter): New function. Use it... (main): ...here. --- milena/ChangeLog | 9 +++++++++ milena/tests/core/other/complex.cc | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e9cb550..8da4e88 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,15 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Exercise complex_faces_iter's. + + * tests/core/other/complex.cc (test_complex_faces_iter): + New function. + Use it... + (main): ...here. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex known complex_faces_iter's. * mln/core/complex.hh: Include mln/core/complex_faces_iter.hh. diff --git a/milena/tests/core/other/complex.cc b/milena/tests/core/other/complex.cc index 3e4d021..a131f63 100644 --- a/milena/tests/core/other/complex.cc +++ b/milena/tests/core/other/complex.cc @@ -37,6 +37,7 @@ using namespace mln; // Forward declaration. template <unsigned N, unsigned D> void test_faces_iter(complex<D>& c); +template <unsigned N, unsigned D> void test_complex_faces_iter(complex<D>& c); int main() @@ -137,24 +138,56 @@ int main() // Iterator on n-faces of C. // // -------------------------- // + /* FIXME: There's probably useless code here; I (Roland) think that + faces_{fwd,bkd}_iter<N, D> won't be really useful to work with + actual complex processing since they are not really flexible --- + but I'm not sure. */ + + /* Using faces_{fwd,bkd}_iter_<N, D>, which are proxies to + face_handles<N, D>. */ test_faces_iter<0>(c); test_faces_iter<1>(c); test_faces_iter<2>(c); + /* Using complex_faces_{fwd,bkd}_iter_<N, D>, which are proxies to + any_face_handles<N>. */ + test_complex_faces_iter<0>(c); + test_complex_faces_iter<1>(c); + test_complex_faces_iter<2>(c); + + /* FIXME: Exercice more iterators (see milena/tests/core/complex_image.cc) and ticket #162 (https://trac.lrde.org/olena/ticket/162) */ // ... - } + template <unsigned N, unsigned D> void test_faces_iter(complex<D>& c) { + std::cout << "test_faces_iter<" << N << ", " << D << ">:" + << std::endl; mln_fwd_fiter(N, complex<D>) fwd_nf(c); mln_bkd_fiter(N, complex<D>) bkd_nf(c); for_all_2(fwd_nf, bkd_nf) std::cout << fwd_nf << ' ' << bkd_nf << std::endl; std::cout << std::endl; } + +template <unsigned N, unsigned D> +void +test_complex_faces_iter(complex<D>& c) +{ + std::cout << "test_complex_faces_iter<" << N << ", " << D << ">:" + << std::endl; + /* FIXME: Provide sugar. Maybe redefined mln_fwd_fiter and + mln_bkd_fiter so that they expand as complex_faces_iters (instead + of faces_iters). */ + complex_faces_fwd_iter_<N, D> fwd_ncf(c); + complex_faces_bkd_iter_<N, D> bkd_ncf(c); + for_all_2(fwd_ncf, bkd_ncf) + std::cout << fwd_ncf << ' ' << bkd_ncf << std::endl; + std::cout << std::endl; +} -- 1.6.0.1

1 0

2393: Have mln::complex known complex_faces_iter's.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex.hh: Include mln/core/complex_faces_iter.hh. --- milena/ChangeLog | 6 ++++++ milena/mln/core/complex.hh | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e82e082..e9cb550 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,12 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex known complex_faces_iter's. + + * mln/core/complex.hh: Include mln/core/complex_faces_iter.hh. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on n-faces able to convert to mln::any_face_handle's. * mln/core/complex_faces_iter.hh: New. diff --git a/milena/mln/core/complex.hh b/milena/mln/core/complex.hh index 32197f4..2329a71 100644 --- a/milena/mln/core/complex.hh +++ b/milena/mln/core/complex.hh @@ -44,8 +44,10 @@ # include <mln/util/tracked_ptr.hh> # include <mln/core/face.hh> + # include <mln/core/complex_iter.hh> # include <mln/core/faces_iter.hh> +# include <mln/core/complex_faces_iter.hh> namespace mln -- 1.6.0.1

1 0

2392: Add iterators on n-faces able to convert to mln::any_face_handle's.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex_faces_iter.hh: New. --- milena/ChangeLog | 6 + milena/mln/core/complex_faces_iter.hh | 262 +++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/complex_faces_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 72e25d3..e82e082 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,12 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on n-faces able to convert to mln::any_face_handle's. + + * mln/core/complex_faces_iter.hh: New. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Simplify iterators on complexes. * mln/core/complex_iter.hh, mln/core/faces_iter.hh: diff --git a/milena/mln/core/complex_faces_iter.hh b/milena/mln/core/complex_faces_iter.hh new file mode 100644 index 0000000..ea86f6f --- /dev/null +++ b/milena/mln/core/complex_faces_iter.hh @@ -0,0 +1,262 @@ +// 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_CORE_COMPLEX_FACES_ITER_HH +# define MLN_CORE_COMPLEX_FACES_ITER_HH + +/// \file mln/core/complex_faces_iter.hh +/// \brief Definition of forward and backward iterators on the n-faces +/// of a complex. + +# include <mln/core/internal/complex_iter_base.hh> + +/* FIXME: Should we drop N from the signature of these iterators? + I.e., have N be dynamic? Or better: provide other iterators where + N is dynamic? */ + + +namespace mln +{ + + /*--------------------------------. + | complex_faces_fwd_iter_<N, D>. | + `--------------------------------*/ + + /// \brief Forward iterator on all the faces of a mln::complex<D>. + /// + /// \arg \p N The dimension of the face associated to this iterator. + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned N, unsigned D> + class complex_faces_fwd_iter_ + : public internal::complex_iter_base_< any_face_handle<D>, + complex_faces_fwd_iter_<N, D> > + { + public: + /// Type of associated face. + typedef any_face_handle<D> face; + + private: + typedef complex_faces_fwd_iter_<N, D> self_; + typedef internal::complex_iter_base_< face, self_ > super_; + + public: + using super_::is_valid; + using super_::invalidate; + + public: + /// Construction and assignment. + /// \{ + complex_faces_fwd_iter_(); + // FIXME: See comment in internal::complex_iter_base_'s default ctor + complex_faces_fwd_iter_(complex<D>& c); + /// \} + + /// Manipulation. + /// \{ + /// Test if the iterator is valid. + void start(); + /// Go to the next point. + void next_(); + /// \} + + private: + using super_::face_; + }; + + + /*--------------------------------. + | complex_faces_bkd_iter_<N, D>. | + `--------------------------------*/ + + /// \brief Backward iterator on all the faces of a mln::complex<D>. + /// + /// \arg \p N The dimension of the face associated to this iterator. + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned N, unsigned D> + class complex_faces_bkd_iter_ + : public internal::complex_iter_base_< any_face_handle<D>, + complex_faces_bkd_iter_<N, D> > + { + public: + /// Type of associated face. + typedef any_face_handle<D> face; + + private: + typedef complex_faces_bkd_iter_<N, D> self_; + typedef internal::complex_iter_base_< face, self_ > super_; + + public: + using super_::is_valid; + using super_::invalidate; + + public: + /// Construction and assignment. + /// \{ + complex_faces_bkd_iter_(); + // FIXME: See comment in internal::complex_iter_base_'s default ctor + complex_faces_bkd_iter_(complex<D>& c); + /// \} + + /// Manipulation. + /// \{ + /// Start an iteration. + void start(); + /// Go to the next point. + void next_(); + /// \} + + private: + using super_::face_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*--------------------------------. + | complex_faces_fwd_iter_<N, D>. | + `--------------------------------*/ + + template <unsigned N, unsigned D> + inline + complex_faces_fwd_iter_<N, D>::complex_faces_fwd_iter_() + : super_() + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + face_.set_n(N); + mln_postcondition(!is_valid()); + } + + template <unsigned N, unsigned D> + inline + complex_faces_fwd_iter_<N, D>::complex_faces_fwd_iter_(complex<D>& c) + : super_(c) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + face_.set_n(N); + mln_postcondition(!is_valid()); + } + + template <unsigned N, unsigned D> + inline + void + complex_faces_fwd_iter_<N, D>::start() + { + face_.set_face_id(0u); + } + + template <unsigned N, unsigned D> + inline + void + complex_faces_fwd_iter_<N, D>::next_() + { + if (is_valid()) + { + unsigned face_id = face_.face_id(); + if (face_id + 1 < face_.cplx().template nfaces<N>()) + /* FIXME: Provide accessor any_face_handle::face_id() + returning a mutable reference? This way, we could just + write + + ++face_.face_id(); + + instead of the following. + + Or add {inc,add}_face_id() services. */ + face_.set_face_id(face_id + 1); + else + invalidate(); + } + } + + + /*--------------------------------. + | complex_faces_bkd_iter_<N, D>. | + `--------------------------------*/ + + template <unsigned N, unsigned D> + inline + complex_faces_bkd_iter_<N, D>::complex_faces_bkd_iter_() + : super_() + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + face_.set_n(N); + mln_postcondition(!is_valid()); + } + + template <unsigned N, unsigned D> + inline + complex_faces_bkd_iter_<N, D>::complex_faces_bkd_iter_(complex<D>& c) + : super_(c) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + face_.set_n(N); + mln_postcondition(!is_valid()); + } + + template <unsigned N, unsigned D> + inline + void + complex_faces_bkd_iter_<N, D>::start() + { + face_.set_face_id(face_.cplx().template nfaces<N>() - 1); + } + + template <unsigned N, unsigned D> + inline + void + complex_faces_bkd_iter_<N, D>::next_() + { + if (is_valid()) + { + unsigned face_id = face_.face_id(); + if (face_id > 0) + /* FIXME: Provide accessor any_face_handle::face_id() + returning a mutable reference? This way, we could just + write + + ++face_.face_id(); + + instead of the following. + + Or add {inc,add}_face_id() services. */ + face_.set_face_id(face_id - 1); + else + invalidate(); + } + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_CORE_COMPLEX_FACES_ITER_HH -- 1.6.0.1

1 0

2391: Simplify iterators on complexes.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex_iter.hh, mln/core/faces_iter.hh: Fix and supplement documentation. Add missing postconditions. (mln::complex_fwd_iter_<D>::complex_dim) (mln::complex_bkd_iter_<D>::complex_dim): Remove constants. (mln::complex_fwd_iter_<D>::complex_fwd_iter_(const self_&)) (mln::complex_bkd_iter_<D>::complex_bkd_iter_(const self_&)) (mln::faces_fwd_iter_<N, D>::faces_fwd_iter_(const self_&)) (mln::faces_bkd_iter_<N, D>::faces_bkd_iter_(const self_&)): Remove copy ctors. (mln::complex_fwd_iter_<D>::operator=(const self_&)) (mln::complex_bkd_iter_<D>::operator=(const self_&)) (mln::faces_fwd_iter_<N, D>::operator=(const self_&)) (mln::faces_bkd_iter_<N, D>::operator=(const self_&)): Remove assignment operators. (mln::complex_fwd_iter_<D>::set_cplx) (mln::complex_bkd_iter_<D>::set_cplx) (mln::faces_fwd_iter_<N, D>::set_cplx) (mln::faces_bkd_iter_<N, D>::set_cplx): Remove accessors. --- milena/ChangeLog | 26 +++++++++++ milena/mln/core/complex_iter.hh | 90 ++++---------------------------------- milena/mln/core/faces_iter.hh | 82 +++-------------------------------- 3 files changed, 44 insertions(+), 154 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 005bbdc..72e25d3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,32 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Simplify iterators on complexes. + + * mln/core/complex_iter.hh, mln/core/faces_iter.hh: + Fix and supplement documentation. + Add missing postconditions. + (mln::complex_fwd_iter_<D>::complex_dim) + (mln::complex_bkd_iter_<D>::complex_dim): + Remove constants. + (mln::complex_fwd_iter_<D>::complex_fwd_iter_(const self_&)) + (mln::complex_bkd_iter_<D>::complex_bkd_iter_(const self_&)) + (mln::faces_fwd_iter_<N, D>::faces_fwd_iter_(const self_&)) + (mln::faces_bkd_iter_<N, D>::faces_bkd_iter_(const self_&)): + Remove copy ctors. + (mln::complex_fwd_iter_<D>::operator=(const self_&)) + (mln::complex_bkd_iter_<D>::operator=(const self_&)) + (mln::faces_fwd_iter_<N, D>::operator=(const self_&)) + (mln::faces_bkd_iter_<N, D>::operator=(const self_&)): + Remove assignment operators. + (mln::complex_fwd_iter_<D>::set_cplx) + (mln::complex_bkd_iter_<D>::set_cplx) + (mln::faces_fwd_iter_<N, D>::set_cplx) + (mln::faces_bkd_iter_<N, D>::set_cplx): + Remove accessors. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Simplify mln::internal::complex_iter_base_. * mln/core/internal/complex_iter_base.hh: diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index 1e60fe0..2a486be 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -57,9 +57,6 @@ namespace mln public: /// Type of associated face. typedef any_face_handle<D> face; - // FIXME: Rename as dim? - /// Dimension of the complex. - static const unsigned complex_dim = D; private: typedef complex_fwd_iter_<D> self_; @@ -73,18 +70,12 @@ namespace mln /// Construction and assignment. /// \{ complex_fwd_iter_(); - // FIXME: See above (internal::complex_iter_base_'s default ctor). + // FIXME: See comment in internal::complex_iter_base_'s default ctor complex_fwd_iter_(complex<D>& c); - complex_fwd_iter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ - /// Change the target complex. - // FIXME: Same comment as the ctor above. - void set_cplx(complex<D>& c); - /// Test if the iterator is valid. void start(); /// Go to the next point. @@ -111,9 +102,6 @@ namespace mln public: /// Type of associated face. typedef any_face_handle<D> face; - // FIXME: Rename as dim? - /// Dimension of the complex. - static const unsigned complex_dim = D; private: typedef complex_bkd_iter_<D> self_; @@ -127,18 +115,12 @@ namespace mln /// Construction and assignment. /// \{ complex_bkd_iter_(); - // FIXME: See above (internal::complex_iter_base_'s default ctor). + // FIXME: See comment in internal::complex_iter_base_'s default ctor complex_bkd_iter_(complex<D>& c); - complex_bkd_iter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ - /// Change the target complex. - // FIXME: Same comment as the ctor above. - void set_cplx(complex<D>& c); - /// Start an iteration. void start(); /// Go to the next point. @@ -175,34 +157,6 @@ namespace mln template <unsigned D> inline - complex_fwd_iter_<D>::complex_fwd_iter_(const complex_fwd_iter_<D>& rhs) - : super_(rhs) - { - } - - template <unsigned D> - inline - complex_fwd_iter_<D>& - complex_fwd_iter_<D>::operator=(const complex_fwd_iter_<D>& rhs) - { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; - } - - template <unsigned D> - inline - void - complex_fwd_iter_<D>::set_cplx(complex<D>& c) - { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); - } - - template <unsigned D> - inline void complex_fwd_iter_<D>::start() { @@ -221,12 +175,14 @@ namespace mln unsigned face_id = face_.face_id(); if (face_id + 1 < face_.cplx().nfaces(n)) - /* FIXME: Provide accessor any_face_handle::n() returning + /* FIXME: Provide accessor any_face_handle::face_id() returning a mutable reference? This way, we could just write ++face_.face_id(); - instead of the following. */ + instead of the following. + + Or add {inc,add}_face_id() services. */ face_.set_face_id(face_id + 1); else // Start to iterate on the faces of the next dimension if @@ -265,34 +221,6 @@ namespace mln template <unsigned D> inline - complex_bkd_iter_<D>::complex_bkd_iter_(const complex_bkd_iter_<D>& rhs) - : super_(rhs) - { - } - - template <unsigned D> - inline - complex_bkd_iter_<D>& - complex_bkd_iter_<D>::operator=(const complex_bkd_iter_<D>& rhs) - { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; - } - - template <unsigned D> - inline - void - complex_bkd_iter_<D>::set_cplx(complex<D>& c) - { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); - } - - template <unsigned D> - inline void complex_bkd_iter_<D>::start() { @@ -311,12 +239,14 @@ namespace mln unsigned face_id = face_.face_id(); if (face_id > 0) - /* FIXME: Provide accessor any_face_handle::n() returning + /* FIXME: Provide accessor any_face_handle::face_id() returning a mutable reference? This way, we could just write ++face_.face_id(); - instead of the following. */ + instead of the following. + + Or add {inc,add}_face_id() services. */ face_.set_face_id(face_id - 1); else // Start to iterate on the faces of the previous dimension diff --git a/milena/mln/core/faces_iter.hh b/milena/mln/core/faces_iter.hh index 522f2ab..6194deb 100644 --- a/milena/mln/core/faces_iter.hh +++ b/milena/mln/core/faces_iter.hh @@ -51,6 +51,7 @@ namespace mln faces_fwd_iter_<N, D> > { public: + /// Type of associated face. typedef face_handle<N, D> face; private: @@ -65,18 +66,12 @@ namespace mln /// Construction and assignment. /// \{ faces_fwd_iter_(); - // FIXME: See above (internal::complex_iter_base_'s default ctor). + // FIXME: See comment in internal::complex_iter_base_'s default ctor faces_fwd_iter_(complex<D>& c); - faces_fwd_iter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ - /// Change the target complex. - // FIXME: Same comment as the ctor above. - void set_cplx(complex<D>& c); - /// Test if the iterator is valid. void start(); /// Go to the next point. @@ -102,6 +97,7 @@ namespace mln faces_bkd_iter_<N, D> > { public: + /// Type of associated face. typedef face_handle<N, D> face; private: @@ -116,18 +112,12 @@ namespace mln /// Construction and assignment. /// \{ faces_bkd_iter_(); - // FIXME: See above (internal::complex_iter_base_'s default ctor). + // FIXME: See comment in internal::complex_iter_base_'s default ctor faces_bkd_iter_(complex<D>& c); - faces_bkd_iter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ - /// Change the target complex. - // FIXME: Same comment as the ctor above. - void set_cplx(complex<D>& c); - /// Start an iteration. void start(); /// Go to the next point. @@ -153,6 +143,7 @@ namespace mln { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); + mln_postcondition(!is_valid()); } template <unsigned N, unsigned D> @@ -162,36 +153,7 @@ namespace mln { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - faces_fwd_iter_<N, D>::faces_fwd_iter_(const faces_fwd_iter_<N, D>& rhs) - : super_(rhs) - { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - void - faces_fwd_iter_<N, D>::set_cplx(complex<D>& c) - { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); - } - - template <unsigned N, unsigned D> - inline - faces_fwd_iter_<N, D>& - faces_fwd_iter_<N, D>::operator=(const faces_fwd_iter_<N, D>& rhs) - { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; + mln_postcondition(!is_valid()); } template <unsigned N, unsigned D> @@ -235,6 +197,7 @@ namespace mln { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); + mln_postcondition(!is_valid()); } template <unsigned N, unsigned D> @@ -244,36 +207,7 @@ namespace mln { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - faces_bkd_iter_<N, D>::faces_bkd_iter_(const faces_bkd_iter_<N, D>& rhs) - : super_(rhs) - { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - void - faces_bkd_iter_<N, D>::set_cplx(complex<D>& c) - { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); - } - - template <unsigned N, unsigned D> - inline - faces_bkd_iter_<N, D>& - faces_bkd_iter_<N, D>::operator=(const faces_bkd_iter_<N, D>& rhs) - { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; + mln_postcondition(!is_valid()); } template <unsigned N, unsigned D> -- 1.6.0.1

1 0

2390: Simplify mln::internal::complex_iter_base_.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/internal/complex_iter_base.hh: (mln::internal::complex_iter_base_<F, E>::complex_iter_base_): Remove copy ctor. (mln::internal::complex_iter_base_<F, E>::operator=): Remove assignment operator. (mln::internal::complex_iter_base_<F, E>::set_cplx): New accessor. --- milena/ChangeLog | 12 +++++++++ milena/mln/core/internal/complex_iter_base.hh | 31 +++++++----------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 32c9a60..005bbdc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -41,6 +41,18 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Simplify mln::internal::complex_iter_base_. + + * mln/core/internal/complex_iter_base.hh: + (mln::internal::complex_iter_base_<F, E>::complex_iter_base_): + Remove copy ctor. + (mln::internal::complex_iter_base_<F, E>::operator=): + Remove assignment operator. + (mln::internal::complex_iter_base_<F, E>::set_cplx): + New accessor. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/image/complex_image.cc: Exercise iterators on p_faces. 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/internal/complex_iter_base.hh b/milena/mln/core/internal/complex_iter_base.hh index a2462ea..e2c747a 100644 --- a/milena/mln/core/internal/complex_iter_base.hh +++ b/milena/mln/core/internal/complex_iter_base.hh @@ -65,12 +65,14 @@ namespace mln milena/tests/complex_image.cc. */ complex_iter_base_(); complex_iter_base_(complex_type& c); - complex_iter_base_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex_type& c); + /// Test if the iterator is valid. bool is_valid() const; /// Invalidate the iterator. @@ -100,15 +102,10 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const complex_iter_base_<F, E>& p); - } // end of mln::internal - # ifndef MLN_INCLUDE_ONLY - namespace internal - { - template <typename F, typename E> inline complex_iter_base_<F, E>::complex_iter_base_() @@ -133,22 +130,12 @@ namespace mln template <typename F, typename E> inline - complex_iter_base_<F, E>::complex_iter_base_(const complex_iter_base_<F, E>& rhs) - : face_(rhs.face_) - { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); - } - - template <typename F, typename E> - inline - complex_iter_base_<F, E>& - complex_iter_base_<F, E>::operator=(const complex_iter_base_<F, E>& rhs) + void + complex_iter_base_<F, E>::set_cplx(complex_type& c) { - if (&rhs == this) - return *this; - face_ = rhs.face_; - return *this; + face_.set_cplx(c); + // Invalidate face_. + invalidate(); } template <typename F, typename E> -- 1.6.0.1

1 0

scool r103: Handle the 'final' keyword
by Maxime van Noppen 24 Sep '08

24 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-24 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle the 'final' keyword * scoolt/Class.str: New. * scoolt/Declaration.str: Don't add the Exact type parameter when the * class is final. Class.str | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ Declaration.str | 4 ++-- 2 files changed, 52 insertions(+), 2 deletions(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 0) +++ branches/scool-ng/src/scoolt/Class.str (revision 103) @@ -0,0 +1,50 @@ +module Class + +imports libstratego-lib Cxx Scool Declaration + +rules + + // Translate class body + + ClassBodyToCxx: + body -> cxx_body + where + <map (ClassStatementToCxx)> body => cxx_body + + + // Translate class statements + + ClassStatementToCxx: + AccessBlock(Public, body) -> CxxPublic(cxx_body) + where + <ClassStatementToCxx> body => cxx_body + + ClassStatementToCxx: + AccessBlock(Protected, body) -> CxxProtected(cxx_body) + where + <ClassStatementToCxx> body => cxx_body + + ClassStatementToCxx: + AccessBlock(Private, body) -> CxxPrivate(cxx_body) + where + <ClassStatementToCxx> body => cxx_body + + ClassStatementToCxx: + decl -> cxx_decl + where + <map (DeclarationToCxx)> decl => cxx_decl + + + // Add the exact type parameter if the class is not final + AddExactType(|cqualif): + cxx_params -> new_cxx_params + where + <conc> (<ExactType> cqualif, cxx_params) => new_cxx_params + + ExactType: + Some("final") -> [] + + ExactType: + cqualif -> [(CxxType("typename"), "Exact")] + where + <?Some("abstract") <+ ?None()> cqualif Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 102) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 103) @@ -64,9 +64,9 @@ //////////////////////////////////////////////////////////////////////////////// DeclarationToCxx: - ClassDefinition(None, idf, wclause, ClassBlock(body)) -> CxxClassDecl(cxx_params, cxx_idf, [], cxx_body) + ClassDefinition(cqualif, idf, wclause, ClassBlock(body)) -> CxxClassDecl(cxx_params, cxx_idf, [], cxx_body) where - ![(CxxType("typename"), "T")] => cxx_params + <AddExactType(|cqualif)> [] => cxx_params ; <IdentifierToCxx> idf => cxx_idf ; <?None> wclause ; <ClassBodyToCxx> body => cxx_body -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r102: Handle the final keyword
by Maxime van Noppen 24 Sep '08

24 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-24 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle the final keyword * class/c++_src/final_001.cc: New. * class/c++_ast/final_001.aterm: New. * class/c++_ast/empty.aterm, * class/c++_ast/empty_accessblocks.aterm, * class/c++_ast/empty_private.aterm, * class/c++_ast/empty_protected.aterm, * class/c++_ast/empty_public.aterm, * class/c++_ast/member_001.aterm, * class/c++_ast/member_002.aterm, * class/c++_ast/method_001.aterm, * class/c++_ast/method_002.aterm, * class/c++_ast/method_003.aterm, * class/c++_ast/method_004.aterm, * class/c++_ast/method_005.aterm, * class/c++_src/empty.cc, * class/c++_src/empty_accessblocks.cc, * class/c++_src/empty_private.cc, * class/c++_src/empty_protected.cc, * class/c++_src/empty_public.cc, * class/c++_src/member_001.cc, * class/c++_src/member_002.cc, * class/c++_src/method_001.cc, * class/c++_src/method_002.cc, * class/c++_src/method_003.cc, * class/c++_src/method_004.cc, * class/c++_src/method_005.cc: Rename the 'T' parameter into 'Exact'. c++_ast/empty.aterm | 2 +- c++_ast/empty_accessblocks.aterm | 2 +- c++_ast/empty_private.aterm | 2 +- c++_ast/empty_protected.aterm | 2 +- c++_ast/empty_public.aterm | 2 +- c++_ast/final_001.aterm | 1 + c++_ast/member_001.aterm | 2 +- c++_ast/member_002.aterm | 2 +- c++_ast/method_001.aterm | 2 +- c++_ast/method_002.aterm | 2 +- c++_ast/method_003.aterm | 2 +- c++_ast/method_004.aterm | 2 +- c++_ast/method_005.aterm | 2 +- c++_src/empty.cc | 2 +- c++_src/empty_accessblocks.cc | 2 +- c++_src/empty_private.cc | 2 +- c++_src/empty_protected.cc | 2 +- c++_src/empty_public.cc | 2 +- c++_src/final_001.cc | 3 +++ c++_src/member_001.cc | 2 +- c++_src/member_002.cc | 2 +- c++_src/method_001.cc | 2 +- c++_src/method_002.cc | 2 +- c++_src/method_003.cc | 2 +- c++_src/method_004.cc | 2 +- c++_src/method_005.cc | 2 +- 26 files changed, 28 insertions(+), 24 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/empty_private.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_private.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/empty_private.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPrivate([])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPrivate([])])]) Index: branches/scool-ng/tests/class/c++_ast/member_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/member_002.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/member_002.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Point2d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x")),CxxDecl(CxxType("int"),CxxId("y"))])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Point2d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x")),CxxDecl(CxxType("int"),CxxId("y"))])])]) Index: branches/scool-ng/tests/class/c++_ast/final_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/final_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/final_001.aterm (revision 102) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([],CxxId("Student"),[],[])]) Index: branches/scool-ng/tests/class/c++_ast/empty_public.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_public.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/empty_public.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([])])]) Index: branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([]),CxxProtected([]),CxxPrivate([])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([]),CxxProtected([]),CxxPrivate([])])]) Index: branches/scool-ng/tests/class/c++_ast/empty.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/empty.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[])]) Index: branches/scool-ng/tests/class/c++_ast/method_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_002.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/method_002.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_003.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_003.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/method_003.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_004.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/method_004.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_005.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_005.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/method_005.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]),CxxPrivate([CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]),CxxPrivate([CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/empty_protected.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_protected.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/empty_protected.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Foo"),[],[CxxProtected([])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxProtected([])])]) Index: branches/scool-ng/tests/class/c++_ast/member_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/member_001.aterm (revision 101) +++ branches/scool-ng/tests/class/c++_ast/member_001.aterm (revision 102) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"T")],CxxId("Point1d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x"))])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Point1d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x"))])])]) Index: branches/scool-ng/tests/class/c++_src/empty_public.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/empty_public.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/empty_public.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/empty_accessblocks.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/empty_accessblocks.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/empty_accessblocks.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/empty.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/empty.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/empty.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { }; Index: branches/scool-ng/tests/class/c++_src/method_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_001.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/method_001.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/method_002.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_002.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/method_002.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/method_003.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_003.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/method_003.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/method_004.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_004.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/method_004.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/method_005.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_005.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/method_005.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { public: Index: branches/scool-ng/tests/class/c++_src/empty_protected.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/empty_protected.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/empty_protected.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { protected: Index: branches/scool-ng/tests/class/c++_src/member_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/member_001.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/member_001.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Point1d { public: Index: branches/scool-ng/tests/class/c++_src/empty_private.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/empty_private.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/empty_private.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Foo { private: Index: branches/scool-ng/tests/class/c++_src/member_002.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/member_002.cc (revision 101) +++ branches/scool-ng/tests/class/c++_src/member_002.cc (revision 102) @@ -1,4 +1,4 @@ -template < typename T > +template < typename Exact > class Point2d { public: Index: branches/scool-ng/tests/class/c++_src/final_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/final_001.cc (revision 0) +++ branches/scool-ng/tests/class/c++_src/final_001.cc (revision 102) @@ -0,0 +1,3 @@ +class Student +{ +}; -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0