Olena-patches June 2006

olena-patches@lrde.epita.fr

2 participants
27 discussions

by Roland Levillain

Index: 10.226/oln.prj Only in 10.226(w): tools/swilena/meta/swilena_config.i Only in 10.226(w): tools/swilena/meta/swilena_basics.i Only in 10.226(w): tools/swilena/ruby/tests/sanity.rb Only in 10.226(w): tools/swilena/python/tests/sanity.py --- 10.226/oln.prj +++ 10.226(w)/oln.prj @@ -1524,6 +1524,15 @@ (olena/oln/morpho/abstract/attribute.hxx (oln/v/38_attribute. 1.1 600)) - (olena/oln/morpho/abstract/attribute.hh (oln/v/40_attribute. 1.1 600))) + (olena/oln/morpho/abstract/attribute.hh (oln/v/40_attribute. 1.1 600)) + +;; Files added by populate at Fri, 30 Jun 2006 17:41:53 +0200, +;; to version 10.226(w), by levill_r: + + (tools/swilena/meta/swilena_config.i ()) + (tools/swilena/meta/swilena_basics.i ()) + (tools/swilena/ruby/tests/sanity.rb ()) + (tools/swilena/python/tests/sanity.py ()) +) (Merge-Parents) (New-Merge-Parents)

17 years, 9 months

oln-0.10 10.226: Revive Swilena

by Roland Levillain

This patch fixes Swilena (both Pylena and Rblena) so that it works with current versions of SWIG and GCC. (I've omitted two files, they're in the next commit.) 2006-06-30 Roland Levillain <roland(a)lrde.epita.fr> Revive Swilena. * expand.sh (MODULES): Generate new SWIG interfaces: swilena_basics1d.i, swilena_basics2d.i, swilena_basics3d.i. Don't add `-lswigpy' nor `-lswigrb' to LDFLAGS when linking the C++ wrappers. Add a dependency-tracking mechanism for the generated C++ wrappers. * meta/swilena_basics.i, meta/swilena_config.i: New files. * meta/Makefile.am (EXTRA_DIST): Add swilena_basics.i and swilena_config.i. * meta/swilena_arith.i, meta/swilena_conversions.i, * meta/swilena_image.i * meta/swilena_imagesize.i, meta/swilena_morpho.i, * meta/swilena_ntg.i, meta/swilena_point.i, * meta/swilena_structelt.i, meta/swilena_w_win.i: Include swilena_config.i. * meta/swilena_arith.i, meta/swilena_conversions.i, * meta/swilena_image.i, * meta/swilena_structelt.i: Include swilena_basics' SWIG interfaces for 1-, 2- and 3-dimension images, and avoid code duplication. * generate_arith_instantiations.py (write_headers) * generate_conversions_instantiations.py (write_headers) * generate_morpho_instantiations.py (write_headers): Generate an %include statement for swilena_config.i. Generate an %include statement instead of an %import for swilena_image%(dim)sd.i. * meta/swilena_exception.i (START_PROTECT, END_PROTECT): Remove these guards. * meta/swilena_ntg.i (decl_complex, decl_ntg): Turn them into a ``function'' macros with an empty argument list to pacify swig. Adjust callers. * meta/swilena_structelt.i: Don't wrap the `T(unsigned n, const coord crd[])' ctor. * meta/swilena_image.i: Include swilena_exception.i. (oln::io::internal::anything): Ask swig not to generated a default ctor for this class. * meta/swilena_arith.i: Catch up with the new naming convention w.r.t. operators. * python/tests/sanity.py: New test. * python/tests/Makefile.am (dist_noinst_DATA): Add sanity.py. * ruby/tests/sanity.rb: New test. * ruby/tests/Makefile.am (dist_noinst_DATA): Add sanity.rb. (TESTS): Set to $(dist_noinst_DATA). Index: 10.225/tools/swilena/expand.sh --- 10.225/tools/swilena/expand.sh Tue, 20 Apr 2004 18:09:05 +0200 van-vl_n (oln/s/25_expand.sh 1.17 700) +++ 10.225(w)/tools/swilena/expand.sh Fri, 30 Jun 2006 12:00:33 +0200 levill_r (oln/s/25_expand.sh 1.17 700) @@ -12,9 +12,18 @@ MODULES="$MODULES ntg" for dim in 1 2 3; do + ## C++ header inclusions for basic types. + cat >"$SWILENA/src/swilena_basics${dim}d.i" <<EOF +// -*- C++ -*- +// Warning: this file was generated by expand.sh +%include swilena_basics.i +decl_basics($dim) +EOF + ## {1d,2d,3d} families for mod in point structelt w_win imagesize image; do cat >"$SWILENA/src/swilena_$mod${dim}d.i" <<EOF +// -*- C++ -*- // Warning: this file was generated by expand.sh %module swilena_$mod${dim}d %include swilena_$mod.i @@ -79,8 +88,7 @@ INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = -shared -lswigpy \$(ZLIB_LDFLAGS) - +AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) EOF } @@ -130,9 +138,31 @@ else sdir=meta fi - echo "swilena_${mod}_wrap.cxx swilena_${mod}.py: \$(srcdir)/../$sdir/swilena_${mod}.i" - echo -e "\t\$(SWIG) \$(SWIG_FLAGS) -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" - echo + # Rule generating a C++ (*_wrap.cc) and a Python (*.py) wrappers from a + # SWIG interface. + # + # FIXME: The generation of the Python wrapper is separated from + # the one of the C++ wrapper in this version, and that's not good. + # We should use Make's trick for multipIndex: 10.225/tools/swilena/meta/Makefile.am Index: 10.225/tools/swilena/meta/swilena_w_win.i Index: 10.225/tools/swilena/meta/swilena_structelt.i le outputs (with timestamps) + # here. + base="swilena_${mod}" + src="\$(srcdir)/../$sdir/$base.i" + dest="${base}_wrap.cxx" + cat <<EOF +$dest: $src + if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + then \\ + mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ + else \\ + rm -f "\$(DEPDIR)/${base}_wrap.Tcc"; exit 1; \\ + fi + +@AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ + +$base.py: $src + \$(MAKE) \$(AM_MAKEFLAGS) $dest + +EOF done } @@ -150,7 +180,9 @@ INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) +# FIXME: Modern versions of swig don't use libswigpy. +#AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) +AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) EOF } @@ -178,9 +210,31 @@ else sdir=meta fi - echo "swilena_${mod}_wrap.cxx: \$(srcdir)/../$sdir/swilena_${mod}.i" - echo -e "\t\$(SWIG) \$(SWIG_FLAGS) -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" - echo + # Rule generating a C++ (*_wrap.cc) and a Ruby (*.rb) wrappers from a + # SWIG interface. + # + # FIXME: The generation of the Ruby wrapper is separated from + # the one of the C++ wrapper in this version, and that's not good. + # We should use Make's trick for multiple outputs (with timestamps) + # here. + base="swilena_${mod}" + src="\$(srcdir)/../$sdir/$base.i" + dest="${base}_wrap.cxx" + cat <<EOF +$dest: $src + if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + then \\ + mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ + else \\ + rm -f "\$(DEPDIR)/${base}_wrap.Tcc"; exit 1; \\ + fi + +@AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ + +$base.rb: $src + \$(MAKE) \$(AM_MAKEFLAGS) $dest + +EOF done } --- 10.225/tools/swilena/meta/Makefile.am Thu, 15 Apr 2004 15:40:44 +0200 van-vl_n (oln/s/26_Makefile.a 1.4 600) +++ 10.225(w)/tools/swilena/meta/Makefile.am Wed, 28 Jun 2006 15:26:35 +0200 levill_r (oln/s/26_Makefile.a 1.4 600) @@ -1,9 +1,8 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- -EXTRA_DIST = swilena_core.i swilena_decl.i swilena_describe.i \ - swilena_exception.i swilena_image.i swilena_imagesize.i \ - swilena_morpho.i swilena_arith.i swilena_conversions.i \ - swilena_ntg.i swilena_ntg_macros.i swilena_point.i \ - swilena_structelt.i \ +EXTRA_DIST = swilena_basics.i swilena_core.i swilena_config.i \ + swilena_decl.i swilena_describe.i swilena_exception.i \ + swilena_image.i swilena_imagesize.i swilena_morpho.i \ + swilena_arith.i swilena_conversions.i swilena_ntg.i \ + swilena_ntg_macros.i swilena_point.i swilena_structelt.i \ swilena_w_win.i - --- 10.225/tools/swilena/meta/swilena_w_win.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/27_swilena_w_ 1.2 600) +++ 10.225(w)/tools/swilena/meta/swilena_w_win.i Mon, 26 Jun 2006 17:48:30 +0200 levill_r (oln/s/27_swilena_w_ 1.2 600) @@ -1,5 +1,7 @@ // -*- C++ -*- +%include swilena_config.i + /*------------------------. | oln::w_window structure | `------------------------*/ --- 10.225/tools/swilena/meta/swilena_structelt.i Sat, 10 Apr 2004 19:36:38 +0200 van-vl_n (oln/s/28_swilena_st 1.4 600) +++ 10.225(w)/tools/swilena/meta/swilena_structelt.i Fri, 30 Jun 2006 16:45:14 +0200 levill_r (oln/s/28_swilena_st 1.4 600) @@ -1,5 +1,7 @@ // -*- C++ -*- +%include swilena_config.i + /*----------------------------------------------. | oln::window, and oln::neighborhood structures | `----------------------------------------------*/ @@ -31,8 +33,14 @@ structelt_methods(T, Dim) + // FIXME: SWIG is unable to wrap thisIndex: 10.225/tools/swilena/meta/swilena_point.i Index: 10.225/tools/swilena/meta/swilena_ntg.i Index: 10.225/tools/swilena/meta/swilena_morpho.i Index: 10.225/tools/swilena/meta/swilena_imagesize.i Index: 10.225/tools/swilena/meta/swilena_image.i Index: 10.225/tools/swilena/meta/swilena_exception.i ctor because of a strange + // invalid pointer conversion w.r.t. its second argument. Have a + // look at the SWIG manual for more details on how arrays are + // handled. +#if 0 // utility constructor T(unsigned n, const coord crd[]); +#endif // set operations %extend @@ -77,23 +85,9 @@ %include swilena_describe.i %include swilena_core.i -%import swilena_point ## Dim ## d.i +%include swilena_basics ## Dim ##d.i -#if Dim == 1 -%{ -#include <oln/basics1d.hh> -%} -#elif Dim == 2 -%{ -#include <oln/basics2d.hh> -%} -#elif Dim == 3 -%{ -#include <oln/basics3d.hh> -%} -#else -#error Unsupported dimension. -#endif +%import swilena_point ## Dim ## d.i namespace oln { --- 10.225/tools/swilena/meta/swilena_point.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/29_swilena_po 1.3 600) +++ 10.225(w)/tools/swilena/meta/swilena_point.i Mon, 26 Jun 2006 17:45:09 +0200 levill_r (oln/s/29_swilena_po 1.3 600) @@ -1,5 +1,7 @@ // -*- C++ -*- +%include swilena_config.i + /*--------------------------------------. | oln::point and oln::dpoint structures | `--------------------------------------*/ --- 10.225/tools/swilena/meta/swilena_ntg.i Sun, 11 Apr 2004 22:22:47 +0200 van-vl_n (oln/s/33_swilena_nt 1.9 600) +++ 10.225(w)/tools/swilena/meta/swilena_ntg.i Mon, 26 Jun 2006 18:20:22 +0200 levill_r (oln/s/33_swilena_nt 1.9 600) @@ -1,6 +1,9 @@ -%module swilena_ntg +%module swilena_ntg // -*- C++ -*- + +%include swilena_config.i %include swilena_exception.i + /***** Generic class declaration for scalars ******/ /* Predecls */ @@ -157,7 +160,7 @@ }; %enddef -%define decl_complex +%define decl_complex() template<typename repr, typename T> class cplx { @@ -186,7 +189,7 @@ %enddef // Swig preprocessor does not understand empty call to macros. -%define decl_ntg +%define decl_ntg() %include <ntg/vect/cplx_representation.hh> %include <ntg/core/predecls.hh> %{ @@ -202,12 +205,12 @@ decl_scalar_class(ntg, int_s, long) decl_bin_class(ntg, bin, bool) - decl_complex + decl_complex() } %enddef -decl_ntg +decl_ntg() /* Macro are defined for every type and should be used in all modules @@ -238,4 +241,3 @@ %template(cplx_rect) ntg::cplx< ntg::rect, ntg_float >; %template(cplx_polar) ntg::cplx< ntg::polar, ntg_float >; - --- 10.225/tools/swilena/meta/swilena_morpho.i Sun, 11 Apr 2004 22:22:47 +0200 van-vl_n (oln/s/34_swilena_mo 1.4 600) +++ 10.225(w)/tools/swilena/meta/swilena_morpho.i Mon, 26 Jun 2006 18:34:09 +0200 levill_r (oln/s/34_swilena_mo 1.4 600) @@ -2,6 +2,8 @@ %module swilena_morpho +%include swilena_config.i + /* Algorithms are supported by a simple two-level mechanism: --- 10.225/tools/swilena/meta/swilena_imagesize.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/35_swilena_im 1.2 600) +++ 10.225(w)/tools/swilena/meta/swilena_imagesize.i Mon, 26 Jun 2006 17:48:52 +0200 levill_r (oln/s/35_swilena_im 1.2 600) @@ -1,5 +1,7 @@ // -*- C++ -*- +%include swilena_config.i + /*---------------------------. | oln::image_size structures | `---------------------------*/ --- 10.225/tools/swilena/meta/swilena_image.i Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/s/36_swilena_im 1.7 600) +++ 10.225(w)/tools/swilena/meta/swilena_image.i Wed, 28 Jun 2006 18:39:39 +0200 levill_r (oln/s/36_swilena_im 1.7 600) @@ -1,26 +1,18 @@ // -*- C++ -*- +%include swilena_config.i + %define decl_image(Dim) %include swilena_describe.i +%include swilena_exception.i %include swilena_core.i +%include swilena_basics ## Dim ## d.i + %import swilena_imagesize ## Dim ## d.i %import swilena_point ## Dim ## d.i -#if Dim == 1 -%{ -#include <oln/basics1d.hh> -%} -#elif Dim == 2 -%{ -#include <oln/basics2d.hh> -%} -#elif Dim == 3 -%{ -#include <oln/basics3d.hh> -%} -#endif - +%nodefaultctor oln::io::internal::anything; namespace oln { template<typename T> --- 10.225/tools/swilena/meta/swilena_exception.i Sun, 11 Apr 2004 22:22:47 +0200 van-vl_n (oln/s/37_swilena_ex 1.4 600) +++ 10.225(w)/tools/swilena/meta/swilena_exception.i Fri, 30 Jun 2006 12:14:15 +020Index: 10.225/tools/swilena/meta/swilena_describe.i Index: 10.225/tools/swilena/python/tests/Makefile.am Index: 10.225/tools/swilena/ruby/tests/Makefile.am Index: 10.225/tools/swilena/generate_morpho_instantiations.py Index: 10.225/tools/swilena/meta/swilena_ntg_macros.i Index: 10.225/tools/swilena/meta/swilena_arith.i 0 levill_r (oln/s/37_swilena_ex 1.4 600) @@ -9,7 +9,6 @@ // Olena uses classes that derive from std::exception. Declare it. namespace std { class exception { public: const char *what() const; }; } -%define START_PROTECT %exception { try { $action @@ -24,10 +23,3 @@ SWIG_exception(SWIG_UnknownError, __FUNCTION__); } } -%enddef - -%define END_PROTECT -%exception; -%enddef - -START_PROTECT --- 10.225/tools/swilena/meta/swilena_describe.i Sat, 27 Sep 2003 18:32:13 +0200 burrus_n (oln/s/38_swilena_de 1.3 600) +++ 10.225(w)/tools/swilena/meta/swilena_describe.i Fri, 23 Jun 2006 10:58:27 +0200 levill_r (oln/s/38_swilena_de 1.3 600) @@ -1,4 +1,4 @@ -%include std_string.i +%include std_string.i // -*- C++ -*- %{ #include <sstream> %} --- 10.225/tools/swilena/python/tests/Makefile.am Mon, 19 Apr 2004 13:05:44 +0200 thivol_d (oln/v/15_Makefile.a 1.6 600) +++ 10.225(w)/tools/swilena/python/tests/Makefile.am Wed, 28 Jun 2006 17:52:10 +0200 levill_r (oln/v/15_Makefile.a 1.6 600) @@ -3,7 +3,7 @@ ## Makefile.am for swilena/python/tests ## -dist_noinst_DATA = arith.py conversions.py simple1.py morpho.py +dist_noinst_DATA = sanity.py arith.py conversions.py simple1.py morpho.py TESTS_ENVIRONMENT = \ PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ --- 10.225/tools/swilena/ruby/tests/Makefile.am Mon, 19 Apr 2004 13:05:44 +0200 thivol_d (oln/v/18_Makefile.a 1.5 600) +++ 10.225(w)/tools/swilena/ruby/tests/Makefile.am Fri, 30 Jun 2006 13:47:58 +0200 levill_r (oln/v/18_Makefile.a 1.5 600) @@ -1,12 +1,12 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- ## -## Makefile.am for swilena/python/tests +## Makefile.am for swilena/ruby/tests ## TESTS_ENVIRONMENT = \ SWILENA_PATH=".." \ IMGDIR="$(top_srcdir)/olena/img" -TESTS = simple1.rb +dist_noinst_DATA = sanity.rb simple1.rb -dist_noinst_DATA = simple1.rb +TESTS = $(dist_noinst_DATA) --- 10.225/tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 12:56:30 +0200 van-vl_n (oln/v/24_generate_m 1.8 700) +++ 10.225(w)/tools/swilena/generate_morpho_instantiations.py Wed, 28 Jun 2006 15:47:12 +0200 levill_r (oln/v/24_generate_m 1.8 700) @@ -27,6 +27,8 @@ %%module swilena_morpho%(dim)sd_%(str_type)s +%%include swilena_config.i + %%include swilena_exception.i %%include swilena_ntg_macros.i @@ -34,7 +36,7 @@ %%include swilena_morpho.i -%%import swilena_image%(dim)sd.i +%%include swilena_image%(dim)sd.i """ % vars()) --- 10.225/tools/swilena/meta/swilena_ntg_macros.i Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/v/39_swilena_nt 1.1 600) +++ 10.225(w)/tools/swilena/meta/swilena_ntg_macros.i Tue, 27 Jun 2006 16:28:56 +0200 levill_r (oln/v/39_swilena_nt 1.1 600) @@ -1,3 +1,4 @@ +// -*- C++ -*- // FIXME: avoid code repetitions! #define ntg_bin ntg::bin --- 10.225/tools/swilena/meta/swilena_arith.i Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/48_swilena_ar 1.1 600) +++ 10.225(w)/tools/swilena/meta/swilena_arith.i Wed, 28 Jun 2006 16:33:37 +0200 levill_r (oln/v/48_swilena_ar 1.1 600) @@ -1,23 +1,13 @@ // -*- C++ -*- +%include swilena_config.i + %include swilena_describe.i %include swilena_core.i %define decl_arith(Dim) -#if Dim == 1 -%{ -#include <oln/basics1d.hh> -%} -#elif Dim == 2 -%{ -#include <oln/basics2d.hh> -%} -#elif Dim == 3 -%{ -#include <oln/basics3d.hh> -%} -#endif +%include swilena_basics ## Dim ## d.i %{ #include <oln/arith/ops.hh> @@ -27,27 +17,27 @@ template<class R, class I1, class I2> static R my_plus(const I1& i1, const I2& i2) - { return ::oln::arith::plus<R>(i1, i2); } + { return ::oln::arith::plus_with_ret<R>(i1, i2); } template<class R, class I1, class I2> static R my_minus(const I1& i1, const I2& i2) - { return ::oln::arith::minus<R>(i1, i2); } + { return ::oln::arith::minus_with_ret<R>(i1, i2); } template<class R, class I1, class I2> static R my_times(const I1& i1, const I2& i2) - { return ::oln::arith::times<R>(i1, i2); } + { return ::oln::arith::times_with_ret<R>(i1, i2); } template<class R, class I1, class I2> staIndex: 10.225/tools/swilena/meta/swilena_conversions.i Index: 10.225/tools/swilena/generate_conversions_instantiations.py Index: 10.225/tools/swilena/generate_arith_instantiations.py Index: 10.225/tools/swilena/python/tests/arith.py tic R my_div(const I1& i1, const I2& i2) - { return ::oln::arith::div<R>(i1, i2); } + { return ::oln::arith::div_with_ret<R>(i1, i2); } template<class R, class I1, class I2> static R my_min(const I1& i1, const I2& i2) - { return ::oln::arith::min<R>(i1, i2); } + { return ::oln::arith::min_with_ret<R>(i1, i2); } template<class R, class I1, class I2> static R my_max(const I1& i1, const I2& i2) - { return ::oln::arith::max<R>(i1, i2); } + { return ::oln::arith::max_with_ret<R>(i1, i2); } %} --- 10.225/tools/swilena/meta/swilena_conversions.i Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/49_swilena_co 1.1 600) +++ 10.225(w)/tools/swilena/meta/swilena_conversions.i Wed, 28 Jun 2006 16:34:19 +0200 levill_r (oln/v/49_swilena_co 1.1 600) @@ -1,28 +1,17 @@ // -*- C++ -*- +%include swilena_config.i +%include swilena_basics.i + %include swilena_describe.i %include swilena_core.i %define decl_conversions(Dim) -%{ -#include <oln/convert/basics.hh> -%} - -// FIXME: not very elegant, but %{ %} blocks are not preprocessed. +%include swilena_basics ## Dim ## d.i -#if Dim == 1 %{ -#include <oln/basics1d.hh> -%} -#elif Dim == 2 -%{ -#include <oln/basics2d.hh> -%} -#elif Dim == 3 -%{ -#include <oln/basics3d.hh> +#include <oln/convert/basics.hh> %} -#endif %enddef --- 10.225/tools/swilena/generate_conversions_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/50_generate_c 1.1 700) +++ 10.225(w)/tools/swilena/generate_conversions_instantiations.py Wed, 28 Jun 2006 15:47:36 +0200 levill_r (oln/v/50_generate_c 1.1 700) @@ -19,10 +19,12 @@ %%module swilena_conversions%(dim)sd +%%include swilena_config.i + %%include swilena_exception.i %%include swilena_ntg_macros.i -%%import swilena_image%(dim)sd.i +%%include swilena_image%(dim)sd.i %%import swilena_ntg.i %%include swilena_conversions.i --- 10.225/tools/swilena/generate_arith_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/51_generate_a 1.1 700) +++ 10.225(w)/tools/swilena/generate_arith_instantiations.py Wed, 28 Jun 2006 15:47:24 +0200 levill_r (oln/v/51_generate_a 1.1 700) @@ -19,13 +19,15 @@ %%module swilena_arith%(dim)sd +%%include swilena_config.i + %%include swilena_exception.i %%include swilena_ntg_macros.i %%import swilena_ntg.i %%include swilena_arith.i -%%import swilena_image%(dim)sd.i +%%include swilena_image%(dim)sd.i decl_arith(%(dim)s) --- 10.225/tools/swilena/python/tests/arith.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/w/0_arith.py 1.1 700) +++ 10.225(w)/tools/swilena/python/tests/arith.py Wed, 28 Jun 2006 14:48:10 +0200 levill_r (oln/w/0_arith.py 1.1 700) @@ -2,8 +2,8 @@ import os import sys -from swilena_arith2d import * from swilena_image2d import * +from swilena_arith2d import * imgdir = os.environ['IMGDIR']

17 years, 9 months

oln-0.10 10.225: Re-enable the third form of operator

by Roland Levillain

2006-06-30 Roland Levillain <roland(a)lrde.epita.fr> * oln/arith/internal/opdecls.hh (oln_arith_declare_binop_procs_): Re-enable the third operator, but rename it as OPNAME_with_ret. * oln/morpho/geodesic_erosion.hh: Typos in comments. Index: 10.224/olena/oln/arith/internal/opdecls.hh --- 10.224/olena/oln/arith/internal/opdecls.hh Thu, 22 Jun 2006 10:49:20 +0200 levill_r (oln/b/22_opdecls.hh 1.20 600) +++ 10.224(w)/olena/oln/arith/internal/opdecls.hh Fri, 30 Jun 2006 11:40:04 +0200 levill_r (oln/b/22_opdecls.hh 1.20 600) @@ -1,4 +1,5 @@ -// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004, 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 @@ -175,9 +176,41 @@ #define default_functor_return_type_cst_(OPNAME, I1, T2) \ typename default_functor_type_cst_(OPNAME, I1, T2)::result_type -/// Declare front-end functions. +/** \def Declare front-end functions. + + OPNAME_with_ret used to be named OPNAME previously, but it caused + ambiguous calls with modern (and more compliant) compilers + (GCC 4.0, GCC 4.1, ICC 9.1). These compilers consider that + + \code + OPNAME<T>(ima1, ima2); + \endcode + + could be both interpreted as a call to + + \code + template<class I1, class I2> inline + typename arith_return_type_proxy_##OPNAME##_<I1, I2>::ret + OPNAME(const abstract::image<I1>& input1, + const abstract::image<I2>& input2) + + (with I1 = T and I2 = typeof(ima2)) + \endcode + + as well as a call to + + \code + template<class IRet, class I1, class I2> inline + typename mute<I1, oln_value_type(IRet)>::ret + OPNAME(const abstract::image<I1>& input1, + const abstract::image<I2>& input2) + + (with IRet = T, I1 = typeof(ima1), I2 = typeof(ima2)). + \endcode + + Using different names for these operators removes the ambiguity. */ # define oln_arith_declare_binop_procs_(OPNAME) \ - /* \ + /* \ FIXME: this is a workaround for an odd bug of icc and como \ http://www.lrde.epita.fr/cgi-bin/twiki/view/Know/MysteriousTemplateFunction… \ Remove this traits and use its content directly when this bug gets fixed. \ @@ -218,41 +251,21 @@ T2, \ ntg_return_type(OPNAME, T1, T2)>()), \ input1, input2); \ + } \ + \ + /* Same as above, with inline conversion in the functor. */ \ + /* This operator has a `_with_ret' suffix for disambiguation purpose */ \ + /* (see above). */ \ + template<class IRet, class I1, class I2> inline \ + typename mute<I1, oln_value_type(IRet)>::ret \ + OPNAME##_with_ret(const abstract::image<I1>& input1, const abstract::image<I2>& input2) \ + { \ + return apply2(f_##OPNAME<oln_value_type(I1), \ + oln_value_type(I2), \ + oln_value_type(IRet)>(), \ + input1, input2); \ } -/* FIXME: Used to be part from the previous macro, but causes ambiguous - calls with G++ 4.0 and 4.1: theses compiler seems to consider that - - OPNAME(ima1, ima2); - - could be both interpreted as a call to - template<class I1, class I2> inline - typename arith_return_type_proxy_##OPNAME##_<I1, I2>::ret - OPNAME(const abstract::image<I1>& input1, - const abstract::image<I2>& input2) - - or - - template<class IRet, class I1, class I2> inline - typename mute<I1, oln_value_type(IRet)>::ret - OPNAME(const abstract::image<I1>& input1, - const abstract::image<I2>& input2) - - despite the fact that this call doesn't resolve the first parameter - (`IRet') of the second version. It might be a bug in the 4.x branch - of G++. */ -// -// -// /* Same as above, with inline conversion in the functor. */ -// template<class IRet, class I1, class I2> inline -// typename mute<I1, oln_value_type(IRet)>::ret -// OPNAME(const abstract::image<I1>& input1, const abstract::image<I2>& input2) -// { -// return apply2(f_##OPNAME<oln_value_type(I1), -// oln_value_type(I2), -// oln_value_type(IRet)>(), -// input1, input2); -// } /// Apply OPNAME with a constant as second operand. # define oln_arith_declare_binopcst_procs_(OPNAME) \ Index: 10.224/olena/oln/morpho/geodesic_erosion.hh --- 10.224/olena/oln/morpho/geodesic_erosion.hh Wed, 14 Apr 2004 00:08:50 +0200 thivol_d (oln/36_geodesic_e 1.20 600) +++ 10.224(w)/olena/oln/morpho/geodesic_erosion.hh Fri, 23 Jun 2006 18:45:56 +0200 levill_r (oln/36_geodesic_e 1.20 600) @@ -47,7 +47,7 @@ ** \param N Exact type of neighborhood. ** ** \arg marker Image to work on. - ** \arg mask Image used for geodesic dilation. + ** \arg mask Image used for geodesic erosion. ** \arg Ng Neighborhood to use. ** ** Compute the geodesic erosion of marker with respect to the @@ -104,13 +104,13 @@ ** \param N Exact type of neighborhood. ** ** \arg marker Image to work on. - ** \arg mask Image used for geodesic dilation. + ** \arg mask Image used for geodesic erosion. ** \arg Ng Neighborhood to use. ** - ** Compute the geodesic erosion of marker with respect to the - ** mask mask image using se as structural element. Soille + ** Compute the geodesic erosion of marker with respect to the + ** mask image using se as structural element. Soille ** p.156. Computation is performed by hand (i.e without calling - ** dilation). + ** erosion). ** ** \pre Marker must be greater or equal than mask. **

17 years, 9 months

oln-0.10 10.224: Update SWIG_FLAGS settings

by Roland Levillain

2006-06-30 Roland Levillain <roland(a)lrde.epita.fr> * config/oln.m4 (AC_CHECK_SWIG_FLAGS): Don't check for the `-c' nor the `-noruntime' flags. Index: 10.223/config/oln.m4 --- 10.223/config/oln.m4 Thu, 15 Sep 2005 17:50:38 +0200 levill_r (oln/j/15_oln.m4 1.38.1.11 600) +++ 10.223(w)/config/oln.m4 Fri, 30 Jun 2006 11:52:07 +0200 levill_r (oln/j/15_oln.m4 1.38.1.11 600) @@ -319,25 +319,28 @@ AC_LANG_POP([C++]) ]) -# Recent versions of SWIG use -nountime instead of -c +# Recent versions of SWIG no longer link with a runtime library (the +# runtime is embedded in the C++ wrapper). +# FIXME: Clean up. AC_DEFUN([AC_CHECK_SWIG_FLAGS], [dnl - AC_CACHE_CHECK([for SWIG supports for -noruntime], - [ac_cv_swig_flags], - [if $SWIG -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then - ac_cv_swig_flags=recent - else - ac_cv_swig_flags=old - fi]) - case "$ac_cv_swig_flags" in - recent) - SWIG_FLAGS="-noruntime" - ;; - old) - SWIG_FLAGS="-c" - ;; - esac +# AC_CACHE_CHECK([for SWIG supports for -noruntime], +# [ac_cv_swig_flags], +# [if $SWIG -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then +# ac_cv_swig_flags=recent +# else +# ac_cv_swig_flags=old +# fi]) +# case "$ac_cv_swig_flags" in +# recent) +# SWIG_FLAGS="-noruntime" +# ;; +# old) +# SWIG_FLAGS="-c" +# ;; +# esac + SWIG_FLAGS='' AC_SUBST([SWIG_FLAGS]) ]) Index: 10.223/config/oln-local.m4 --- 10.223/config/oln-local.m4 Sun, 21 Sep 2003 23:54:00 +0200 burrus_n (oln/p/37_oln-local. 1.7 600) +++ 10.223(w)/config/oln-local.m4 Fri, 23 Jun 2006 17:27:01 +0200 levill_r (oln/p/37_oln-local. 1.7 600) @@ -57,6 +57,7 @@ AC_CONFIG_FILES([metalic/tests/$1/Makefile]) fi])dnl End of MLC_TESTS +# FIXME: Improve this (see TC's swig.m4). AC_DEFUN([AC_CHECK_SWIG13], [dnl AC_ARG_VAR([SWIG], [the SWIG interface generator])

17 years, 9 months

506: Remove scool compiler.

by Quentin Hocquet

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Quentin Hocquet <quentin.hocquet(a)lrde.epita.fr> Remove scool compiler. Scool compiler has been moved into its own repository. * tools: Remove. * tools/test.yml: Remove. * tools/tests: Remove. * tools/tests/syntax error: Remove. * tools/tests/syntax error/wrong.scl: Remove. * tools/tests/parse-ref: Remove. * tools/tests/parse-ref/vardec.ref: Remove. * tools/tests/parse-ref/fundec.ref: Remove. * tools/tests/parse-ref/funcall_no-args.ref: Remove. * tools/tests/parse-ref/empty-class_dec.ref: Remove. * tools/tests/parse-ref/varinit.ref: Remove. * tools/tests/parse-ref/emtpy-class_dec.ref: Remove. * tools/tests/parse-ref/no-args_funtype.ref: Remove. * tools/tests/parse-ref/class_dec.ref: Remove. * tools/tests/parse-ref/manydec.ref: Remove. * tools/tests/parse-ref/wiki1.ref: Remove. * tools/tests/parse-ref/bi-exp.ref: Remove. * tools/tests/parse-ref/funcall.ref: Remove. * tools/tests/parse-ref/wiki2.ref: Remove. * tools/tests/parse-ref/function.ref: Remove. * tools/tests/parse-ref/consinit.ref: Remove. * tools/tests/parse-ref/wiki3.ref: Remove. * tools/tests/parse-ref/funtype.ref: Remove. * tools/tests/parse-ref/empty.ref: Remove. * tools/tests/parse-ref/type_static-call.ref: Remove. * tools/tests/parse-ref/guard.ref: Remove. * tools/tests/good: Remove. * tools/tests/good/type_static-call.scl: Remove. * tools/tests/good/guard.scl: Remove. * tools/tests/good/vardec.scl: Remove. * tools/tests/good/fundec.scl: Remove. * tools/tests/good/funcall_no-args.scl: Remove. * tools/tests/good/varinit.scl: Remove. * tools/tests/good/empty-class_dec.scl: Remove. * tools/tests/good/manydec.scl: Remove. * tools/tests/good/no-args_funtype.scl: Remove. * tools/tests/good/class_dec.scl: Remove. * tools/tests/good/wiki1.scl: Remove. * tools/tests/good/funcall.scl: Remove. * tools/tests/good/bi-exp.scl: Remove. * tools/tests/good/function.scl: Remove. * tools/tests/good/wiki2.scl: Remove. * tools/tests/good/consinit.scl: Remove. * tools/tests/good/wiki3.scl: Remove. * tools/tests/good/funtype.scl: Remove. * tools/tests/good/empty.scl: Remove. * tools/transformer: Remove. * tools/transformer/scoolc.str: Remove. * tools/transformer/Makefile: Remove. * tools/scoolc: Remove. * tools/gen.yml: Remove. * tools/parser: Remove. * tools/parser/grammar: Remove. * tools/parser/grammar/Class.sdf: Remove. * tools/parser/grammar/Decl.sdf: Remove. * tools/parser/grammar/Exp.sdf: Remove. * tools/parser/grammar/Scool.sdf: Remove. * tools/parser/grammar/ExpOrType.sdf: Remove. * tools/parser/grammar/Type.sdf: Remove. * tools/parser/grammar/Lexical.sdf: Remove. * tools/parser/grammar/Guard.sdf: Remove. * tools/parser/grammar/Stm.sdf: Remove. * tools/parser/parse-scool: Remove. * tools/parser/Makefile: Remove. * tools/Makefile: Remove. Makefile | 14 ---------- gen.yml | 9 ------ parser/Makefile | 20 -------------- parser/grammar/Class.sdf | 18 ------------- parser/grammar/Decl.sdf | 48 ----------------------------------- parser/grammar/Exp.sdf | 43 ------------------------------- parser/grammar/ExpOrType.sdf | 12 -------- parser/grammar/Guard.sdf | 10 ------- parser/grammar/Lexical.sdf | 28 -------------------- parser/grammar/Scool.sdf | 11 -------- parser/grammar/Stm.sdf | 17 ------------ parser/grammar/Type.sdf | 18 ------------- parser/parse-scool | 8 ----- scoolc | 4 -- test.yml | 18 ------------- tests/good/bi-exp.scl | 1 tests/good/class_dec.scl | 15 ---------- tests/good/consinit.scl | 1 tests/good/empty-class_dec.scl | 1 tests/good/funcall.scl | 4 -- tests/good/funcall_no-args.scl | 4 -- tests/good/function.scl | 4 -- tests/good/fundec.scl | 2 - tests/good/funtype.scl | 1 tests/good/guard.scl | 1 tests/good/manydec.scl | 4 -- tests/good/no-args_funtype.scl | 1 tests/good/type_static-call.scl | 1 tests/good/vardec.scl | 1 tests/good/varinit.scl | 1 tests/good/wiki1.scl | 9 ------ tests/good/wiki2.scl | 5 --- tests/good/wiki3.scl | 9 ------ tests/parse-ref/bi-exp.ref | 1 tests/parse-ref/class_dec.ref | 1 tests/parse-ref/consinit.ref | 1 tests/parse-ref/empty-class_dec.ref | 1 tests/parse-ref/empty.ref | 1 tests/parse-ref/funcall.ref | 1 tests/parse-ref/funcall_no-args.ref | 1 tests/parse-ref/function.ref | 1 tests/parse-ref/fundec.ref | 1 tests/parse-ref/funtype.ref | 1 tests/parse-ref/guard.ref | 1 tests/parse-ref/manydec.ref | 1 tests/parse-ref/no-args_funtype.ref | 1 tests/parse-ref/type_static-call.ref | 1 tests/parse-ref/vardec.ref | 1 tests/parse-ref/varinit.ref | 1 tests/parse-ref/wiki1.ref | 1 tests/parse-ref/wiki2.ref | 1 tests/parse-ref/wiki3.ref | 1 tests/syntax | 1 transformer/Makefile | 6 ---- transformer/scoolc.str | 6 ---- 55 files changed, 375 deletions(-) Index: tools/test.yml --- tools/test.yml (revision 505) +++ tools/test.yml (working copy) @@ -1,18 +0,0 @@ ---- -Test of the Scool parser: !S::Suite - contents: - - Valid input tests: !S::Iterate - over: !pathlist <<pwd>>/tests/good/(*).scl - iter: [it_file, it_name] - test: - Test <<it_name>>: !S::Cmd - command: parser/parse-scool "<<it_file>>" - exit: 0 - output: !path "tests/parse-ref/<<it_name>>.ref" - - Wrong input tests: !S::Iterate - over: !pathlist "<<pwd>>/tests/syntax error/(*).scl" - iter: [it_file, it_name] - test: - Test <<it_name>>: !S::Cmd - command: parser/parse-scool "<<it_file>>" - exit: 1 Index: tools/tests/syntax error/wrong.scl --- tools/tests/syntax error/wrong.scl (revision 505) +++ tools/tests/syntax error/wrong.scl (working copy) @@ -1 +0,0 @@ -var i::int; Index: tools/tests/parse-ref/vardec.ref --- tools/tests/parse-ref/vardec.ref (revision 505) +++ tools/tests/parse-ref/vardec.ref (working copy) @@ -1 +0,0 @@ -Program([VarDec("i",Var("int"))]) Index: tools/tests/parse-ref/fundec.ref --- tools/tests/parse-ref/fundec.ref (revision 505) +++ tools/tests/parse-ref/fundec.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("f",[("a",Var("int")),("b",Var("int"))],Var("bool"),[])]) Index: tools/tests/parse-ref/funcall_no-args.ref --- tools/tests/parse-ref/funcall_no-args.ref (revision 505) +++ tools/tests/parse-ref/funcall_no-args.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("doit",[],Var("int"),[Return(FunCall("chiche",[]))])]) Index: tools/tests/parse-ref/empty-class_dec.ref --- tools/tests/parse-ref/empty-class_dec.ref (revision 505) +++ tools/tests/parse-ref/empty-class_dec.ref (working copy) @@ -1 +0,0 @@ -Program([ConsDec("foo",Class,Class([]))]) Index: tools/tests/parse-ref/varinit.ref --- tools/tests/parse-ref/varinit.ref (revision 505) +++ tools/tests/parse-ref/varinit.ref (working copy) @@ -1 +0,0 @@ -Program([VarDec("i",Var("int"),Int("42"))]) Index: tools/tests/parse-ref/emtpy-class_dec.ref Index: tools/tests/parse-ref/no-args_funtype.ref --- tools/tests/parse-ref/no-args_funtype.ref (revision 505) +++ tools/tests/parse-ref/no-args_funtype.ref (working copy) @@ -1 +0,0 @@ -Program([VarDec("f",FunType([],Var("void")))]) Index: tools/tests/parse-ref/class_dec.ref --- tools/tests/parse-ref/class_dec.ref (revision 505) +++ tools/tests/parse-ref/class_dec.ref (working copy) @@ -1 +0,0 @@ -Program([ConsDec("point",Class,Class([Accessblock(Public,[FunDec("x",[],Var("int"),[Return(Var("x"))])]),Accessblock(Private,[VarDec("x",Var("int")),VarDec("y",Var("int"))])]))]) Index: tools/tests/parse-ref/manydec.ref --- tools/tests/parse-ref/manydec.ref (revision 505) +++ tools/tests/parse-ref/manydec.ref (working copy) @@ -1 +0,0 @@ -Program([ConsDec("answer",Var("int"),Int("42")),VarDec("i",Var("int")),VarDec("j",Var("int"),Var("i"))]) Index: tools/tests/parse-ref/wiki1.ref --- tools/tests/parse-ref/wiki1.ref (revision 505) +++ tools/tests/parse-ref/wiki1.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("f",[],Var("void"),[ConsDec("i",Var("int16"),Int("3")),ExpStm(Affect(Var("i"),Int("4"))),VarDec("j",Var("int16"),Int("3")),ExpStm(Affect(Var("j"),Int("4")))])]) Index: tools/tests/parse-ref/bi-exp.ref --- tools/tests/parse-ref/bi-exp.ref (revision 505) +++ tools/tests/parse-ref/bi-exp.ref (working copy) @@ -1 +0,0 @@ -Program([ConsDec("i",Var("int"),BiFunCall("pow",[Int("4")],[Int("3")]))]) Index: tools/tests/parse-ref/funcall.ref --- tools/tests/parse-ref/funcall.ref (revision 505) +++ tools/tests/parse-ref/funcall.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("doit",[],Var("int"),[Return(FunCall("chiche",[String("\"pelle\""),String("\"branle\"")]))])]) Index: tools/tests/parse-ref/wiki2.ref --- tools/tests/parse-ref/wiki2.ref (revision 505) +++ tools/tests/parse-ref/wiki2.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("f",[],Var("void"),[VarDec("a",StaticFunCall("array",[Int("2"),Var("int16")])),VarDec("i",Var("int16"),MethodCall("a","at",[Int("0")]))])]) Index: tools/tests/parse-ref/function.ref --- tools/tests/parse-ref/function.ref (revision 505) +++ tools/tests/parse-ref/function.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("answer",[],Var("int"),[Return(Int("42"))])]) Index: tools/tests/parse-ref/consinit.ref --- tools/tests/parse-ref/consinit.ref (revision 505) +++ tools/tests/parse-ref/consinit.ref (working copy) @@ -1 +0,0 @@ -Program([ConsDec("i",Var("int"),Int("3"))]) Index: tools/tests/parse-ref/wiki3.ref --- tools/tests/parse-ref/wiki3.ref (revision 505) +++ tools/tests/parse-ref/wiki3.ref (working copy) @@ -1 +0,0 @@ -Program([FunDec("f",[],Var("void"),[VarDec("i",Var("int")),VarDec("j",Var("int")),ExpStm(Affect(Var("i"),Int("0"))),ExpStm(Affect(Var("j"),Var("i"))),ExpStm(Affect(Var("i"),Sum(Var("j"),Var("i"))))])]) Index: tools/tests/parse-ref/funtype.ref --- tools/tests/parse-ref/funtype.ref (revision 505) +++ tools/tests/parse-ref/funtype.ref (working copy) @@ -1 +0,0 @@ -Program([VarDec("f",FunType([Var("int"),Var("bool")],Var("float")))]) Index: tools/tests/parse-ref/empty.ref --- tools/tests/parse-ref/empty.ref (revision 505) +++ tools/tests/parse-ref/empty.ref (working copy) @@ -1 +0,0 @@ -Program([]) Index: tools/tests/parse-ref/type_static-call.ref --- tools/tests/parse-ref/type_static-call.ref (revision 505) +++ tools/tests/parse-ref/type_static-call.ref (working copy) @@ -1 +0,0 @@ -Program([VarDec("l",StaticFunCall("list",[Var("int")]))]) Index: tools/tests/parse-ref/guard.ref --- tools/tests/parse-ref/guard.ref (revision 505) +++ tools/tests/parse-ref/guard.ref (working copy) @@ -1 +0,0 @@ -Program([BiFunDec("f",[("i",Var("int"),Guard(Sup(Var("i"),Int("0"))))],[],Var("int"),[])]) Index: tools/tests/good/type_static-call.scl --- tools/tests/good/type_static-call.scl (revision 505) +++ tools/tests/good/type_static-call.scl (working copy) @@ -1 +0,0 @@ -var l : list[int]; Index: tools/tests/good/guard.scl --- tools/tests/good/guard.scl (revision 505) +++ tools/tests/good/guard.scl (working copy) @@ -1 +0,0 @@ -f : [i : int where i > 0]() -> int = {} \ No newline at end of file Index: tools/tests/good/vardec.scl --- tools/tests/good/vardec.scl (revision 505) +++ tools/tests/good/vardec.scl (working copy) @@ -1 +0,0 @@ -var i : int; Index: tools/tests/good/fundec.scl --- tools/tests/good/fundec.scl (revision 505) +++ tools/tests/good/fundec.scl (working copy) @@ -1,2 +0,0 @@ -f : (a: int, b : int) -> bool = -{} Index: tools/tests/good/funcall_no-args.scl --- tools/tests/good/funcall_no-args.scl (revision 505) +++ tools/tests/good/funcall_no-args.scl (working copy) @@ -1,4 +0,0 @@ -doit : () -> int = -{ - -> foo(); -} \ No newline at end of file Index: tools/tests/good/varinit.scl --- tools/tests/good/varinit.scl (revision 505) +++ tools/tests/good/varinit.scl (working copy) @@ -1 +0,0 @@ -var i : int := 42; Index: tools/tests/good/empty-class_dec.scl --- tools/tests/good/empty-class_dec.scl (revision 505) +++ tools/tests/good/empty-class_dec.scl (working copy) @@ -1 +0,0 @@ -foo : class = {}; \ No newline at end of file Index: tools/tests/good/manydec.scl --- tools/tests/good/manydec.scl (revision 505) +++ tools/tests/good/manydec.scl (working copy) @@ -1,4 +0,0 @@ -answer : int = 42; - -var i : int; -var j : int := i; Index: tools/tests/good/no-args_funtype.scl --- tools/tests/good/no-args_funtype.scl (revision 505) +++ tools/tests/good/no-args_funtype.scl (working copy) @@ -1 +0,0 @@ -var f : () -> void; \ No newline at end of file Index: tools/tests/good/class_dec.scl --- tools/tests/good/class_dec.scl (revision 505) +++ tools/tests/good/class_dec.scl (working copy) @@ -1,15 +0,0 @@ -point : class = -{ - public - { - x : () -> int = - { - -> x; - } - } - private - { - var x :int; - var y :int; - } -}; \ No newline at end of file Index: tools/tests/good/wiki1.scl --- tools/tests/good/wiki1.scl (revision 505) +++ tools/tests/good/wiki1.scl (working copy) @@ -1,9 +0,0 @@ - -f : () -> void = -{ - i : int16 = 3; - i := 4; - - var j : int16 := 3; - j := 4; -} \ No newline at end of file Index: tools/tests/good/funcall.scl --- tools/tests/good/funcall.scl (revision 505) +++ tools/tests/good/funcall.scl (working copy) @@ -1,4 +0,0 @@ -doit : () -> int = -{ - -> foo("bar", "baz"); -} \ No newline at end of file Index: tools/tests/good/bi-exp.scl --- tools/tests/good/bi-exp.scl (revision 505) +++ tools/tests/good/bi-exp.scl (working copy) @@ -1 +0,0 @@ -i : int = pow[4](3); \ No newline at end of file Index: tools/tests/good/function.scl --- tools/tests/good/function.scl (revision 505) +++ tools/tests/good/function.scl (working copy) @@ -1,4 +0,0 @@ -answer : () -> int = -{ - -> 42; -} \ No newline at end of file Index: tools/tests/good/wiki2.scl --- tools/tests/good/wiki2.scl (revision 505) +++ tools/tests/good/wiki2.scl (working copy) @@ -1,5 +0,0 @@ -f : () -> void = -{ - var a : array[2,int16]; - var i : int16 := a.at(0); -} Index: tools/tests/good/consinit.scl --- tools/tests/good/consinit.scl (revision 505) +++ tools/tests/good/consinit.scl (working copy) @@ -1 +0,0 @@ -i : int = 3; \ No newline at end of file Index: tools/tests/good/wiki3.scl --- tools/tests/good/wiki3.scl (revision 505) +++ tools/tests/good/wiki3.scl (working copy) @@ -1,9 +0,0 @@ -f : () -> void = -{ - var i : int; - var j : int; - - i := 0; - j := i; - i := j + i; -} Index: tools/tests/good/funtype.scl --- tools/tests/good/funtype.scl (revision 505) +++ tools/tests/good/funtype.scl (working copy) @@ -1 +0,0 @@ -var f : (int, bool) -> float; \ No newline at end of file Index: tools/tests/good/empty.scl Index: tools/transformer/scoolc.str --- tools/transformer/scoolc.str (revision 505) +++ tools/transformer/scoolc.str (working copy) @@ -1,6 +0,0 @@ -module scoolc - -imports liblib Scool - -strategies - main = io-wrap(id) Index: tools/transformer/Makefile --- tools/transformer/Makefile (revision 505) +++ tools/transformer/Makefile (working copy) @@ -1,6 +0,0 @@ - -scoolc: scoolc.str - strc -i $< -I ../parser -la stratego-lib - -clean: - rm -rf scoolc scoolc.dep scoolc.o scoolc.c .libs Index: tools/scoolc --- tools/scoolc (revision 505) +++ tools/scoolc (working copy) @@ -1,4 +0,0 @@ -#!/bin/sh -# -*- sh -*- - -parser/parse-scool $1 | transformer/scoolc Index: tools/gen.yml --- tools/gen.yml (revision 505) +++ tools/gen.yml (working copy) @@ -1,9 +0,0 @@ ---- -Autogeneration of the Scool parser references: !S::Suite - contents: - - Generation: !S::Iterate - over: !pathlist <<pwd>>/tests/good/(*).scl - iter: [it_file, it_name] - test: - Generation <<it_name>>: !S::Cmd - command: parser/parse-scool "<<it_file>>" > "<<pwd>>/tests/good/<<it_name>>.ref" Index: tools/parser/grammar/Class.sdf --- tools/parser/grammar/Class.sdf (revision 505) +++ tools/parser/grammar/Class.sdf (working copy) @@ -1,18 +0,0 @@ -module Class - -imports - Lexical Decl - -exports - sorts Class AccessBlock AccessModifier - context-free syntax - "{" AccessBlock* "}" -> Class {cons("Class")} - - AccessModifier "{" Decl* "}" -> AccessBlock {cons("Accessblock")} - - "public" -> AccessModifier {cons("Public")} - "protected" -> AccessModifier {cons("Protected")} - "private" -> AccessModifier {cons("Private")} - - lexical restrictions - AccessModifier -/- [A-Za-z] Index: tools/parser/grammar/Decl.sdf --- tools/parser/grammar/Decl.sdf (revision 505) +++ tools/parser/grammar/Decl.sdf (working copy) @@ -1,48 +0,0 @@ -module Decl - -imports - Lexical Type Guard Stm - -exports - sorts Decl - context-free syntax - - "var" Id ":" Type ";" -> Decl {cons("VarDec")} - "var" Id ":" Type ":=" Exp ";" -> Decl {cons("VarDec")} - Id ":" Type "=" Exp ";" -> Decl {cons("ConsDec")} - Id ":" Type ";" -> Decl {cons("ConsDec")} - - Id ":" "(" {(Id ":" Type) ","}* ")" "->" Type - "=" "{" Stm* "}" -> Decl {cons("FunDec")} - - Id ":" "[" {(Id ":" Type Guard) ","}* "]" "->" Type - "=" "{" Stm* "}" -> Decl {cons("StaticFunDec")} - - Id ":" "[" {(Id ":" Type Guard) ","}* "]" "(" {(Id ":" Type) ","}* ")" "->" Type - "=" "{" Stm* "}" -> Decl {cons("BiFunDec")} - - Id ":" "(" {(Id ":" Type) ","}* ")" "->" Type - "=>" Exp -> Decl {cons("FunDec")} - - Id ":" "[" {(Id ":" Type Guard) ","}* "]" "->" Type - "=>" Exp -> Decl {cons("StaticFunDec")} - - Id ":" "[" {(Id ":" Type Guard) ","}* "]" "(" {(Id ":" Type) ","}* ")" "->" Type - "=>" Exp -> Decl {cons("BiFunDec")} - - - "decl" Id ":" "(" {(Type | (Id ":" Type)) ","}* ")" - "->" Type ";" -> Decl {cons("FunPreDec")} - - - Id ":" "[" {(Id ":" Type) ","}* "]" "->" Type - "=" "{" Stm* "}" -> Decl {cons("StaticFunDec")} - - Id ":" "[" {(Id ":" Type) ","}* "]" "(" {(Id ":" Type) ","}* ")" "->" Type - "=" "{" Stm* "}" -> Decl {cons("BiFunDec")} - - Id ":" "[" {(Id ":" Type) ","}* "]" "->" Type - "=>" Exp -> Decl {cons("StaticFunDec")} - - Id ":" "[" {(Id ":" Type) ","}* "]" "(" {(Id ":" Type) ","}* ")" "->" Type - "=>" Exp -> Decl {cons("BiFunDec")} \ No newline at end of file Index: tools/parser/grammar/Exp.sdf --- tools/parser/grammar/Exp.sdf (revision 505) +++ tools/parser/grammar/Exp.sdf (working copy) @@ -1,43 +0,0 @@ -module Exp - -imports - Lexical Type ExpOrType Class - -exports - sorts Exp - context-free syntax - - ExpOrType -> Exp - Int -> Exp {cons("Int")} - String -> Exp {cons("String")} - Id "(" {Exp ","}* ")" -> Exp {cons("FunCall")} - Id "[" {Exp ","}* "]" - "(" {Exp ","}* ")" -> Exp {cons("BiFunCall")} - Exp "+" Exp -> Exp {cons("Sum")} - Exp "-" Exp -> Exp {cons("Sub")} - Exp "*" Exp -> Exp {cons("Mul")} - Exp "/" Exp -> Exp {cons("Div")} - Exp "=" Exp -> Exp {cons("Eq")} - Exp "!=" Exp -> Exp {cons("Neq")} - Exp "<" Exp -> Exp {cons("Inf")} - Exp ">" Exp -> Exp {cons("Sup")} - Exp ">=" Exp -> Exp {cons("SupEq")} - Exp "<=" Exp -> Exp {cons("InfEq")} - Exp ":=" Exp -> Exp {cons("Affect")} - Class -> Exp - Exp "." Id -> Exp {cons("Field")} - Id "." Id "(" {Exp ","}* ")" -> Exp {cons("MethodCall")} - - context-free priorities - - {left: - Exp "/" Exp -> Exp - Exp "*" Exp -> Exp - } -> {left: - Exp "+" Exp -> Exp - Exp "-" Exp -> Exp - } -> {right: - Exp ":=" Exp -> Exp - } \ No newline at end of file Index: tools/parser/grammar/Scool.sdf --- tools/parser/grammar/Scool.sdf (revision 505) +++ tools/parser/grammar/Scool.sdf (working copy) @@ -1,11 +0,0 @@ -module Scool - -imports - Decl - -exports - sorts Program - context-free start-symbols Program - context-free syntax - - Decl* -> Program {cons("Program")} Index: tools/parser/grammar/ExpOrType.sdf --- tools/parser/grammar/ExpOrType.sdf (revision 505) +++ tools/parser/grammar/ExpOrType.sdf (working copy) @@ -1,12 +0,0 @@ -module ExpOrType - -imports - Lexical Exp - -exports - - sorts ExpOrType - context-free syntax - Id "[" {Exp ","}* "]" -> ExpOrType {cons("StaticFunCall")} - Id -> ExpOrType {cons("Var")} - Id "::" Exp -> ExpOrType {cons("Scope")} Index: tools/parser/grammar/Type.sdf --- tools/parser/grammar/Type.sdf (revision 505) +++ tools/parser/grammar/Type.sdf (working copy) @@ -1,18 +0,0 @@ -module Type - -imports - ExpOrType - - -exports - - sorts Type - context-free syntax - - ExpOrType -> Type - "(" {Type ","}* ")" "->" Type -> Type {cons("FunType")} - "[" {Type ","}* "]" "->" Type -> Type {cons("StaticFunType")} - "[" {Type ","}* "]" - "(" {Type ","}* ")" "->" Type -> Type {cons("BiFunType")} - "class" -> Type {cons("Class")} - "class" "<" Type -> Type {cons("Class")} Index: tools/parser/grammar/Lexical.sdf --- tools/parser/grammar/Lexical.sdf (revision 505) +++ tools/parser/grammar/Lexical.sdf (working copy) @@ -1,28 +0,0 @@ -module Lexical - -exports - sorts Id Int String Asterisk Slash BlockComment CommentPart Cpp - lexical syntax - - [A-Za-z][A-Za-z0-9\_]* -> Id {cons("Id")} - [0-9]+ -> Int {cons("Int")} - "\"" [A-Za-z0-9]* "\"" -> String {cons("String")} - "//" ~[\n]* [\n] -> LAYOUT - [\ \t\n] -> LAYOUT - "/+" ~[]* "+/" -> Cpp - "class" -> Id {reject} - - BlockComment -> LAYOUT - - "/*" CommentPart* "*/" -> BlockComment - ~[\/\*] -> CommentPart - Asterisk -> CommentPart - Slash -> CommentPart - BlockComment -> CommentPart - [\/] -> Slash - [\*] -> Asterisk - - lexical restrictions - Id -/- [A-Za-z] - Asterisk -/- [\/] - Slash -/- [\*] Index: tools/parser/grammar/Guard.sdf --- tools/parser/grammar/Guard.sdf (revision 505) +++ tools/parser/grammar/Guard.sdf (working copy) @@ -1,10 +0,0 @@ -module Guard - -imports - Exp - -exports - sorts Guard - context-free syntax - - "where" Exp -> Guard {cons("Guard")} Index: tools/parser/grammar/Stm.sdf --- tools/parser/grammar/Stm.sdf (revision 505) +++ tools/parser/grammar/Stm.sdf (working copy) @@ -1,17 +0,0 @@ -module Stm - -imports - Lexical Exp Decl - -exports - sorts Stm - context-free syntax - - ";" -> Stm {cons("EmptyStm")} - Exp ";" -> Stm {cons("ExpStm")} - "->" Exp ";" -> Stm {cons("Return")} - "{" Stm* "}" -> Stm {cons("Block")} - "if" "(" Exp ")" Stm ("else" Stm)? -> Stm {cons("If")} - "while" "(" Exp ")" Stm -> Stm {cons("While")} - Decl -> Stm - Cpp -> Stm {cons("CppStm")} Index: tools/parser/parse-scool --- tools/parser/parse-scool (revision 505) +++ tools/parser/parse-scool (working copy) @@ -1,8 +0,0 @@ -#!/bin/sh -# -*- sh -*- - -if [ $# -eq 0 ]; then - echo "usage: parse-scool file.scl" -else - sglri -p parser/Scool.tbl -i $1 -fi Index: tools/parser/Makefile --- tools/parser/Makefile (revision 505) +++ tools/parser/Makefile (working copy) @@ -1,20 +0,0 @@ -SDF = $(wildcard grammar/*.sdf) -OUT = Scool - -all: Scool.def Scool.tbl Scool.str - -Scool.def: $(SDF) - pack-sdf -i grammar/Scool.sdf -o $@ - -Scool.tbl: Scool.def - sdf2table -i $< -o $@ -m Scool - -Scool.rtg: Scool.def - sdf2rtg -i $< -m Scool -o $@ - -Scool.str: Scool.rtg - rtg2sig --module Scool -i $< -o $@ - -clean: - rm -rf Scool.* log.* - Index: tools/Makefile --- tools/Makefile (revision 505) +++ tools/Makefile (working copy) @@ -1,14 +0,0 @@ -all: - cd parser && make - cd transformer && make - -clean: - rm -rf log.* - cd parser && make clean - cd transformer && make clean - -check: all - uttk test.yml - -gen: all - uttk gen.yml

17 years, 9 months

505: Remove external link to transformers.

by Quentin Hocquet

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Quentin Hocquet <quentin.hocquet(a)lrde.epita.fr> Remove external link to transformers. * tools: Remove svn:external property. 0 files changed Property changes on: tools ___________________________________________________________________ Name: svn:externals - transformers -r 1407 https://svn.lrde.epita.fr/svn/transformers/trunk +

17 years, 9 months

oln-0.10 10.223: Fix an ambiguity with G++ 4.0

by Roland Levillain

Sorry for the ugly patch, but Vcs is broken on my machine, and prdiff neither works. Index: 10.222/olena/ChangeLog Index: 10.222/olena/oln/arith/internal/opdecls.hh --- 10.222/olena/ChangeLog Thu, 15 Sep 2005 17:50:38 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.4 600) +++ 10.222(w)/olena/ChangeLog Wed, 21 Jun 2006 19:30:10 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.4 600) @@ -1,3 +1,8 @@ +2006-06-21 Roland Levillain <roland(a)lrde.epita.fr> + + * oln/arith/internal/opdecls.hh (oln_arith_declare_binop_procs_): + Remove the third operator, causing a an ambiguity with G++ 4.0. + 2005-09-15 Roland Levillain <roland(a)lrde.epita.fr> Adjust for G++ 4.0. --- 10.222/olena/oln/arith/internal/opdecls.hh Tue, 13 Apr 2004 17:31:32 +0200 van-vl_n (oln/b/22_opdecls.hh 1.19 600) +++ 10.222(w)/olena/oln/arith/internal/opdecls.hh Fri, 16 Jun 2006 17:50:32 +0200 levill_r (oln/b/22_opdecls.hh 1.19 600) @@ -218,18 +218,41 @@ T2, \ ntg_return_type(OPNAME, T1, T2)>()), \ input1, input2); \ - } \ - \ - /* Same as above, with inline conversion in the functor. */ \ - template<class IRet, class I1, class I2> inline \ - typename mute<I1, oln_value_type(IRet)>::ret \ - OPNAME(const abstract::image<I1>& input1, const abstract::image<I2>& input2) \ - { \ - return apply2(f_##OPNAME<oln_value_type(I1), \ - oln_value_type(I2), \ - oln_value_type(IRet)>(), \ - input1, input2); \ } +/* FIXME: Used to be part from the previous macro, but causes ambiguous + calls with G++ 4.0 and 4.1: theses compiler seems to consider that + + OPNAME(ima1, ima2); + + could be both interpreted as a call to + + template<class I1, class I2> inline + typename arith_return_type_proxy_##OPNAME##_<I1, I2>::ret + OPNAME(const abstract::image<I1>& input1, + const abstract::image<I2>& input2) + + or + + template<class IRet, class I1, class I2> inline + typename mute<I1, oln_value_type(IRet)>::ret + OPNAME(const abstract::image<I1>& input1, + const abstract::image<I2>& input2) + + despite the fact that this call doesn't resolve the first parameter + (`IRet') of the second version. It might be a bug in the 4.x branch + of G++. */ +// +// +// /* Same as above, with inline conversion in the functor. */ +// template<class IRet, class I1, class I2> inline +// typename mute<I1, oln_value_type(IRet)>::ret +// OPNAME(const abstract::image<I1>& input1, const abstract::image<I2>& input2) +// { +// return apply2(f_##OPNAME<oln_value_type(I1), +// oln_value_type(I2), +// oln_value_type(IRet)>(), +// input1, input2); +// } /// Apply OPNAME with a constant as second operand. # define oln_arith_declare_binopcst_procs_(OPNAME) \

17 years, 10 months

504: Document method checks in Static tour

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static ChangeLog | 13 +++++ tests/tour.cc | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 133 insertions(+), 6 deletions(-) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Document method checks in Static tour. * tests/tour.cc (static_hierarchy_with_methods::test): Rename as... (static_hierarchy_with_methods::test1): ...this. (main): Adjust. (static_hierarchy_with_methods::D): New. (static_hierarchy_with_methods::test2): New. (static_hierarchy_with_method_checks): New section. Add a reference (Concept Checking). 2006-06-15 Roland Levillain <roland(a)lrde.epita.fr> Index: tests/tour.cc --- tests/tour.cc (révision 503) +++ tests/tour.cc (révision 504) @@ -31,6 +31,7 @@ #include <cassert> #include <mlc/assert.hh> +#include <mlc/contract.hh> #include <mlc/is_a.hh> #include <mlc/cmp.hh> @@ -394,7 +395,7 @@ namespace static_hierarchy_with_methods { - void test() + void test1() { C c; assert (c.foo() == 4); @@ -412,20 +413,133 @@ } // end of namespace static_hierarchy_with_methods -// FIXME: Introduce static checks of methods (kind of concept checking). +// --------------------------- // +// Enforcing method checking. // +// --------------------------- // + +/* For a given `Exact' type, consider the `A<Exact>::foo' method. + This method relies on the fact that `Exact' has an `impl_foo' + method. However, the compiler let you instantiate an a class + `A<Exact>' with an `Exact' type not fulfilling this requirement, + and even worse, you can instantiate an object of this ill-formed + type! The compiler will complain only when it tries to resolve the + call to the (missing) `impl_foo' method. */ + +namespace static_hierarchy_with_methods +{ + + // For instance, let's introduce an ill-formed concrete subclass of A. + struct D : public A<D> + { + // No `impl_foo'. + }; + + /* `D' is not a valid exact type for A. Despite this fact, we can + instantiate this template with `D', as well as an object of this + type! */ + void test2() + { + // Valid (!). + typedef A<D> A_D; + // Equally valid (!). + A_D a; + // This call would fail if it were not disabled. +#if 0 + a.foo(); +#endif + } + +} // end of namespace static_hierarchy_with_methods + + +/* Metalic proposes a concept checking tool similar to the one used in + the Boost Concept Check Library (BCCL) [2], + `mlc_check_method_impl'. We use it to check that SCOOP abstract + polymorphic methods defined in an abstract class have a valid + implementation in one of the subclasses (i.e., "between" this + abstraction and the exact type). */ + +namespace static_hierarchy_with_method_checks +{ + + template <typename Exact> + struct A : public stc::any<Exact> + { + int foo() { return this->exact().impl_foo(); } + int impl_foo() { return 1; } + int bar() { return this->exact().impl_bar(); } + + /* Method checks are placed in the destructor, since they must + reside within a function body. */ + ~A() + { + /* `foo' is abstract in `A'. Ensure A's subclasses define an + implementation for this method. */ + mlc_check_method_impl(Exact, int, bar, /* no arg */, /* no const */); + } + }; + + template <typename Exact> + struct B : public A< stc_find_exact(B, Exact) > + { + int impl_foo() { return 2; } + int impl_bar() { return 3; } + }; + + struct C : public B<C> + { + int impl_foo() { return 4; } + }; + + struct D : public A<D> + { + // No `impl_foo'. + }; + + + void test() + { + /* Invalid template instantiation, because of `impl_foo' missing. + Upon this code, the compiler would emit an error message + similar to this one: + + error: 'impl_bar' is not a member of + 'static_hierarchy_with_method_checks::D' + + */ +#if 0 + typedef A<D> A_D; + A_D a; +#endif + } + +} // end of namespace static_hierarchy_with_method_checks + +/*-------. +| Misc. | +`-------*/ + // Run dynamic tests. int main() { static_hierarchy_with_any::test(); - static_hierarchy_with_methods::test(); + static_hierarchy_with_methods::test1(); } -/* References: - [1] Coplien, James O. (1995, February). "Curiously Recurring - Template Patterns". C++ Report: 24-27. */ + +/*-------------. +| References. | +`-------------*/ + +/* [1] James O. Coplien. ``Curiously Recurring Template + Patterns''. C++ Report: 24-27. 1995, February. + + [2] Jeremy Siek, Andrew Lumsdaine. ``Concept Checking: Binding + Parametric Polymorphism in C++''. In Proceedings of the ``Workshop + on C++ Template Programming''. 2000. */

17 years, 10 months

503: More on SCOOP methods in Static tour

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static ChangeLog | 18 +++++++++++++++++ tests/tour.cc | 61 +++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 13 deletions(-) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> More on SCOOP methods in Static tour. * tests/tour.cc (dynamic_hierarchy::A::foo) (dynamic_hierarchy::A::bar, dynamic_hierarchy::B::foo) (dynamic_hierarchy::B::bar, dynamic_hierarchy::C::foo): Return an int value. (static_hierarchy_with_methods::A::foo) (static_hierarchy_with_methods::A::impl_foo) (static_hierarchy_with_methods::A::bar) (static_hierarchy_with_methods::B::impl_foo) (static_hierarchy_with_methods::B::impl_bar) (static_hierarchy_with_methods::C::impl_foo): Likewise. (static_hierarchy_with_methods): Add comments. (static_hierarchy_with_methods::test): New. (main): Call it. Index: tests/tour.cc --- tests/tour.cc (révision 502) +++ tests/tour.cc (copie de travail) @@ -75,25 +75,25 @@ struct A { // A virtual method. - virtual void foo() { /* ... */ } + virtual int foo() { return 1; } // A virtual pure method. - virtual void bar() = 0; + virtual int bar() = 0; }; // `B' is a concrete class. struct B { // A redefined method. - virtual void foo() { /* ... */ } + virtual int foo() { return 2; } // `B::bar' is defined. - virtual void bar() { /* ... */ } + virtual int bar() { return 3; } }; // `C' is a concrete class. struct C { // `B::foo' is redefined. - virtual void foo() { /* ... */ } + virtual int foo() { return 4; } }; } // end of namespace dynamic_hierarchy @@ -338,9 +338,22 @@ // Methods. // // --------- // -// Add the methods. +/* We have laid down the foundations of our classes. Now it's time to + add some methods. -// FIXME: Comments. + Unlike classic C++, SCOOP doesn't use the `virtual' keyword to + define polymorphic methods. As SCOOP performs a static resolution + of method calls, it can't rely on `virtual' (which is dynamic per + se). Instead, a manual dispatch of method call is used: each + polymorphic method is turned into a facade, and there is one + implementation per class defining this method actually. The facade + retrieves the exact type of the object, and calls the + implementation corresponding to this type. A SCOOP abstract + polymorphic method (the equivalent of C++ ``virtual pure'' method) + has no implementation in the class where its facade is defined. + + The convention is to name `impl_m' the implementation(s) of the + facade `m'. */ namespace static_hierarchy_with_methods { @@ -351,12 +364,12 @@ /* Facade of a statically-dispatched method. Notice there is no `virtual' keyword: the (static) dispatch is done manually through the delegation to impl_foo. */ - void foo() { this->exact().impl_foo(); } + int foo() { return this->exact().impl_foo(); } // Implementation of the method. - void impl_foo() { /* ... */ } + int impl_foo() { return 1; } // A ``virtual'' pure (i.e., abstract) method. - void bar() { this->exact().impl_bar(); } + int bar() { return this->exact().impl_bar(); } // (No `impl_bar', since bar is abstract.) }; @@ -364,20 +377,41 @@ struct B : public A< stc_find_exact(B, Exact) > { // A redefined method. - void impl_foo() { /* ... */ } + int impl_foo() { return 2; } // B::bar (implementation) is defined. - void impl_bar() { /* ... */ } + int impl_bar() { return 3; } }; struct C : public B<C> { // Redefinition. - void impl_foo() { /* ... */ } + int impl_foo() { return 4; } }; } // end of namespace static_hierarchy_with_methods +namespace static_hierarchy_with_methods +{ + + void test() + { + C c; + assert (c.foo() == 4); + assert (c.bar() == 3); + + B<C>& b = c; + assert (b.foo() == 4); + assert (b.bar() == 3); + + A<C>& a = c; + assert (a.foo() == 4); + assert (a.bar() == 3); + } + +} // end of namespace static_hierarchy_with_methods + + // FIXME: Introduce static checks of methods (kind of concept checking). @@ -385,6 +419,7 @@ int main() { static_hierarchy_with_any::test(); + static_hierarchy_with_methods::test(); } /* References:

17 years, 10 months

502: More on the retrieval of/conversion to the exact type in Static tour

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static ChangeLog | 15 +++++++++++- tests/tour.cc | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 73 insertions(+), 12 deletions(-) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> More on the retrieval of and the conversion to the exact type in Static tour. * tests/tour.cc (static_hierarchy_with_any): More on the retrieval of and the conversion to the exact type. (main): Run dynamic tests. (static_hierarchy_with_any::A) (static_hierarchy_with_a_non_leaf_concrete_class::A) (static_hierarchy_with_methods::A): Use stc::any instead of stc::any__simple. 2006-06-14 Roland Levillain <roland(a)lrde.epita.fr> Add stc_to_exact and stc_to_exact_ macros. Index: tests/tour.cc --- tests/tour.cc (révision 500) +++ tests/tour.cc (copie de travail) @@ -28,7 +28,14 @@ /// \file tests/tour.cc /// \brief A tour of Static and SCOOP features. +#include <cassert> + +#include <mlc/assert.hh> +#include <mlc/is_a.hh> +#include <mlc/cmp.hh> + # include <stc/any.hh> +#include <stc/exact.hh> # include <stc/find_exact.hh> // FIXME: ``Fil rouge'': building a small (but complete) static @@ -41,7 +48,7 @@ // having introduced the vtypes. // FIXME: Things to show: -// - exact +// - exact (more) // - super // - virtual types (and macros for super) // - multiple super @@ -167,8 +174,8 @@ to this type. In fact, there is not a single `stc::any' class, but several, which have their advantages and drawbacks w.r.t. speed, memory print and support for diamond inheritance. - We'll only deal with `stc::any__simple' in this Static tour: - where you'll see `stc::any', simply read `stc::any__simple'. + We'll only deal with `stc::any' (an alias for `stc::any__simple') + in this Static tour. `stc::any' is used as the base class of any top class of a static hierarchy. It is passed the `Exact' type, just like any non-leaf @@ -176,7 +183,7 @@ derived, i.e., at the bottom of an inheritance tree). */ template <typename Exact> - struct A : public stc::any__simple<Exact> + struct A : public stc::any<Exact> { }; @@ -199,11 +206,47 @@ } // end of namespace static_hierarchy_with_any -// ------------ // -// stc::exact. // -// ------------ // +// -------------------------------- // +// Getting back to the exact type. // +// -------------------------------- // -// FIXME: To do. +namespace static_hierarchy_with_any +{ + void test() + { + // Metalic assertions. + mlc::assert_< mlc_is_a_(C, A) >::check(); + mlc::assert_< mlc_is_a_(C, B) >::check(); + + + // Getting the exact type. + + // `stc::any' has an `exact_type' typedef. + typedef A<C>::exact_type exact_type_of_A_1; + // But you can also use stc_to_exact_ to get this type. + typedef stc_to_exact_(A<C>) exact_type_of_A_2; + // Check these types. + mlc::assert_< mlc_eq(exact_type_of_A_1, C) >::check(); + mlc::assert_< mlc_eq(exact_type_of_A_2, C) >::check(); + + + // Converting an object to its exact type. + + // Create a C. + C c; + // See it through an abstraction. + A<C>& a = c; + // And get it back, with no runtime overhead (i.e., dynamic_cast). + C& c2 = a.exact(); + // Ensure we got back the same object. + assert (&c2 == &c); + + // stc::exact provides the same service. + C& c3 = stc::exact(a); + assert (&c3 == &c); + } + +} // end of namespace static_hierarchy_with_any // --------------------------- // @@ -236,7 +279,7 @@ /* A is left unchanged (it is still an abstract class). */ template <typename Exact> - struct A : public stc::any__simple<Exact> + struct A : public stc::any<Exact> { }; @@ -303,7 +346,7 @@ { template <typename Exact> - struct A : public stc::any__simple<Exact> + struct A : public stc::any<Exact> { /* Facade of a statically-dispatched method. Notice there is no `virtual' keyword: the (static) dispatch is done manually @@ -337,7 +380,12 @@ // FIXME: Introduce static checks of methods (kind of concept checking). -int main() {} + +// Run dynamic tests. +int main() +{ + static_hierarchy_with_any::test(); +} /* References:

17 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2006