February 2007 - Olena-patches

733: Automate the compilation of mini-oln.
by Roland Levillain 02 Feb '07

02 Feb '07

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Automate the compilation of mini-oln. * samples/mini-oln/mini-oln.cc: Remove compilation usage in comment. (oln::Iterator::is_valid, oln::Image::has) (oln::Image2d::nrows_get, oln::Image2d::ncols_get) (oln::Image3d::nrows_get, oln::Image3d::ncols_get) (oln::Image3d::nslis_get, oln::image_base::has): Add missing return keywords. (oln::image_with_nbh::nbh): Disable method. * Makefile.am (SUBDIRS): Add samples. * samples/mini-oln/concept-c++/mini-oln.cc: Likewise. * samples/Makefile.am, * samples/mini-oln/Makefile.am, * samples/mini-oln/concept-c++/Makefile.am: New. Makefile.am | 2 +- samples/Makefile.am | 3 +++ samples/mini-oln/Makefile.am | 25 +++++++++++++++++++++++++ samples/mini-oln/concept-c++/Makefile.am | 21 +++++++++++++++++++++ samples/mini-oln/concept-c++/mini-oln.cc | 27 ++++++++++++--------------- samples/mini-oln/mini-oln.cc | 27 ++++++++++++--------------- 6 files changed, 74 insertions(+), 31 deletions(-) Index: samples/mini-oln/concept-c++/mini-oln.cc --- samples/mini-oln/concept-c++/mini-oln.cc (revision 732) +++ samples/mini-oln/concept-c++/mini-oln.cc (working copy) @@ -27,12 +27,7 @@ /* \file samples/mini-oln/mini-oln.cc \brief A proof of concept of Static using a mini-version of Olena, using - concepts from C++0x. - - Compile with: - - conceptg++ -I../../../../{metalic,static,extended,olena} mini-oln.cc -*/ + concepts from C++0x. */ #include <vector> #include <iostream> @@ -191,7 +186,7 @@ bool is_valid() const { - this->exact().is_valid(); + return this->exact().is_valid(); }; // auto @@ -237,7 +232,7 @@ bool has(const point_t& p) const { - this->exact().has(p); + return this->exact().has(p); } }; } @@ -270,12 +265,12 @@ int nrows_get() const { - this->exact().nrows_get(); + return this->exact().nrows_get(); } int ncols_get() const { - this->exact().ncols_get(); + return this->exact().ncols_get(); } }; } @@ -308,17 +303,17 @@ int nrows_get() const { - this->exact().nrows_get(); + return this->exact().nrows_get(); } int ncols_get() const { - this->exact().ncols_get(); + return this->exact().ncols_get(); } int nslis_get() const { - this->exact().nslis_get(); + return this->exact().nslis_get(); } }; } @@ -353,10 +348,12 @@ typedef oln_type_of_(image_with_nbh, niter) niter_t; typedef oln_type_of_(image_with_nbh, nbh) nbh_t; + // FIXME: Implement. +#if 0 nbh_t nbh() const { - // FIXME. } +#endif }; } @@ -442,7 +439,7 @@ bool has(const point_t& p) const { - this->exact().has(p); + return this->exact().has(p); } }; } Index: samples/mini-oln/concept-c++/Makefile.am --- samples/mini-oln/concept-c++/Makefile.am (revision 0) +++ samples/mini-oln/concept-c++/Makefile.am (revision 0) @@ -0,0 +1,21 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +AM_CPPFLAGS = -I$(top_srcdir)/static -I$(top_srcdir)/metalic + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + +# Hacky. +CXX = @CONCEPTCXX@ + +check_PROGRAMS = mini-oln + +mini_oln_SOURCES = mini-oln.cc + +TESTS = $(check_PROGRAMS) Index: samples/mini-oln/mini-oln.cc --- samples/mini-oln/mini-oln.cc (revision 732) +++ samples/mini-oln/mini-oln.cc (working copy) @@ -26,12 +26,7 @@ // Public License. /* \file samples/mini-oln/mini-oln.cc - \brief A proof of concept of Static using a mini-version of Olena. - - Compile with: - - g++ -I../../../{metalic,static,extended,olena} mini-oln.cc -*/ + \brief A proof of concept of Static using a mini-version of Olena. */ #include <vector> @@ -117,7 +112,7 @@ bool is_valid() const { - this->exact().is_valid(); + return this->exact().is_valid(); }; // auto @@ -163,7 +158,7 @@ bool has(const point_t& p) const { - this->exact().has(p); + return this->exact().has(p); } }; } @@ -196,12 +191,12 @@ int nrows_get() const { - this->exact().nrows_get(); + return this->exact().nrows_get(); } int ncols_get() const { - this->exact().ncols_get(); + return this->exact().ncols_get(); } }; } @@ -234,17 +229,17 @@ int nrows_get() const { - this->exact().nrows_get(); + return this->exact().nrows_get(); } int ncols_get() const { - this->exact().ncols_get(); + return this->exact().ncols_get(); } int nslis_get() const { - this->exact().nslis_get(); + return this->exact().nslis_get(); } }; } @@ -279,10 +274,12 @@ typedef oln_type_of_(image_with_nbh, niter) niter_t; typedef oln_type_of_(image_with_nbh, nbh) nbh_t; + // FIXME: Implement. +#if 0 nbh_t nbh() const { - // FIXME. } +#endif }; } @@ -359,7 +356,7 @@ bool has(const point_t& p) const { - this->exact().has(p); + return this->exact().has(p); } }; } Index: samples/mini-oln/Makefile.am --- samples/mini-oln/Makefile.am (revision 0) +++ samples/mini-oln/Makefile.am (revision 0) @@ -0,0 +1,25 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +SUBDIRS = . concept-c++ + + +AM_CPPFLAGS = -I$(top_srcdir)/static -I$(top_srcdir)/metalic + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + + +check_PROGRAMS = mini-oln + +mini_oln_SOURCES = mini-oln.cc + +TESTS = $(check_PROGRAMS) + + +EXTRA_DIST = README Index: samples/Makefile.am --- samples/Makefile.am (revision 0) +++ samples/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +SUBDIRS = mini-oln Index: Makefile.am --- Makefile.am (revision 732) +++ Makefile.am (working copy) @@ -1,3 +1,3 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = stc tests +SUBDIRS = stc tests samples

1 0

732: Improve the Point2d and Point3d concepts in mini-oln.
by Roland Levillain 02 Feb '07

02 Feb '07

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Improve the Point2d and Point3d concepts in mini-oln. * samples/mini-oln/concept-c++/mini-oln.cc (concepts::Point2d, concepts::Point3d): Enrich them. (concept_map Point2d<oln::point2d>) (concept_map Point3d<oln::point3d>): Adjust. (oln::point2d::coord_type, oln::point3d::coord_type): New typedefs. (oln::point2d::row, oln::point2d::col) (oln::point3d::row, oln::point3d::col, oln::point3d::sli): Use it. mini-oln.cc | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) Index: samples/mini-oln/concept-c++/mini-oln.cc --- samples/mini-oln/concept-c++/mini-oln.cc (revision 731) +++ samples/mini-oln/concept-c++/mini-oln.cc (working copy) @@ -61,8 +61,27 @@ namespace concepts { - concept Point2d<typename P> {}; - concept Point3d<typename P> {}; + // These concepts are not automatic (i.e., prefixed with `auto'), + // since we cannot rely on type signatures for them. For instance, + // using only structural conformance, oln::point3d could be a model + // of concepts::Point2d! + concept Point2d<typename P> + { + typename coord_type; + // For simplicity purpose, the canonical model of + // concepts::Point2d -- oln::point2d -- does not expose its + // interface through methods (that's bad OO software engineering + // practice, but hey, we're just prototyping here). Therefore we + // cannot express sigatures on row and col accesses, since C++0x + // concepts forbid attribute (member) signatures. + }; + + concept Point3d<typename P> + { + typename coord_type; + // Same remark as above for concepts::Point2d regarding member + // signatures. + }; auto concept Image<typename I> { @@ -110,22 +129,31 @@ struct point2d : public Point<point2d> { - int row; - int col; + typedef int coord_type; + coord_type row; + coord_type col; }; struct point3d : public Point<point2d> { - int row; - int col; - int sli; + typedef int coord_type; + coord_type row; + coord_type col; + coord_type sli; }; } namespace concepts { - concept_map Point2d<oln::point2d> {}; - concept_map Point3d<oln::point3d> {}; + concept_map Point2d<oln::point2d> + { + typedef oln::point2d::coord_type coord_type; + }; + + concept_map Point3d<oln::point3d> + { + typedef oln::point2d::coord_type coord_type; + }; }

1 0

731: Add a first C++0x concept-based version of mini-oln.
by Roland Levillain 01 Feb '07

01 Feb '07

https://svn.lrde.epita.fr/svn/oln/trunk/static This version of mini-oln needs g++ from ConceptGCC. You can find it there: /lrde/dev/linux-x86/unstable/conceptgcc-4.1.1-alpha-5/bin/conceptg++ Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a first C++0x concept-based version of mini-oln. * samples/mini-oln/concept-c++/mini-oln.cc: New. mini-oln.cc | 95 +++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 20 deletions(-) Index: samples/mini-oln/concept-c++/mini-oln.cc --- samples/mini-oln/concept-c++/mini-oln.cc (revision 0) +++ samples/mini-oln/concept-c++/mini-oln.cc (working copy) @@ -26,14 +26,16 @@ // Public License. /* \file samples/mini-oln/mini-oln.cc - \brief A proof of concept of Static using a mini-version of Olena. + \brief A proof of concept of Static using a mini-version of Olena, using + concepts from C++0x. Compile with: - g++ -I../../../{metalic,static,extended,olena} mini-oln.cc + conceptg++ -I../../../../{metalic,static,extended,olena} mini-oln.cc */ #include <vector> +#include <iostream> #include <mlc/case.hh> #include <stc/any.hh> @@ -53,6 +55,44 @@ +/*-----------. +| Concepts. | +`-----------*/ + +namespace concepts +{ + concept Point2d<typename P> {}; + concept Point3d<typename P> {}; + + auto concept Image<typename I> + { + typename point_t; + typename iter_t; + typename value_t; + + // ConceptGCC doesn't support operator signatures yet. +#if 0 + value_t& I::operator ()(point_t&); +#endif + bool I::has(const point_t&) const; + }; + + auto concept Image2d<typename I> : Image<I> + { + int I::nrows_get() const; + int I::ncols_get() const; + }; + + auto concept Image3d<typename I> : Image<I> + { + int I::nrows_get() const; + int I::ncols_get() const; + int I::nslis_get() const; + }; +} + + + /*-------------. | Mini-Olena. | `-------------*/ @@ -82,6 +122,12 @@ }; } +namespace concepts +{ + concept_map Point2d<oln::point2d> {}; + concept_map Point3d<oln::point3d> {}; +} + // ---------- // // Iterator. // @@ -293,31 +339,40 @@ namespace oln { - struct switch_image_base; + // Fwd. decl. + template <typename E> + class image_dimension_switch; - namespace error + // Default version, abort. + template <typename E> + class image_dimension_switch : mlc::abort_<E> { - struct ERROR_image_base; }; - template <typename I> - struct case_<switch_image_base, I, 1> : - public mlc::where_ < mlc::eq_ <I, point2d> > + // Concept-based overloading for Image2d. + template <typename E> where concepts::Point2d< oln_type_of(E, point) > + class image_dimension_switch<E> : public oln::Image2d { - typedef Image2d ret; - }; - - template <typename I> - struct case_<switch_image_base, I, 2> : - public mlc::where_ < mlc::eq_ <I, point3d> > + public: + image_dimension_switch() { - typedef Image3d ret; + std::cout << "image_dimension_switch<E> " + << "where concepts::Point2d<oln_type_of(E, point)>" + << std::endl; + } }; - template <typename I> - struct default_case_<switch_image_base, I> + // Concept-based overloading for Image3d. + template <typename E> where concepts::Point3d< oln_type_of(E, point) > + class image_dimension_switch<E> : public oln::Image3d + { + public: + image_dimension_switch() { - typedef mlc::undefined ret; + std::cout << "image_dimension_switch<E> " + << "where concepts::Point3d<oln_type_of(E, point)>" + << std::endl; + } }; } @@ -334,7 +389,7 @@ template<typename E> struct set_super_type< image_base<E> > { - typedef typename oln::switch_<switch_image_base, E>::ret ret; + typedef typename oln::image_dimension_switch<E> ret; }; template <typename E> @@ -346,7 +401,7 @@ }; template <typename E> - struct image_base : public oln::switch_<switch_image_base, E>::ret + struct image_base : public oln::image_dimension_switch<E> { typedef oln_type_of(image_base, point) point_t; typedef oln_type_of(image_base, iter) iter_t;

1 0

730: Fix mini-oln.
by Roland Levillain 01 Feb '07

01 Feb '07

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix mini-oln. * samples/mini-oln/mini-oln.cc: Move all Olena classes into the namespace `oln'. (main): Adjust. (oln::image2d::has): Make it const. Remove semicolons following the closing parenthesis of a namespace. Aesthetic changes. * stc/scoop.hh: Replace every occurrence of `where' (as a template parameter) with `location', to comply with the upcoming C++0x standard. samples/mini-oln/mini-oln.cc | 162 ++++++++++++++++++++++++++++++------------- stc/scoop.hh | 30 +++---- 2 files changed, 131 insertions(+), 61 deletions(-) Index: samples/mini-oln/mini-oln.cc --- samples/mini-oln/mini-oln.cc (revision 729) +++ samples/mini-oln/mini-oln.cc (working copy) @@ -25,6 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/* \file samples/mini-oln/mini-oln.cc + \brief A proof of concept of Static using a mini-version of Olena. + + Compile with: + + g++ -I../../../{metalic,static,extended,olena} mini-oln.cc +*/ + #include <vector> #include <mlc/case.hh> @@ -44,7 +52,17 @@ mlc_case_equipment_for_namespace(oln); -// Point + +/*-------------. +| Mini-Olena. | +`-------------*/ + +// ------- // +// Point. // +// ------- // + +namespace oln +{ template <typename E> struct Point : public stc::any<E> { @@ -62,13 +80,18 @@ int col; int sli; }; +} -// Iterator -template <typename E> -struct Iterator; + +// ---------- // +// Iterator. // +// ---------- // namespace oln { + template <typename E> + struct Iterator; + mlc_decl_typedef(point_type); template <typename E> @@ -76,7 +99,6 @@ { typedef mlc::undefined point_type; }; -}; template <typename E> struct Iterator : public stc::any<E> @@ -104,13 +126,18 @@ return this->exact().operator point_t(); } }; +} -// Image -template <typename E> -struct Image; + +// ------- // +// Image. // +// ------- // namespace oln { + template <typename E> + struct Image; + mlc_decl_typedef(iter_type); mlc_decl_typedef(value_type); @@ -121,7 +148,6 @@ typedef mlc::undefined iter_type; typedef mlc::undefined value_type; }; -}; template <typename E> struct Image : public stc::any<E> @@ -139,8 +165,13 @@ { this->exact().has(p); } - }; +} + + +// --------- // +// Image2d. // +// --------- // namespace oln { @@ -151,7 +182,6 @@ { typedef Image<Image2d> ret; }; -}; struct Image2d : public Image<Image2d> { @@ -174,6 +204,12 @@ this->exact().ncols_get(); } }; +} + + +// ---------- // +// Image 3d. // +// ---------- // namespace oln { @@ -184,7 +220,6 @@ { typedef Image<Image3d> ret; }; -}; struct Image3d : public Image<Image3d> { @@ -212,12 +247,17 @@ this->exact().nslis_get(); } }; +} -// Image with neighborhood -struct image_with_nbh; + +// ------------------------- // +// Image with neighborhood. // +// ------------------------- // namespace oln { + struct image_with_nbh; + mlc_decl_typedef(niter_type); mlc_decl_typedef(nbh_type); @@ -233,7 +273,6 @@ typedef mlc::undefined niter_type; typedef mlc::undefined nbh_type; }; -}; struct image_with_nbh : public Image<image_with_nbh> { @@ -242,28 +281,35 @@ nbh_t nbh() const { - //FIXME + // FIXME. } }; +} -// Switch -struct switch_image_base; + +// -------- // +// Switch. // +// -------- // namespace oln { + struct switch_image_base; + namespace error { struct ERROR_image_base; }; template <typename I> - struct case_<switch_image_base, I, 1> : public mlc::where_ < mlc::eq_ <I, point2d> > + struct case_<switch_image_base, I, 1> : + public mlc::where_ < mlc::eq_ <I, point2d> > { typedef Image2d ret; }; template <typename I> - struct case_<switch_image_base, I, 2> : public mlc::where_ < mlc::eq_ <I, point3d> > + struct case_<switch_image_base, I, 2> : + public mlc::where_ < mlc::eq_ <I, point3d> > { typedef Image3d ret; }; @@ -273,17 +319,18 @@ { typedef mlc::undefined ret; }; -}; - +} +// ------------ // +// Image base. // +// ------------ // -// Image base +namespace oln +{ template <typename E> struct image_base; -namespace oln -{ template<typename E> struct set_super_type<image_base<E> > { @@ -297,7 +344,6 @@ typedef mlc::undefined iter_type; typedef mlc::undefined value_type; }; -}; template <typename E> struct image_base : public oln::switch_<switch_image_base, E>::ret @@ -316,15 +362,20 @@ this->exact().has(p); } }; +} + -// Iterator 2d +// ------------ // +// iterator2d. // +// ------------ // + +namespace oln +{ struct iterator2d; template <typename T> struct image2d; -namespace oln -{ template<> struct set_super_type<iterator2d> { @@ -336,7 +387,6 @@ { typedef point2d point_type; }; -}; struct iterator2d : public Iterator<iterator2d> { @@ -381,14 +431,19 @@ int ncols; point_t p; }; +} -// image2d -template <typename T> -struct image2d; + +// --------- // +// image2d. // +// --------- // namespace oln { template<typename T> + struct image2d; + + template<typename T> struct set_super_type<image2d<T> > { typedef image_base<image2d<T> > ret; @@ -397,10 +452,9 @@ template <typename T> struct vtypes<image2d<T> > { - typedef point2d point_t; - typedef iterator2d iter_t; - typedef T value_t; - }; + typedef point2d point_type; + typedef iterator2d iter_type; + typedef T value_type; }; template <typename T> @@ -433,7 +487,7 @@ return ncols; } - bool has(point_t& p) + bool has(point_t& p) const { assert(!!data); return p.row >= 0 && p.row < nrows && p.col >= 0 && p.col < ncols; @@ -444,14 +498,19 @@ int nrows; int ncols; }; +} -// image_morpher -template <typename E> -struct image_morpher; + +// --------------- // +// image_morpher. // +// --------------- // namespace oln { template<typename E> + struct image_morpher; + + template<typename E> struct set_super_type<image_morpher<E> > { typedef image_base<image_morpher<E> > ret; @@ -462,7 +521,6 @@ { typedef mlc::undefined delegatee_t; }; -}; template <typename E> struct image_morpher : public image_base<image_morpher<E> > @@ -481,14 +539,19 @@ protected: delegatee_t& ref_ima; }; +} -//image_plus_neighborhood -template <typename I, typename N> -struct plus; + +// ------ // +// plus. // +// ------ // namespace oln { template <typename I, typename N> + struct plus; + + template <typename I, typename N> struct set_super_type<image_morpher<plus<I, N> > > { typedef image_morpher<plus <I, N> > ret; @@ -499,7 +562,6 @@ { typedef I delegatee_t; }; -}; template <typename I, typename N> struct plus : public image_morpher<plus<I, N> > @@ -513,17 +575,25 @@ N& nbh; }; + // Helper. template <typename I, typename N> plus<I, N> operator +(I& lhs, N& rhs) { plus<I, N> res(lhs, rhs); return res; } +} +/*--------------. +| Client code. | +`--------------*/ + int main() { + using namespace oln; + typedef plus<image2d<int>, image_with_nbh> my_ima; point2d p2d; Index: stc/scoop.hh --- stc/scoop.hh (revision 729) +++ stc/scoop.hh (working copy) @@ -185,7 +185,7 @@ template <typename from, typename target> \ struct find; \ \ - template <typename from, typename target, typename where, typename res> \ + template <typename from, typename target, typename location, typename res> \ struct helper_find; \ \ \ @@ -470,12 +470,12 @@ /* \ * first_stm(from, target) \ * \ - * returns a pair (Where, Value) with Value being: \ + * returns a pair (Location, Value) with Value being: \ * - stc::abstract \ * - stc::not_delegated \ * - mlc::not_found \ * - a type T \ - * and Where being the class where the stm is found. \ + * and Location being the class where the stm is found. \ * \ * \ * helper_first_stm(curr, target, stm) \ @@ -656,21 +656,21 @@ \ \ /* \ - * helper_find(from, target, where, res) \ + * helper_find(from, target, location, res) \ * \ * \ * \ */ \ \ - template <typename from, typename target, typename where> \ - struct helper_find < from, target, where, \ + template <typename from, typename target, typename location> \ + struct helper_find < from, target, location, \ /* if res == */ mlc::not_found > \ { \ typedef typename delegator_find<from, target>::ret ret; \ }; \ \ - template <typename from, typename target, typename where> \ - struct helper_find < from, target, where, \ + template <typename from, typename target, typename location> \ + struct helper_find < from, target, location, \ /* if res == */ stc::abstract > \ { \ typedef typename delegator_find<from, target>::ret res_d; \ @@ -678,23 +678,23 @@ : mlc::assert_< mlc::is_found_<res_d>, \ ERROR::vtype_declared_but_not_defined \ < ERROR::_for_vtype_<target>, \ - ERROR::_declaration_is_in_<where>, \ + ERROR::_declaration_is_in_<location>, \ ERROR::_definition_is_looked_up_from_<from> > > \ - /* FIXME: error("<target> declared in <where> but not defined at <from>"); */ \ + /* FIXME: error("<target> declared in <location> but not defined at <from>"); */ \ { \ typedef res_d ret; \ }; \ typedef typename check_::ret ret; \ }; \ \ - template <typename from, typename target, typename where> \ - struct helper_find < from, target, where, \ + template <typename from, typename target, typename location> \ + struct helper_find < from, target, location, \ /* if res == */ stc::not_delegated > \ { \ typedef typename superior_find<from, target>::ret ret; \ }; \ \ - template <typename from, typename target, typename where, typename res> \ + template <typename from, typename target, typename location, typename res> \ struct helper_find /* otherwise */ \ { \ typedef res ret; \ @@ -726,10 +726,10 @@ struct find /* otherwise */ \ { \ typedef typename first_stm<from, target>::ret stm; \ - typedef mlc_elt(stm, 1) where; \ + typedef mlc_elt(stm, 1) location; \ typedef mlc_elt(stm, 2) res; \ typedef typename helper_find<from, target, \ - where, res>::ret ret; \ + location, res>::ret ret; \ }; \ \ \

1 0

728: Reduce ambiguity risk with case meta-code location.
by Thierry GERAUD 01 Feb '07

01 Feb '07

2007-02-01 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * mlc/case.hh (mlc_case_equipment_for_namespace): Rename NAMESPACE::internal into NAMESPACE::mlc_case_internal. * mlc/cmp.hh (is_not_value, is_not_bexpr): Shorten. Index: mlc/case.hh =================================================================== --- mlc/case.hh (revision 720) +++ mlc/case.hh (working copy) @@ -191,7 +191,7 @@ \ \ \ - namespace internal \ + namespace mlc_case_internal \ { \ \ template <typename use, \ @@ -393,33 +393,33 @@ template <typename context, typename data> \ struct get_case_ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_get_case, context, data>::ret ret; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_get_case, context, data>::ret ret; \ }; \ \ \ template <typename context, typename data> \ struct case_ <context, data, mlc::internal::unknown_case_id> \ \ - : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::internal::select_case_<mlc::internal::a_simple_case, \ + : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_simple_case, \ context, data>::ret), \ mlc::none >, \ mlc::ERROR::NO_case_STATEMENT_CAN_BE_SELECTED > \ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_simple_case, context, data>::ret ret; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_simple_case, context, data>::ret ret; \ }; \ \ \ template <typename context, typename data> \ struct switch_ \ \ - : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::internal::select_case_<mlc::internal::a_switch_case, \ + : private mlc::assert_< mlc::neq_< mlc_comma_2(typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_switch_case, \ context, data>::ret), \ mlc::none >, \ mlc::ERROR::NO_case_STATEMENT_CAN_BE_SELECTED > \ \ { \ - typedef typename NAMESPACE::internal::select_case_<mlc::internal::a_switch_case, context, data>::ret case_t; \ + typedef typename NAMESPACE::mlc_case_internal::select_case_<mlc::internal::a_switch_case, context, data>::ret case_t; \ typedef typename case_t::ret ret; \ }; \ \ Index: mlc/cmp.hh =================================================================== --- mlc/cmp.hh (revision 720) +++ mlc/cmp.hh (working copy) @@ -83,7 +83,7 @@ /// Check whether \a T is not a mlc::abstract::value. template <typename T> - struct is_not_value : public not_<mlc_is_a(T, mlc::abstract::value)>::bexpr + struct is_not_value : public mlc_is_not_a(T, mlc::abstract::value)::bexpr { }; @@ -96,7 +96,7 @@ /// Check whether \a T is not a mlc::abstract::bexpr. template <typename T> - struct is_not_bexpr : public not_<mlc_is_a(T, mlc::abstract::bexpr)>::bexpr + struct is_not_bexpr : public mlc_is_not_a(T, mlc::abstract::bexpr)::bexpr { };

1 0