- Olena-patches

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

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

17 Sep '08

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

1 0

scool r85: Add tests on functions
by Maxime van Noppen 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-17 Maxime van Noppen <yabo(a)lrde.epita.fr> Add tests on functions * check.sh: Add the possibility to choose which tests to execute. * function/c++_ast/call_001.aterm: New. * function/c++_ast/call_002.aterm: New. * function/c++_ast/call_003.aterm: New. * function/c++_ast/call_004.aterm: New. * function/c++_ast/call_005.aterm: New. * function/c++_ast/call_006.aterm: New. * function/c++_ast/declaration_008.aterm: New. * function/c++_ast/parameters_arguments_001.aterm: New. * function/c++_ast/parameters_arguments_002.aterm: New. * function/c++_ast/parameters_arguments_003.aterm: New. * function/c++_ast/parameters_arguments_005.aterm: New. * variable/scool_ast/declaration_005.aterm, * function/scool_ast/call_001.aterm, * function/scool_ast/call_002.aterm, * function/scool_ast/call_003.aterm: Update regarding grammar changes. * function/scool_ast/call_004.aterm: New. * function/scool_ast/call_005.aterm: New. * function/scool_ast/call_006.aterm: New. * function/scool_ast/static_parameter_001.aterm: Remove. * function/scool_src/call_004.scl: New. * function/scool_src/call_005.scl: New. * function/scool_src/call_006.scl: New. * function/scool_src/static_parameter_001.scl: Remove. check.sh | 20 +++++++++++++++++--- function/c++_ast/call_001.aterm | 1 + function/c++_ast/call_002.aterm | 1 + function/c++_ast/call_003.aterm | 1 + function/c++_ast/call_004.aterm | 1 + function/c++_ast/call_005.aterm | 1 + function/c++_ast/call_006.aterm | 1 + function/c++_ast/declaration_008.aterm | 1 + function/c++_ast/parameters_arguments_001.aterm | 1 + function/c++_ast/parameters_arguments_002.aterm | 1 + function/c++_ast/parameters_arguments_003.aterm | 1 + function/c++_ast/parameters_arguments_005.aterm | 1 + function/scool_ast/call_001.aterm | 2 +- function/scool_ast/call_002.aterm | 2 +- function/scool_ast/call_003.aterm | 2 +- function/scool_ast/call_004.aterm | 1 + function/scool_ast/call_005.aterm | 1 + function/scool_ast/call_006.aterm | 1 + function/scool_src/call_004.scl | 4 ++++ function/scool_src/call_005.scl | 4 ++++ function/scool_src/call_006.scl | 4 ++++ variable/scool_ast/declaration_005.aterm | 2 +- 22 files changed, 47 insertions(+), 7 deletions(-) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],CxxId("a"))]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],CxxId("a"))]) Index: branches/scool-ng/tests/function/c++_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_008.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/declaration_008.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([(CxxType("bool"),CxxId("B"))],CxxType("void"),CxxId("foo"),[])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T")),(CxxType("typename"),CxxId("U"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a")),(CxxConstType(CxxRefType(CxxType("U"))),CxxId("b"))],CxxId("a"))]) Index: branches/scool-ng/tests/function/c++_ast/call_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_001.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_001.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_002.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_002.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),[CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_003.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_003.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),["bar",CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_004.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_004.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_004.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxType("int")],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_005.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_005.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxInt("42")],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_006.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_006.aterm (revision 0) +++ branches/scool-ng/tests/function/c++_ast/call_006.aterm (revision 85) @@ -0,0 +1 @@ +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxType("int"),CxxInt("42")],CxxId("foo"),[CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/scool_ast/static_parameter_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_ast/call_001.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_001.aterm (revision 84) +++ branches/scool-ng/tests/function/scool_ast/call_001.aterm (revision 85) @@ -1 +1 @@ -Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,DynamicArguments([])))]))]) +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,Arguments([])))]))]) Index: branches/scool-ng/tests/function/scool_ast/call_002.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_002.aterm (revision 84) +++ branches/scool-ng/tests/function/scool_ast/call_002.aterm (revision 85) @@ -1 +1 @@ -Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,DynamicArguments([Integer("42")])))]))]) +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,Arguments([Integer("42")])))]))]) Index: branches/scool-ng/tests/function/scool_ast/call_003.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_003.aterm (revision 84) +++ branches/scool-ng/tests/function/scool_ast/call_003.aterm (revision 85) @@ -1 +1 @@ -Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,DynamicArguments([String("\"bar\""),Integer("42")])))]))]) +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),None,Arguments([String("\"bar\""),Integer("42")])))]))]) Index: branches/scool-ng/tests/function/scool_ast/call_004.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_004.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/call_004.aterm (revision 85) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),Some(Parameters([SimpleType("int")])),Arguments([])))]))]) Index: branches/scool-ng/tests/function/scool_ast/call_005.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_005.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/call_005.aterm (revision 85) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),Some(Parameters([Integer("42")])),Arguments([])))]))]) Index: branches/scool-ng/tests/function/scool_ast/call_006.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/call_006.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/call_006.aterm (revision 85) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("doit"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(FunctionCall(Identifier("foo"),Some(Parameters([SimpleType("int"),Integer("42")])),Arguments([Integer("42")])))]))]) Index: branches/scool-ng/tests/function/scool_src/static_parameter_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_src/call_005.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/call_005.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/call_005.scl (revision 85) @@ -0,0 +1,4 @@ +doit : () -> void = +{ + foo[42](); +} Index: branches/scool-ng/tests/function/scool_src/call_006.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/call_006.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/call_006.scl (revision 85) @@ -0,0 +1,4 @@ +doit : () -> void = +{ + foo[int, 42](42); +} Index: branches/scool-ng/tests/function/scool_src/call_004.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/call_004.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/call_004.scl (revision 85) @@ -0,0 +1,4 @@ +doit : () -> void = +{ + foo[int](); +} Index: branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 84) +++ branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 85) @@ -1 +1 @@ -Program([SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),StaticArguments([Identifier("int")])),None)]) +Program([SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),Parameters([SimpleType("int")])),None)]) Index: branches/scool-ng/tests/check.sh =================================================================== --- branches/scool-ng/tests/check.sh (revision 84) +++ branches/scool-ng/tests/check.sh (revision 85) @@ -124,7 +124,13 @@ indent $test_name_indent echo -e "${bblue}`basename ${dir}`" - for testnb in `seq 1 $number_of_tests` + if [ "$2" = "0" ]; then + test_list=`seq 1 $number_of_tests` + else + test_list="$2" + fi + + for testnb in $test_list do test_config="test_$testnb" eval $test_config @@ -201,6 +207,7 @@ -p | --print Print the input of the command -pa | --print-all Print all inputs -pc | --print-command Prints the command used for the test + -t tests Execute only these tests (e.g. \"1 3 6\") -h | --help Print this help message " } @@ -211,6 +218,7 @@ print_all=0 print_cmd=0 print=0 +tests=0 # Parse command line options while [ $# -gt 0 ] do @@ -239,6 +247,12 @@ print_cmd=1 ;; + -t) + shift + tests="$1" + echo "XTEST: " $1 + ;; + -h | --help) print_help exit 0 @@ -275,7 +289,7 @@ if [ $# -gt 0 ]; then while [ $# -gt 0 ]; do - perform_test_suite $1 + perform_test_suite $1 "$tests" shift done @@ -285,5 +299,5 @@ # Execute all testsuites we find for dir in `find . -maxdepth 1 -type d -regex './[^.].*'` do - perform_test_suite $dir + perform_test_suite $dir "$tests" done -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

milena r2285: Add mln/extension directory
by Matthieu Garrigues 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add mln/extension directory. * mln/extension: New. Concerns all stuff related to the domain extension. --- 0 files changed

1 0

milena r2284: Restore border::fill
by Matthieu Garrigues 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Restore border::fill. * mln/border/fill.hh: Updates dues to the renaming of line_piter to box_runstart_piter. * mln/core/box_runstart_piter.hh(mln_box_runstart_piter): New. --- border/fill.hh | 14 ++++++++------ core/box_runstart_piter.hh | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) Index: branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh (revision 2283) +++ branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh (revision 2284) @@ -37,6 +37,9 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/box.hh> +#define mln_box_runstart_piter(I) typename mln::box_runstart_piter< mln_psite(I) > +#define mln_box_runstart_piter_(I) mln::box_runstart_piter<mln_psite(I)> + namespace mln { Index: branches/cleanup-2008/milena/mln/border/fill.hh =================================================================== --- branches/cleanup-2008/milena/mln/border/fill.hh (revision 2283) +++ branches/cleanup-2008/milena/mln/border/fill.hh (revision 2284) @@ -36,6 +36,7 @@ # include <cstring> # include <mln/core/concept/image.hh> +# include <mln/core/box_runstart_piter.hh> namespace mln @@ -70,8 +71,9 @@ typedef mln_psite(I) P; typedef mln_psite(I) P; - typename I::line_piter pl(ima.domain()); - std::size_t len_r = ima.bbox().len(P::dim - 1); + mln_box_runstart_piter(I) pl(ima.domain()); + + std::size_t len_r = pl.run_length(); std::size_t st = 0; for_all (pl) @@ -96,19 +98,19 @@ trace::entering("border::impl::fill_size_n_"); typedef mln_psite(I) P; - typename I::line_piter pl(ima.domain()); - std::size_t len_r = ima.bbox().len(P::dim - 1); + mln_box_runstart_piter(I) pl(ima.domain()); + std::size_t len_r = pl.run_length(); std::size_t st = 0; for_all (pl) { std::size_t end = ima.index_of_point (pl); for (std::size_t i = st; i < end; ++i) - const_cast<I&>(ima)[i] = v; + (const_cast<I&>(ima)).element(i) = v; st = end + len_r; } for (std::size_t i = st; i < ima.nelements (); ++i) - const_cast<I&>(ima)[i] = v; + const_cast<I&>(ima).element(i) = v; trace::exiting("border::impl::fill_size_n_"); }

1 0