Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

667: Add qiters for oln::morpher::slice.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add qiters for oln::morpher::slice. * oln/core/type_fun/slice.hh (TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER): Rename as... (TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER): ...this. Adjust. (oln::type_fun::slice_piter): Rename as... (oln::type_fun::slice_iterator): ...this. (oln::type_fun::slice_iterator<fwd_qiter2d>) (oln::type_fun::slice_iterator<bkd_qiter2d>) (oln::type_fun::slice_iterator<fwd_qiter3d>) (oln::type_fun::slice_iterator<bkd_qiter3d>) * oln/core/iterator_vtypes.hh: s/slice_piter/slice_iterator/g. (oln::single_vtype<morpher::slice<Image>, typedef_::fwd_qiter_type>) (oln::single_vtype<morpher::slice<Image>, typedef_::bkd_qiter_type>) * oln/morpher/slice.hh: Adjust comments. * tests/morphers/slice_morpher.cc: s/ima_with_nbh/slice/g Test fwd_qiter on oln::morpher::slice. oln/core/iterator_vtypes.hh | 31 +++++++++++++++++++++++++--- oln/core/type_fun/slice.hh | 44 ++++++++++++++++++++++++++++++---------- oln/morpher/slice.hh | 4 +-- tests/morphers/slice_morpher.cc | 42 ++++++++++++++++++++++++++------------ 4 files changed, 93 insertions(+), 28 deletions(-) Index: oln/core/type_fun/slice.hh --- oln/core/type_fun/slice.hh (revision 666) +++ oln/core/type_fun/slice.hh (working copy) @@ -145,7 +145,7 @@ /// Error messages raised by static assertions/abortions. namespace ERROR { - struct TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER; + struct TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER; struct TYPE_FUNCTION_slice_topo_NOT_DEFINED_FOR_THIS_PARAMETER; } @@ -153,9 +153,9 @@ namespace type_fun { - /*------------------------. - | type_fun::slice_piter. | - `------------------------*/ + /*---------------------------. + | type_fun::slice_iterator. | + `---------------------------*/ /// Type function returning the ``sliced'' piter corresponding to /// \a Piter @@ -163,10 +163,10 @@ /// Default version, undefined. template <typename Piter> - struct slice_piter : + struct slice_iterator : public mlc::abort_< Piter, - oln::ERROR::TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER + oln::ERROR::TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER > { typedef mlc::undefined ret; @@ -178,34 +178,58 @@ // --------- // template <> - struct slice_piter<fwd_piter2d> + struct slice_iterator<fwd_piter2d> { typedef fwd_piter1d ret; }; template <> - struct slice_piter<bkd_piter2d> + struct slice_iterator<bkd_piter2d> { typedef bkd_piter1d ret; }; + template <> + struct slice_iterator<fwd_qiter2d> + { + typedef fwd_qiter1d ret; + }; + + template <> + struct slice_iterator<bkd_qiter2d> + { + typedef bkd_qiter1d ret; + }; + // --------- // // image3d. // // --------- // template <> - struct slice_piter<fwd_piter3d> + struct slice_iterator<fwd_piter3d> { typedef fwd_piter2d ret; }; template <> - struct slice_piter<bkd_piter3d> + struct slice_iterator<bkd_piter3d> { typedef bkd_piter2d ret; }; + template <> + struct slice_iterator<fwd_qiter3d> + { + typedef fwd_qiter2d ret; + }; + + template <> + struct slice_iterator<bkd_qiter3d> + { + typedef bkd_qiter2d ret; + }; + /// \} Index: oln/core/iterator_vtypes.hh --- oln/core/iterator_vtypes.hh (revision 666) +++ oln/core/iterator_vtypes.hh (working copy) @@ -284,6 +284,8 @@ template <typename Piter, typename Topo> class piter_slice_; + // piters. + /// fwd_piter vtype of morpher::slice. template <typename Image> struct single_vtype< morpher::slice<Image>, typedef_::fwd_piter_type > @@ -291,7 +293,7 @@ private: typedef oln_type_of(Image, fwd_piter) orig_fwd_piter; public: - typedef typename type_fun::slice_piter<orig_fwd_piter>::ret ret; + typedef typename type_fun::slice_iterator<orig_fwd_piter>::ret ret; }; /// bkd_piter vtype of morpher::slice. @@ -301,11 +303,34 @@ private: typedef oln_type_of(Image, bkd_piter) orig_bkd_piter; public: - typedef typename type_fun::slice_piter<orig_bkd_piter>::ret ret; + typedef typename type_fun::slice_iterator<orig_bkd_piter>::ret ret; + }; + + + // qiters. + + /// fwd_qiter vtype of morpher::slice. + template <typename Image> + struct single_vtype< morpher::slice<Image>, typedef_::fwd_qiter_type > + { + private: + typedef oln_type_of(Image, fwd_qiter) orig_fwd_qiter; + public: + typedef typename type_fun::slice_iterator<orig_fwd_qiter>::ret ret; + }; + + /// bkd_qiter vtype of morpher::slice. + template <typename Image> + struct single_vtype< morpher::slice<Image>, typedef_::bkd_qiter_type > + { + private: + typedef oln_type_of(Image, bkd_qiter) orig_bkd_qiter; + public: + typedef typename type_fun::slice_iterator<orig_bkd_qiter>::ret ret; }; - // FIXME: What about niters and qiter? + // FIXME: What about niters? } // end of namespace oln Index: oln/morpher/slice.hh --- oln/morpher/slice.hh (revision 666) +++ oln/morpher/slice.hh (working copy) @@ -90,8 +90,8 @@ // fwd_piter_type: see oln/core/iterator_vtypes.hh. // bkd_piter_type: see oln/core/iterator_vtypes.hh. - // FIXME: fwd_qiter_type? - // FIXME: bkd_qiter_type? + // fwd_qiter_type: see oln/core/iterator_vtypes.hh. + // bkd_qiter_type: see oln/core/iterator_vtypes.hh. typedef oln::morpher::tag::slice morpher_type; Index: tests/morphers/slice_morpher.cc --- tests/morphers/slice_morpher.cc (revision 666) +++ tests/morphers/slice_morpher.cc (working copy) @@ -33,7 +33,8 @@ #include <mlc/is_a.hh> // FIXME: We should not include oln/basics2d.hh and oln/basics3d.hh, -// but only oln/core/2d/image2d.hh and oln/core/3d/image3d.hh. +// but only oln/core/3d/image3d.hh and oln/core/2d/image2d.hh, +// oln/core/2d/window2d. #include <oln/basics2d.hh> #include <oln/basics3d.hh> #include <oln/morpher/slice.hh> @@ -45,7 +46,7 @@ main() { /*---------------. - | image2d<int>. | + | image3d<int>. | `---------------*/ typedef oln::image3d<int> image_t; @@ -58,27 +59,27 @@ /*----------------------------. - | add_slice< image2d<int> >. | + | add_slice< image3d<int> >. | `----------------------------*/ typedef oln::morpher::slice<image_t> slice_t; // Check that the instantiated slice morpher realizes the suited // interfaces. - mlc::assert_< mlc::eq_<oln_type_of_(slice_t, grid), oln::grid2d> >::check(); + mlc::assert_< mlc::eq_<oln_grid_(slice_t), oln::grid2d> >::check(); mlc::assert_< mlc_is_a_(slice_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(slice_t, oln::abstract::mutable_image) >::check(); // Create a slice of \a ima along the 2nd axis (which the ``row'' // axis, numbered 1), and check its peoperties. int slice_row = 2; - slice_t ima_with_nbh(ima, 1, slice_row); - assert(ima_with_nbh.bbox().nrows() == 3); - assert(ima_with_nbh.bbox().ncols() == 5); - // Fill a slice of \a ima by filling \a ima_with_nbh. - oln::level::fill (ima_with_nbh, 51); + slice_t slice(ima, 1, slice_row); + assert(slice.bbox().nrows() == 3); + assert(slice.bbox().ncols() == 5); + // Fill a slice of \a ima by filling \a slice. + oln::level::fill (slice, 51); - // Check that \a ima has been altered, by comapring it to a similar + // Check that \a ima has been altered, by comparing it to a similar // 3D image. image_t ref(3, 4, 5); oln::level::fill (ref, 42); @@ -86,7 +87,22 @@ for (unsigned c = 0; c < ima.bbox().ncols(); ++c) ref.at(s, slice_row, c) = 51; // FIXME: Implement equality on images. - oln_type_of_(image_t, piter) p (ima.topo()); - for_all (p) - assert(ima(p) == ref(p)); + oln_piter_(image_t) pi (ima.topo()); + for_all (pi) + assert(ima(pi) == ref(pi)); + + // Test foward q-iterator. + typedef oln::window2d slice_win_t; + slice_win_t win_c4p; + win_c4p. + add(oln::dpoint2d(-1, 0)). + add(oln::dpoint2d(+1, 0)). + add(oln::dpoint2d( 0, -1)). + add(oln::dpoint2d( 0, +1)); + oln_piter_(slice_t) ps (slice.topo()); + oln_qiter_(slice_t) q (ps, win_c4p); + for_all (ps) + for_all (q) + if (slice.has(q)) + assert(slice(q) == 51); }

18 years, 2 months

olena-0.10 10.267: Fix the distribution (again)

by Roland Levillain

2006-10-22 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution (again). * ruby/Makefile.am: s/ruby_DATA/dist_ruby_DATA/g. --- 10.266/tools/swilena/ruby/Makefile.am Sat, 21 Oct 2006 22:31:35 +0200 levill_r (oln/v/17_Makefile.a 1.10 600) +++ 10.267/tools/swilena/ruby/Makefile.am Sun, 22 Oct 2006 11:57:38 +0200 levill_r (oln/v/17_Makefile.a 1.11 600) @@ -8,10 +8,10 @@ rubydir = $(libdir)/ruby # ltrequire.rb: Extension of the `require' understanding Libtool libraries. -ruby_DATA = ltrequire.rb +dist_ruby_DATA = ltrequire.rb # A utility script to display images (not installed). -ruby_DATA += swilena_display.rb +dist_ruby_DATA += swilena_display.rb $(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ --- 10.266/oln.prj +++ 10.267/oln.prj @@ -1,18 +1,17 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 266) -(Parent-Version oln 10 265) -(Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> +(Project-Version oln 10 267) +(Parent-Version oln 10 266) +(Version-Log "2006-10-22 Roland Levillain <roland(a)lrde.epita.fr> - Fix the distribution. + Fix the distribution (again). - * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and - convol/slow_gaussian.hxx. + * ruby/Makefile.am: s/ruby_DATA/dist_ruby_DATA/g. ") (New-Version-Log "") -(Checkin-Time "Sat, 21 Oct 2006 22:32:07 +0200") +(Checkin-Time "Sun, 22 Oct 2006 11:57:38 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -131,7 +130,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.6 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.52 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600)) @@ -1052,7 +1051,7 @@ (tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644)) (tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744)) - (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.10 600)) + (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.11 600)) (tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644)) (tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755))

18 years, 2 months

olena-0.10 10.266: Fix the distribution (Olena)

by Roland Levillain

2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and convol/slow_gaussian.hxx. --- 10.265/olena/oln/makefile.src Wed, 05 Jul 2006 18:22:20 +0200 levill_r (oln/r/4_makefile.s 1.9 600) +++ 10.266/olena/oln/makefile.src Sat, 21 Oct 2006 22:32:07 +0200 levill_r (oln/r/4_makefile.s 1.10 600) @@ -1,4 +1,4 @@ -## +## -*- makefile -*- ## List of headers in olena ## Include this file to have access to their name. ## @@ -39,6 +39,8 @@ convol/fast_gaussian_coefficient.hh \ convol/nagao.hh \ convol/nagao.hxx \ + convol/slow_gaussian.hh \ + convol/slow_gaussian.hxx \ core/abstract/binary_image.hh \ core/abstract/behavior.hh \ core/abstract/dpoint.hh \ --- 10.265/oln.prj +++ 10.266/oln.prj @@ -1,19 +1,18 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 265) -(Parent-Version oln 10 264) +(Project-Version oln 10 266) +(Parent-Version oln 10 265) (Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. - * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): - Remove. - (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. + * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and + convol/slow_gaussian.hxx. ") (New-Version-Log "") -(Checkin-Time "Sat, 21 Oct 2006 22:31:35 +0200") +(Checkin-Time "Sat, 21 Oct 2006 22:32:07 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -130,7 +129,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.5 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.6 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) @@ -1451,7 +1450,7 @@ (olena/tests/morpho/tests/gradient (oln/r/1_gradient 1.2 600)) (integre/ntg/makefile.src (oln/r/2_makefile.s 1.1 600)) (metalic/mlc/makefile.src (oln/r/3_makefile.s 1.1 600)) - (olena/oln/makefile.src (oln/r/4_makefile.s 1.9 600)) + (olena/oln/makefile.src (oln/r/4_makefile.s 1.10 600)) (olena/oln/convol/slow_gaussian.hh (oln/r/7_slow_gauss 1.4 600)) (olena/oln/convol/slow_gaussian.hxx (oln/r/8_slow_gauss 1.4 600))

18 years, 2 months

olena-0.10 10.265: Fix the distribution (Swilena)

by Roland Levillain

2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): Remove. (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. --- 10.264/tools/swilena/ruby/Makefile.am Fri, 20 Oct 2006 19:00:57 +0200 levill_r (oln/v/17_Makefile.a 1.9 600) +++ 10.265/tools/swilena/ruby/Makefile.am Sat, 21 Oct 2006 22:31:35 +0200 levill_r (oln/v/17_Makefile.a 1.10 600) @@ -8,11 +8,10 @@ rubydir = $(libdir)/ruby # ltrequire.rb: Extension of the `require' understanding Libtool libraries. -dist_ruby_SCRIPT = ltrequire.rb +ruby_DATA = ltrequire.rb # A utility script to display images (not installed). -# FIXME: Is it still useful? -dist_noinst_ruby_SCRIPT = swilena_display.rb +ruby_DATA += swilena_display.rb $(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ --- 10.264/oln.prj +++ 10.265/oln.prj @@ -1,15 +1,19 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 264) -(Parent-Version oln 10 263) -(Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> - - * oln/lrde/ufmt/Makefile.am (noinst_HEADERS): Add attributes.hh +(Project-Version oln 10 265) +(Parent-Version oln 10 264) +(Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the distribution. + + * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): + Remove. + (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. ") (New-Version-Log "") -(Checkin-Time "Fri, 20 Oct 2006 19:13:44 +0200") +(Checkin-Time "Sat, 21 Oct 2006 22:31:35 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -128,7 +132,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.5 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.50 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600)) @@ -1049,7 +1053,7 @@ (tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644)) (tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744)) - (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.9 600)) + (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.10 600)) (tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644)) (tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755))

18 years, 2 months

666: Simplfy header inclusions of oln::image[123]d.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Simplfy header inclusions of oln::image[123]d. * oln/core/1d/image1d.hh (oln/core/1d/topo1d.hh): Include it. (oln/core/gen/topo_lbbox.hh, oln/core/1d/aliases.hh): No longer include them. * oln/core/2d/image2d.hh (oln/core/2d/topo2d.hh): Include it. (oln/core/gen/topo_lbbox.hh, oln/core/2d/aliases.hh): No longer include them. * oln/core/3d/image3d.hh (oln/core/3d/topo3d.hh): Include it. (oln/core/gen/topo_lbbox.hh, oln/core/3d/aliases.hh): No longer include them. 1d/image1d.hh | 5 +---- 2d/image2d.hh | 5 +---- 3d/image3d.hh | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 665) +++ oln/core/1d/image1d.hh (working copy) @@ -31,14 +31,11 @@ # include <oln/core/image_entry.hh> # include <oln/core/gen/grid.hh> -# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/1d/array1d.hh> # include <oln/core/1d/point1d.hh> -// For topo1d. -# include <oln/core/1d/aliases.hh> +# include <oln/core/1d/topo1d.hh> // For fwd_piter and bkd_piter virtual types. -// FIXME: Really necessary? # include <oln/core/iterator_vtypes.hh> Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 665) +++ oln/core/2d/image2d.hh (working copy) @@ -31,14 +31,11 @@ # include <oln/core/image_entry.hh> # include <oln/core/gen/grid.hh> -# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/2d/array2d.hh> # include <oln/core/2d/point2d.hh> -// For topo2d. -# include <oln/core/2d/aliases.hh> +# include <oln/core/2d/topo2d.hh> // For fwd_piter and bkd_piter virtual types. -// FIXME: Really necessary? # include <oln/core/iterator_vtypes.hh> Index: oln/core/3d/image3d.hh --- oln/core/3d/image3d.hh (revision 665) +++ oln/core/3d/image3d.hh (working copy) @@ -31,14 +31,11 @@ # include <oln/core/image_entry.hh> # include <oln/core/gen/grid.hh> -# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/3d/array3d.hh> # include <oln/core/3d/point3d.hh> -// For topo3d. -# include <oln/core/3d/aliases.hh> +# include <oln/core/3d/topo3d.hh> // For fwd_piter and bkd_piter virtual types. -// FIXME: Really necessary? # include <oln/core/iterator_vtypes.hh>

18 years, 2 months

665: Add morpher based on mutators.

by Thierry GERAUD

2006-10-20 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add morpher based on mutators. * tests/value/accessor.cc: New. * tests/value/Makefile.am: Update. * oln/morpher/thru_mfun.hh: New. * oln/value/accessor.hh: New. * oln/Makefile.am: Update. * oln/morpher/thru_fun.hh: Use shortcuts. Index: tests/value/accessor.cc =================================================================== --- tests/value/accessor.cc (revision 0) +++ tests/value/accessor.cc (revision 0) @@ -0,0 +1,51 @@ +// Copyright (C) 2006 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. + +/// Test oln::value::a_*. +#include <iostream> + +#include <oln/color/rgb.hh> + +#include <oln/basics2d.hh> +#include <oln/value/accessor.hh> +#include <oln/debug/print.hh> + + +int main() +{ + using namespace oln; + + typedef color::rgb_<int> rgb_t; + rgb_t c; + + image2d<rgb_t> ima(3,3); + point2d p(0,0); + + ima(p).red() = 51; + assert( a_red(ima)(p) == 51 ); + +} Index: tests/value/Makefile.am =================================================================== --- tests/value/Makefile.am (revision 664) +++ tests/value/Makefile.am (working copy) @@ -19,9 +19,11 @@ CXXFLAGS += $(TESTS_CXXFLAGS) check_PROGRAMS = \ + accessor \ grey # Value. +accessor_SOURCES = accessor.cc grey_SOURCES = grey.cc Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 664) +++ oln/Makefile.am (working copy) @@ -168,8 +168,10 @@ morpher/tags.hh \ morpher/slice.hh \ morpher/thru_fun.hh \ + morpher/thru_mfun.hh \ morpher/value_cast.hh \ \ + value/accessor.hh \ value/all.hh \ value/default.hh \ value/greylevel.hh \ Index: oln/morpher/thru_mfun.hh =================================================================== --- oln/morpher/thru_mfun.hh (revision 0) +++ oln/morpher/thru_mfun.hh (revision 0) @@ -0,0 +1,185 @@ +// Copyright (C) 2006 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 OLN_MORPHER_THRU_MFUN +# define OLN_MORPHER_THRU_MFUN + +# include <xtd/res.hh> +# include <xtd/abstract/open_nary_fun.hh> +# include <xtd/mexpr.hh> +# include <oln/morpher/internal/image_value_morpher.hh> + + +namespace oln +{ + + namespace morpher + { + // Forward declaration. + template <typename Image, typename Fun> struct thru_mfun; + + } // end of namespace oln::morpher + + + /// Super type. + template <typename Image, typename Fun> + struct set_super_type< morpher::thru_mfun<Image, Fun> > + { + typedef morpher::thru_mfun<Image, Fun> self_t; + typedef morpher::internal::image_value_morpher<Image, self_t> ret; + }; + + + template <typename Image, typename Fun> + struct vtypes< morpher::thru_mfun<Image, Fun> > + { + private: + typedef oln_type_of(Image, rvalue) old_value_type; + public: + typedef mlc::false_ is_computed_type; + typedef typename xtd::res_<Fun, old_value_type>::ret value_type; + typedef value_type& lvalue_type; + }; + + template <typename Image, typename Fun> + struct single_vtype< morpher::thru_mfun<Image, Fun>, typedef_::rvalue_type > + { + typedef morpher::thru_mfun<Image, Fun> self_t; + typedef oln_value(self_t) ret; + }; + + + + namespace morpher + { + + /// 'Image thru Function' morpher. + template <typename Image, typename Fun> + class thru_mfun : public internal::image_value_morpher< Image, + morpher::thru_mfun<Image, Fun> > + { + private: + + typedef thru_mfun<Image, Fun> self_t; + typedef internal::image_value_morpher<Image, self_t> super_t; + + typedef oln_psite(self_t) psite_t; + typedef oln_rvalue(self_t) rvalue_t; + typedef oln_lvalue(self_t) lvalue_t; + + public: + + thru_mfun(const Image& image, const Fun& fun); + + rvalue_t impl_op_read(const psite_t& p) const; + lvalue_t impl_op_readwrite(const psite_t& p); + + protected: + + Fun fun_; + }; + + + namespace ERROR + { + + struct AN_xtd_mutator_ONLY_WORKS_ON_AN_oln_abstract_mutable_image; + + } // end of namespace oln::morpher::ERROR + + +# ifndef OLN_INCLUDE_ONLY + + template <typename Image, typename Fun> + thru_mfun<Image, Fun>::thru_mfun(const Image& image, const Fun& fun) : + super_t(image), + fun_(fun) + { + } + + template <typename Image, typename Fun> + typename thru_mfun<Image, Fun>::rvalue_t + thru_mfun<Image, Fun>::impl_op_read(const typename thru_mfun<Image, Fun>::psite_t& p) const + { + return fun_(this->image_(p)); + } + + template <typename Image, typename Fun> + typename thru_mfun<Image, Fun>::lvalue_t + thru_mfun<Image, Fun>::impl_op_readwrite(const typename thru_mfun<Image, Fun>::psite_t& p) + { + return fun_(this->image_(p)); + } + +# endif + + } // end of namespace oln::morpher + + +} // end of namespace oln + + + +namespace xtd +{ + + // open_nary_fun_<1, Fun>::operator()(A& a) const + // where A is an oln::abstract::mutable_image<I> + + template <typename Fun, typename A> + struct case_ < tag::mutable_fun_operator, mlc::pair_<Fun, A>, 1 > + : where_< mlc_is_a(A, oln::abstract::image) > + { + typedef stc_to_exact(A) I; + typedef oln::morpher::thru_mfun<I, Fun> res; + typedef oln::morpher::thru_mfun<I, Fun> mutable_res; + + static res impl(const Fun& fun, // target + const oln::abstract::image<I>& ima) + { + mlc::assert_< mlc_is_a(A, oln::abstract::mutable_image), + oln::morpher::ERROR::AN_xtd_mutator_ONLY_WORKS_ON_AN_oln_abstract_mutable_image >::check(); + // FIXME: ima is const... so there may be a problem! + res tmp(ima.exact(), fun); + return tmp; + } + + static res impl(const Fun& fun, // target + oln::abstract::image<I>& ima) + { + mlc::assert_< mlc_is_a(A, oln::abstract::mutable_image), + oln::morpher::ERROR::AN_xtd_mutator_ONLY_WORKS_ON_AN_oln_abstract_mutable_image >::check(); + res tmp(ima.exact(), fun); + return tmp; + } + }; + +} // end of namespace xtd + + + +#endif // ! OLN_MORPHER_THRU_MFUN Index: oln/morpher/thru_fun.hh =================================================================== --- oln/morpher/thru_fun.hh (revision 664) +++ oln/morpher/thru_fun.hh (working copy) @@ -69,7 +69,7 @@ struct single_vtype< morpher::thru_fun<Image, Fun>, typedef_::rvalue_type > { typedef morpher::thru_fun<Image, Fun> self_t; - typedef oln_type_of(self_t, value) ret; + typedef oln_value(self_t) ret; }; @@ -87,8 +87,8 @@ typedef thru_fun<Image, Fun> self_t; typedef internal::image_value_morpher<Image, self_t> super_t; - typedef oln_type_of(self_t, psite) psite_t; - typedef oln_type_of(self_t, rvalue) rvalue_t; + typedef oln_psite(self_t) psite_t; + typedef oln_rvalue(self_t) rvalue_t; public: @@ -135,7 +135,7 @@ // where A is an oln::abstract::image<I> template <typename Fun, typename A> - struct case_ < tag::fun_operator_1, mlc::pair_<Fun, A>, 2 > + struct case_ < tag::fun_operator_1, mlc::pair_<Fun, A>, 1 > : where_< mlc_is_a(A, oln::abstract::image) > { typedef stc_to_exact(A) I; Index: oln/value/accessor.hh =================================================================== --- oln/value/accessor.hh (revision 0) +++ oln/value/accessor.hh (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2006 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 OLN_VALUE_ACCESSOR_HH +# define OLN_VALUE_ACCESSOR_HH + +#include <oln/morpher/thru_fun.hh> +#include <xtd/accessor.hh> + + +xtd_decl_accessor(value); +xtd_decl_accessor(vec); + +xtd_decl_accessor(red); +xtd_decl_accessor(green); +xtd_decl_accessor(blue); + + +namespace oln +{ + + static const xtd::accessor::value_type a_value; + static const xtd::accessor::vec_type a_vec; + + static const xtd::accessor::red_type a_red; + static const xtd::accessor::green_type a_green; + static const xtd::accessor::blue_type a_blue; + +} // end of namespace oln + + +#endif // ! OLN_VALUE_ACCESSOR_HH

18 years, 2 months

olena-0.10 10.264: Fix the distribution

by Roland Levillain

2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> * oln/lrde/ufmt/Makefile.am (noinst_HEADERS): Add attributes.hh --- 10.263/olena/oln/lrde/ufmt/Makefile.am Tue, 29 Aug 2006 14:48:46 +0200 levill_r (oln/x/26_Makefile.a 1.3 644) +++ 10.264/olena/oln/lrde/ufmt/Makefile.am Fri, 20 Oct 2006 19:13:44 +0200 levill_r (oln/x/26_Makefile.a 1.4 644) @@ -11,6 +11,7 @@ noinst_HEADERS = \ ad_maxtree.hh \ ap_maxtree.hh \ + attributes.hh \ basic_maxtree.hh \ basic_najman.hh \ basic_salembier.hh \ --- 10.263/oln.prj +++ 10.264/oln.prj @@ -1,12 +1,15 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 263) -(Parent-Version oln 10 262) -(Version-Log "Add missing ChangeLog entry. +(Project-Version oln 10 264) +(Parent-Version oln 10 263) +(Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + * oln/lrde/ufmt/Makefile.am (noinst_HEADERS): Add attributes.hh + ") (New-Version-Log "") -(Checkin-Time "Fri, 20 Oct 2006 19:05:11 +0200") +(Checkin-Time "Fri, 20 Oct 2006 19:13:44 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -123,7 +126,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.4 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.5 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.50 600)) @@ -1588,7 +1591,7 @@ (TODO (oln/x/23_TODO 1.1 644)) (olena/TODO (oln/x/24_TODO 1.1 644)) (olena/oln/lrde/Makefile.am (oln/x/25_Makefile.a 1.1 644)) - (olena/oln/lrde/ufmt/Makefile.am (oln/x/26_Makefile.a 1.3 644)) + (olena/oln/lrde/ufmt/Makefile.am (oln/x/26_Makefile.a 1.4 644)) (olena/oln/lrde/ufmt/fiorio-1.hh (oln/x/27_fiorio-1.h 1.3 644)) (olena/oln/lrde/ufmt/fiorio-2.hh (oln/x/28_fiorio-2.h 1.3 644)) (olena/oln/lrde/ufmt/bin/Makefile.am (oln/x/29_Makefile.a 1.3 644))

18 years, 2 months

olena-0.10 10.263: Add missing ChangeLog entry

by Roland Levillain

--- 10.262/tools/swilena/ChangeLog Fri, 20 Oct 2006 16:26:01 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.49 600) +++ 10.263/tools/swilena/ChangeLog Fri, 20 Oct 2006 19:05:11 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.50 600) @@ -1,5 +1,14 @@ 2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix Rblena installation. + + * ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb... + (dist_ruby_SCRIPT): ...here. + (ruby_SCRIPT): Add swilena_display.rb. + * ruby/ltrequire.rb: Update to latest version from clspr. + +2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix Pylena installation. * python/Makefile.am (python_PYTHON): Add ltihooks.py. --- 10.262/oln.prj +++ 10.263/oln.prj @@ -1,20 +1,12 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 262) -(Parent-Version oln 10 261) -(Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> - - Fix Rblena installation. - - * ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb... - (dist_ruby_SCRIPT): ...here. - (ruby_SCRIPT): Add swilena_display.rb. - * ruby/ltrequire.rb: Update to latest version from clspr. - +(Project-Version oln 10 263) +(Parent-Version oln 10 262) +(Version-Log "Add missing ChangeLog entry. ") (New-Version-Log "") -(Checkin-Time "Fri, 20 Oct 2006 19:00:57 +0200") +(Checkin-Time "Fri, 20 Oct 2006 19:05:11 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -133,7 +125,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.4 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.49 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.50 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600))

18 years, 2 months

olena-0.10 20.262: Fix Rblena installation.

by Roland Levillain

2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> Fix Rblena installation. * ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb... (dist_ruby_SCRIPT): ...here. (ruby_SCRIPT): Add swilena_display.rb. * ruby/ltrequire.rb: Update to latest version from clspr. --- 10.261/tools/swilena/ruby/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/17_Makefile.a 1.8 600) +++ 10.262/tools/swilena/ruby/Makefile.am Fri, 20 Oct 2006 19:00:57 +0200 levill_r (oln/v/17_Makefile.a 1.9 600) @@ -8,7 +8,11 @@ rubydir = $(libdir)/ruby # ltrequire.rb: Extension of the `require' understanding Libtool libraries. -EXTRA_DIST = ltrequire.rb +dist_ruby_SCRIPT = ltrequire.rb + +# A utility script to display images (not installed). +# FIXME: Is it still useful? +dist_noinst_ruby_SCRIPT = swilena_display.rb $(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ --- 10.261/tools/swilena/ruby/ltrequire.rb Thu, 13 Jul 2006 16:20:10 +0200 levill_r (oln/w/42_ltrequire. 1.2 644) +++ 10.262/tools/swilena/ruby/ltrequire.rb Fri, 20 Oct 2006 19:00:57 +0200 levill_r (oln/w/42_ltrequire. 1.3 644) @@ -35,12 +35,17 @@ if dlname.empty? raise "No dlname found in " + libtool_library end - if installed - filename = File.join(File.dirname(libtool_library), dlname) + + if $LTREQUIRE_NO_PATH_PREFIX then + # Simply return the name of the dynamic module. + dlname else - filename = File.join(File.dirname(libtool_library), '.libs', dlname) + if installed + File.join(File.dirname(libtool_library), dlname) + else + File.join(File.dirname(libtool_library), '.libs', dlname) + end end - filename end # Add a hook to Kernel.require to handle Libtool libraries. --- 10.261/oln.prj +++ 10.262/oln.prj @@ -1,17 +1,20 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 261) -(Parent-Version oln 10 260) +(Project-Version oln 10 262) +(Parent-Version oln 10 261) (Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> - Fix Pylena installation. + Fix Rblena installation. + + * ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb... + (dist_ruby_SCRIPT): ...here. + (ruby_SCRIPT): Add swilena_display.rb. + * ruby/ltrequire.rb: Update to latest version from clspr. - * python/Makefile.am (python_PYTHON): Add ltihooks.py. - (EXTRA_DIST): Remove. ") (New-Version-Log "") -(Checkin-Time "Fri, 20 Oct 2006 16:26:01 +0200") +(Checkin-Time "Fri, 20 Oct 2006 19:00:57 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -1051,7 +1054,7 @@ (tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644)) (tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744)) - (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.8 600)) + (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.9 600)) (tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644)) (tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755)) @@ -1513,7 +1516,7 @@ ;; Files added by populate at Tue, 11 Jul 2006 15:28:44 +0200, ;; to version 10.240(w), by levill_r: - (tools/swilena/ruby/ltrequire.rb (oln/w/42_ltrequire. 1.2 644)) + (tools/swilena/ruby/ltrequire.rb (oln/w/42_ltrequire. 1.3 644)) (tools/swilena/python/ltihooks.py (oln/w/43_ltihooks.p 1.1 644)) ;; Files added by populate at Tue, 11 Jul 2006 17:53:57 +0200,

18 years, 2 months

664: Add xtd mutators and disable mutable facilities of other functions.

by Thierry GERAUD

2006-10-20 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add mutators and disable mutable facilities of other functions. * xtd/mutator.hh: New. * xtd/abstract/mutable_fun.hh: New. * tests/accessor.cc: New. * xtd/res.hh: Add comment. * xtd/accessor.hh (xtd_decl_accessor): Disable mutable impl_op. (xtd_decl_accessor): Add static check. * xtd/abstract/open_nary_fun.hh (fun_operator_1): Disable mutable impl of default_case_ and add commented mutable_res. (open_nary_fun_<1,E>): Disable mutable version of operator(). * xtd/abstract/plain_nary_fun.hh (plain_nary_fun_<1,E>): Disable mutable version of operator(). * xtd/abstract/plain_fun.hh: Add commented code for xtd_mutable_res. * xtd/mfun.hh (m1fun_): Disable mutable version of impl_calc. * xtd/Makefile.am: Update. * tests/Makefile.am: Update. Index: xtd/res.hh =================================================================== --- xtd/res.hh (revision 663) +++ xtd/res.hh (working copy) @@ -84,6 +84,8 @@ # define xtd_expr_res(F, Args) typename xtd::internal::get_expr_res_< F, Args >::ret # define xtd_expr_res_(F, Args) xtd::internal::get_expr_res_< F, Args >::ret +// FIXME: Uncomment below. +// # define xtd_mutable_res_1(F, A1) typename xtd::internal::get_res_< F, A1 >::ret // internal so do not use it; prefer xtd_res_0(F) Index: xtd/mutator.hh =================================================================== --- xtd/mutator.hh (revision 0) +++ xtd/mutator.hh (revision 0) @@ -0,0 +1,97 @@ +// Copyright (C) 2006 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 XTD_MUTATOR_HH +# define XTD_MUTATOR_HH + +# include <mlc/typedef.hh> +# include <mlc/cmp.hh> + +# include <xtd/abstract/plain_nary_fun.hh> +# include <xtd/abstract/mutable_fun.hh> + + +# define xtd_decl_mutator(MethodName) \ + \ +namespace xtd \ +{ \ + \ + namespace mutator \ + { \ + struct MethodName##_type; \ + \ + mlc_decl_typedef(MethodName##_type); \ + \ + template <typename T> \ + struct ERROR__DECLARATION_typedef_OF_##MethodName##_type_NOT_FOUND_IN_; \ + } \ + \ + \ + template <typename A> \ + struct res_< mutator::MethodName##_type, A > \ + \ + : private mlc::assert_< mlc::neq_< mlc_typedef_in(mutator, A, MethodName##_type), \ + mlc::not_found >, \ + mutator::ERROR__DECLARATION_typedef_OF_##MethodName##_type_NOT_FOUND_IN_<A> > \ + \ + { \ + typedef mlc_typedef_in(mutator, A, MethodName##_type) ret; \ + }; \ + \ + namespace mutator \ + { \ + \ + struct MethodName##_type \ + \ + : public abstract::mutable_fun_< MethodName##_type > \ + { \ + template <typename A> \ + typename res_<MethodName##_type, A>::ret \ + impl_op(const A& arg) const \ + { \ + return arg.MethodName(); \ + } \ + \ + template <typename A> \ + typename res_<MethodName##_type, A>::ret & \ + impl_op(A& arg) const \ + { \ + return arg.MethodName(); \ + } \ + }; \ + \ + static const MethodName##_type MethodName; \ + \ + } \ + \ +} \ + \ +struct e_n_d__w_i_t_h__s_e_m_i_c_o_l_o_n + + + +#endif // ! XTD_MUTATOR_HH Index: xtd/accessor.hh =================================================================== --- xtd/accessor.hh (revision 663) +++ xtd/accessor.hh (working copy) @@ -28,54 +28,75 @@ #ifndef XTD_ACCESSOR_HH # define XTD_ACCESSOR_HH +# include <mlc/typedef.hh> +# include <mlc/cmp.hh> + # include <xtd/abstract/plain_nary_fun.hh> # include <xtd/mfun.hh> -# define xtd_decl_accessor(MethodName) \ - \ -namespace xtd \ -{ \ - \ - namespace accessor \ - { \ - template <typename T> struct MethodName##_; \ - } \ - \ - template <typename T> \ - struct fun_traits_< accessor::MethodName##_<T> > \ - { \ - typedef T arg_type; \ - typedef typename T::MethodName##_type res_type; \ - }; \ - \ - namespace accessor \ - { \ - \ - template <typename T> \ - struct MethodName##_ \ - : public xtd::abstract::plain_nary_fun_< 1, MethodName##_<T> > \ - { \ - xtd_res(MethodName##_<T>) impl_op(const T& arg) const \ - { \ - return arg.MethodName(); \ - } \ - xtd_res(MethodName##_<T>)& impl_op(T& arg) const \ - { \ - return arg.MethodName(); \ - } \ - }; \ - \ - typedef xtd::m1fun_<MethodName##_> MethodName##_type; \ - \ - static const MethodName##_type MethodName; \ - \ - } \ - \ -} \ - \ +# define xtd_decl_accessor(MethodName) \ + \ +namespace xtd \ +{ \ + \ + namespace accessor \ + { \ + template <typename T> struct MethodName##_; \ + \ + mlc_decl_typedef(MethodName##_type); \ + \ + template <typename T> \ + struct ERROR__DECLARATION_typedef_OF_##MethodName##_type_NOT_FOUND_IN_; \ + } \ + \ + template <typename T> \ + struct fun_traits_< accessor::MethodName##_<T> > \ + : private mlc::assert_< mlc::neq_< mlc_typedef_in(accessor, T, MethodName##_type), \ + mlc::not_found >, \ + accessor::ERROR__DECLARATION_typedef_OF_##MethodName##_type_NOT_FOUND_IN_<T> > \ + { \ + typedef T arg_type; \ + typedef mlc_typedef_in(accessor, T, MethodName##_type) res_type; \ + }; \ + \ + namespace accessor \ + { \ + \ + template <typename T> \ + struct MethodName##_ \ + : public xtd::abstract::plain_nary_fun_< 1, MethodName##_<T> >, \ + private mlc::assert_< mlc::neq_< mlc_typedef(T, MethodName##_type), \ + mlc::not_found >, \ + ERROR__DECLARATION_typedef_OF_##MethodName##_type_NOT_FOUND_IN_<T> > \ + { \ + xtd_res(MethodName##_<T>) impl_op(const T& arg) const \ + { \ + return arg.MethodName(); \ + } \ + }; \ + \ + typedef xtd::m1fun_<MethodName##_> MethodName##_type; \ + \ + static const MethodName##_type MethodName; \ + \ + } \ + \ +} \ + \ struct e_n_d__w_i_t_h__s_e_m_i_c_o_l_o_n +// FIXME: To be inserted above. +// In traits: +// typedef res_type & mutable_res_type; + +// In struct: +// xtd_mutable_res(MethodName##_<T>) impl_op(T& arg) const +// { +// return arg.MethodName(); +// } + + #endif // ! XTD_ACCESSOR_HH Index: xtd/abstract/mutable_fun.hh =================================================================== --- xtd/abstract/mutable_fun.hh (revision 0) +++ xtd/abstract/mutable_fun.hh (revision 0) @@ -0,0 +1,132 @@ +// Copyright (C) 2006 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 XTD_ABSTRACT_MUTABLE_FUN_HH +# define XTD_ABSTRACT_MUTABLE_FUN_HH + +# include <xtd/res.hh> +# include <xtd/abstract/plain_fun.hh> +# include <xtd/abstract/meta_fun.hh> + + +namespace xtd +{ + + namespace ERROR + { + struct ARG_SHOULD_NOT_BE_A_PLAIN_FUN; + struct ARG1_SHOULD_NOT_BE_A_PLAIN_FUN; + struct ARG2_SHOULD_NOT_BE_A_PLAIN_FUN; + struct ARG3_SHOULD_NOT_BE_A_PLAIN_FUN; + + struct ARG_SHOULD_NOT_BE_A_META_FUN; + + } // end of namespace xtd::ERROR + + + namespace tag + { + + struct mutable_fun_operator; + + } // end of namespace xtd::tag + + + // mutable_fun_<E>::operator()(const A& a) const + // mutable_fun_<E>::operator()(A& a) const + + template <typename E, typename A> + struct default_case_ < tag::mutable_fun_operator, + mlc::pair_<E, A> > + { + typedef typename res_<E, A>::ret res; + typedef res& mutable_res; + + static res impl(const E& target, + const A& a) + { + return target.impl_op(a); + } + + static mutable_res impl(const E& target, + A& a) + { + return target.impl_op(a); + } + }; + + + namespace abstract + { + + template <typename E> + class mutable_fun_ + + : public open_fun_<E> + { + public: + + template <typename A> + struct lcase_ + + : private mlc::assert_< mlc_is_not_a(A, xtd::abstract::plain_fun_), + xtd::ERROR::ARG_SHOULD_NOT_BE_A_PLAIN_FUN >, + + private mlc::assert_< mlc_is_not_a(A, xtd::abstract::meta_fun_), + xtd::ERROR::ARG_SHOULD_NOT_BE_A_META_FUN >, + + public xtd::case_< xtd::tag::mutable_fun_operator, + mlc::pair_<E, A> >::ret + {}; + + // Const version. + template <typename A> + typename lcase_<A>::res + operator()(const A& a) const + { + return lcase_<A>::impl(this->exact_(), a); + } + + // Mutable version. + template <typename A> + typename lcase_<A>::mutable_res + operator()(A& a) const + { + return lcase_<A>::impl(this->exact_(), a); + } + + protected: + mutable_fun_() {} + }; + + } // end of namespace xtd::abstract + + +} // end of namespace xtd + + +#endif // ! XTD_ABSTRACT_MUTABLE_FUN_HH Index: xtd/abstract/open_nary_fun.hh =================================================================== --- xtd/abstract/open_nary_fun.hh (revision 663) +++ xtd/abstract/open_nary_fun.hh (working copy) @@ -76,6 +76,7 @@ mlc::pair_<E, A> > { typedef xtd_res_1(E, A) res; +// typedef xtd_mutable_res_1(E, A) mutable_res; static res impl(const E& target, const A& a) @@ -83,12 +84,13 @@ return target.impl_calc(a); } - // The "mutable a" version below is dedicated to mutators. - static res& impl(const E& target, - A& a) - { - return target.impl_calc(a); - } + // FIXME: Uncomment below. +// // The "mutable a" version below is dedicated to mutators. +// static mutable_res impl(const E& target, +// A& a) +// { +// return target.impl_calc(a); +// } }; @@ -232,13 +234,14 @@ return case_<A>::impl(this->exact_(), a); } - // The "mutable a" version below is dedicated to mutators. - template <typename A> - typename case_<A>::res & - operator()(A& a) const - { - return case_<A>::impl(this->exact_(), a); - } + // FIXME: Uncomment below. +// // The "mutable a" version below is dedicated to mutators. +// template <typename A> +// typename case_<A>::res & +// operator()(A& a) const +// { +// return case_<A>::impl(this->exact_(), a); +// } protected: open_nary_fun_() {} Index: xtd/abstract/plain_nary_fun.hh =================================================================== --- xtd/abstract/plain_nary_fun.hh (revision 663) +++ xtd/abstract/plain_nary_fun.hh (working copy) @@ -144,11 +144,12 @@ return this->exact().impl_op(arg); } - // The "mutable arg" version below is dedicated to mutators. - xtd_res(E)& operator()(xtd_arg(E)& arg) const - { - return this->exact().impl_op(arg); - } + // FIXME: Uncomment below. +// // The "mutable arg" version below is dedicated to mutators. +// xtd_mutable_res(E) operator()(xtd_arg(E)& arg) const +// { +// return this->exact().impl_op(arg); +// } template <typename A> xtd_res(E) operator()(const A& arg) const Index: xtd/abstract/plain_fun.hh =================================================================== --- xtd/abstract/plain_fun.hh (revision 663) +++ xtd/abstract/plain_fun.hh (working copy) @@ -36,6 +36,8 @@ */ # define xtd_res(F) typename xtd::typedef_::res_type::from_< xtd::fun_traits_< F > >::ret +// FIXME: Uncomment below. +// # define xtd_mutable_res(F) typename xtd::typedef_::mutable_res_type::from_< xtd::fun_traits_< F > >::ret @@ -66,6 +68,8 @@ mlc_decl_typedef(res_type); + // FIXME: Uncomment below. +// mlc_decl_typedef(mutable_res_type); namespace abstract { Index: xtd/mfun.hh =================================================================== --- xtd/mfun.hh (revision 663) +++ xtd/mfun.hh (working copy) @@ -89,18 +89,20 @@ static const F_ f_; return f_(a); } - template <typename A> - xtd_res(F<A>)& impl_calc(A& a) const - // --------- - { - typedef F<A> F_; - mlc::assert_< mlc::and_< mlc_is_a(F_, abstract::plain_fun_), - mlc_is_a(F_, abstract::nary_fun_<1>) >, - xtd::ERROR::AN_xtd_m1fun_SHOULD_TAKE_AS_PARAMETER_AN_xtd_plain_nary_fun_WITH_n_BEING_1 - >::check(); - static const F_ f_; - return f_(a); - } + + // FIXME: Uncomment below. +// template <typename A> +// xtd_mutable_res(F<A>) impl_calc(A& a) const +// // --------- +// { +// typedef F<A> F_; +// mlc::assert_< mlc::and_< mlc_is_a(F_, abstract::plain_fun_), +// mlc_is_a(F_, abstract::nary_fun_<1>) >, +// xtd::ERROR::AN_xtd_m1fun_SHOULD_TAKE_AS_PARAMETER_AN_xtd_plain_nary_fun_WITH_n_BEING_1 +// >::check(); +// static const F_ f_; +// return f_(a); +// } }; Index: xtd/Makefile.am =================================================================== --- xtd/Makefile.am (revision 663) +++ xtd/Makefile.am (working copy) @@ -8,6 +8,7 @@ abstract/fun_nary_expr.hh \ abstract/meta_fun.hh \ abstract/meta_nary_fun.hh \ + abstract/mutable_fun.hh \ abstract/nary_fun.hh \ abstract/open_fun.hh \ abstract/open_nary_fun.hh \ @@ -44,6 +45,7 @@ math/tan.hh \ math/tanh.hh \ \ + accessor.hh \ arg.hh \ args.hh \ bind.hh \ @@ -53,6 +55,7 @@ math.hh \ mexpr.hh \ mfun.hh \ + mutator.hh \ optraits.hh \ res.hh \ traits.hh \ Index: tests/accessor.cc =================================================================== --- tests/accessor.cc (revision 0) +++ tests/accessor.cc (revision 0) @@ -0,0 +1,52 @@ +// Copyright (C) 2006 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. + +#include <cassert> +#include <xtd/accessor.hh> +#include <xtd/mutator.hh> + + +struct test +{ + typedef int member_type; + int member_; + int member() const { return member_; } + int& member() { return member_; } +}; + + +xtd_decl_accessor(member); +xtd_decl_mutator(member); + + +int main() +{ + test obj; + xtd::mutator::member(obj) = 51; + assert( xtd::accessor::member(obj) == 51 ); + assert( xtd::accessor::member(obj) == xtd::mutator::member(obj) ); +} Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 663) +++ tests/Makefile.am (working copy) @@ -15,6 +15,7 @@ check_PROGRAMS = \ abs \ + accessor \ bind \ cast \ cfun \ @@ -25,6 +26,7 @@ optraits abs_SOURCES = abs.cc +accessor_SOURCES = accessor.cc bind_SOURCES = bind.cc cast_SOURCES = cast.cc cfun_SOURCES = cfun.cc

18 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches