Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

497: Perform virtual type retrieval using the exact type of a class.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Perform virtual type retrieval using the exact type of a class. * stc/vtypes.hh (type_of_): Get the exact type of the ``from_type'' class, and perform the retrieval on it (instead of from_type directly). * tests/vtypes-and-exact.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add vtypes-and-exact.cc. (vtypes_and_exact_SOURCES): New. stc/vtypes.hh | 11 +- tests/Makefile.am | 2 tests/vtypes-and-exact.cc | 250 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 259 insertions(+), 4 deletions(-) Index: tests/vtypes-and-exact.cc --- tests/vtypes-and-exact.cc (revision 0) +++ tests/vtypes-and-exact.cc (revision 0) @@ -0,0 +1,250 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <stc/any.hh> +#include <stc/vtypes.hh> +#include <mlc/cmp.hh> +#include <mlc/assert.hh> +#include <mlc/int.hh> + +// Check the virtual types system on a SCOOP hierarchy propagating the +// exact (static) type throughout the inheritance tree (using +// stc::any). + +// Helper macros. +#define my_type_of(FromType, Typedef) \ + typename my_type_of_(FromType, Typedef) + +#define my_type_of_(FromType, Typedef) \ + stc_local_type_of_(my::category::my_cat, FromType, Typedef) + +namespace my +{ + /*-----------. + | Typedefs. | + `-----------*/ + + mlc_decl_typedef(foo_type); + mlc_decl_typedef(bar_type); + mlc_decl_typedef(baz_type); + mlc_decl_typedef(quux_type); + mlc_decl_typedef(yin_type); + mlc_decl_typedef(zorg_type); + + + /*----------------------. + | Namespace equipment. | + `----------------------*/ + + stc_equip_namespace_with_vtypes(); + + + /*-----------. + | Category. | + `-----------*/ + + // We only use one category here. + namespace category + { + struct my_cat; + } + + /// Packing of virtual types of any class belonging to the category my::cat. + template <typename T> + struct packed_vtypes <category::my_cat, T> + { + typedef my_type_of(T, foo) foo_type; + typedef my_type_of(T, bar) bar_type; + typedef my_type_of(T, baz) baz_type; + + static void ensure() + { + mlc::assert_< mlc_is_ok(foo_type) >::check(); + mlc::assert_< mlc_is_ok(bar_type) >::check(); + mlc::assert_< mlc_is_ok(baz_type) >::check(); + } + }; + + + /*----------------------------------------. + | A<Exact> --|> stc::any__simple<Exact>. | + `----------------------------------------*/ + + // Forward declaration. + template <typename Exact> + struct A; + + /// Types associated to my::A. + template <typename Exact> + struct vtypes< category::my_cat, my::A<Exact> > + { + // A native type. + typedef int foo_type; + // A Metalic value, used here is to ensure that + // mlc::abstract::values are accepted as virtual types, as well as + // any other type). + typedef mlc::int_<42> bar_type; + // An undefined type. + typedef mlc::undefined baz_type; + }; + + template <typename Exact> + struct A : public stc::any__simple<Exact> + { + // Aliases. + typedef my_type_of(A, foo) foo_type; + typedef my_type_of(A, bar) bar_type; + typedef my_type_of(A, baz) baz_type; + + ~A() + { + // packed_vtypes< category::my, A<Exact> > is not checked here, + // since A's baz_type virtual type is undefined. + } + }; + + + /*--------------------------. + | B<Exact> ---|> A<Exact>. | + `--------------------------*/ + + // Forward declaration. + template <typename Exact> + struct B; + + // Super type. + template <typename Exact> + struct set_super_type< B<Exact> > + { + typedef A<Exact> ret; + }; + + /// Types associated to my::B. + template <typename Exact> + struct vtypes< category::my_cat, B<Exact> > + { + // (foo is left untouched.) + + // A type redefined here. + typedef double bar_type; + // A type defined here (but declared abstract in the super class). + typedef char baz_type; + // A type defined only here (and not in the super class). + typedef long quux_type; + }; + + /// An external type associated to my::B. + template <typename Exact> + struct ext_vtype<category::my_cat, B<Exact>, typedef_::yin_type> + { + typedef unsigned long ret; + }; + + template <typename Exact> + struct B : public stc_get_supers(B<Exact>) + { + // Aliases. + typedef my_type_of(B, foo) foo_type; + typedef my_type_of(B, bar) bar_type; + typedef my_type_of(B, baz) baz_type; + typedef my_type_of(B, quux) quux_type; + typedef my_type_of(B, yin) yin_type; + + // Check B's vtypes. + ~B() + { + packed_vtypes< category::my_cat, B<Exact> >::ensure(); + } + }; + + + /*--------------. + | C --|> B<C>. | + `--------------*/ + + // Forward declaration. + struct C; + + // Super type. + stc_set_super(C, B<C>); + + /// Types associated to my::C. + template <> + struct vtypes<category::my_cat, C> + { + // A type defined only here (and not in the super class). + typedef double zorg_type; + }; + + struct C : public stc_get_supers(C) + { + // Aliases. + typedef my_type_of_(C, foo) foo_type; + typedef my_type_of_(C, quux) quux_type; + typedef my_type_of_(C, zorg) zorg_type; + + // Check C's vtypes. + ~C() + { + packed_vtypes<category::my_cat, C>::ensure(); + } + }; + +} // end of namespace my + + +int +main() +{ + using my::A; + using my::B; + using my::C; + + // Check exact types of A<C> and B<C>. + mlc::assert_<mlc_eq(stc::to_exact_< A<C> >::ret, C)>::check(); + mlc::assert_<mlc_eq(stc::to_exact_< B<C> >::ret, C)>::check(); + + + // Check types associated to A<C>. + mlc::assert_<mlc_eq(A<C>::foo_type, int)>::check(); + mlc::assert_<mlc_eq(A<C>::bar_type, double)>::check(); + + // Check types associated to B<C>. + mlc::assert_<mlc_eq(B<C>::baz_type, char)>::check(); + mlc::assert_<mlc_eq(B<C>::quux_type, long)>::check(); + mlc::assert_<mlc_eq(B<C>::yin_type, unsigned long)>::check(); + + mlc::assert_<mlc_eq(B<C>::bar_type, A<C>::bar_type)>::check(); + + // Check types associated to C. + mlc::assert_<mlc_eq(C::foo_type, int)>::check(); + mlc::assert_<mlc_eq(C::bar_type, double)>::check(); + mlc::assert_<mlc_eq(C::baz_type, char)>::check(); + mlc::assert_<mlc_eq(C::quux_type, long)>::check(); + mlc::assert_<mlc_eq(C::yin_type, unsigned long)>::check(); + mlc::assert_<mlc_eq(C::zorg_type, double)>::check(); +} Index: tests/Makefile.am --- tests/Makefile.am (revision 496) +++ tests/Makefile.am (working copy) @@ -14,6 +14,7 @@ multiple-supers \ super \ vtypes \ + vtypes-and-exact \ vtypes-multiple-supers any_SOURCES = any.cc @@ -22,6 +23,7 @@ multiple_supers_SOURCES = multiple-supers.cc super_SOURCES = super.cc vtypes_SOURCES = vtypes.cc +vtypes_and_exact_SOURCES = vtypes-and-exact.cc vtypes_multiple_supers_SOURCES = vtypes-multiple-supers.cc TESTS = $(check_PROGRAMS) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 496) +++ stc/vtypes.hh (working copy) @@ -51,6 +51,7 @@ # include <mlc/valist.hh> # include <stc/valist_aggregator.hh> +# include <stc/exact.hh> # include <stc/internal/extract_vtype_from_list.hh> @@ -522,20 +523,22 @@ } /** End of namespace internal. */ \ \ \ - /* FIXME: Don't query from_type directly, but exact_type(from_type) */ \ - /* instead. We need mlc::any for this. */ \ + /** Entry point of the vtype retrieval algorithm. */ \ template <typename category, typename from_type, typename typedef_type> \ struct type_of_ \ { \ + /* Get the exact type of \a from_type. */ \ + typedef typename stc::to_exact_<from_type>::ret from_exact_type; \ + \ /* Look for the typedef in internal types. */ \ typedef typename \ internal::rec_get_vtype<internal::tag::internal, category, \ - from_type, typedef_type>::ret \ + from_exact_type, typedef_type>::ret \ internal_typedef; \ /* Look for the typedef as an external type. */ \ typedef typename \ internal::rec_get_vtype<internal::tag::external, category, \ - from_type, typedef_type>::ret \ + from_exact_type, typedef_type>::ret \ external_typedef; \ \ /* Did we found the virtual type? */ \

18 years, 7 months

496: Perform additional tests on simple virtual types.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Perform additional tests on simple virtual types (no multiple inheritance nor use of stc::any). * tests/vtypes.cc: Aesthetic changes. (C): Rename as... (Z): ...this. Adjust. (Z::bar_type, Z::baz_type, Z::yin_type): New typedefs. (main): Check more virtual types. vtypes.cc | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) Index: tests/vtypes.cc --- tests/vtypes.cc (revision 495) +++ tests/vtypes.cc (working copy) @@ -173,39 +173,42 @@ /*---. - | C. | + | Z. | `---*/ // Forward declaration. - struct C; + struct Z; - // C doesn't derive from B, but we want its vtypes to ``inherit'' + // Z doesn't derive from B, but we want its vtypes to ``inherit'' // from B's vtypes (see the specialization - // types<category::my_cat, C>). + // types<category::my_cat, Z>). // Warning, this sugar might be removed in the future. /// Link to B (``pseudo'' inheritance). - stc_set_pseudosuper(C, B); + stc_set_pseudosuper(Z, B); - /// Types associated to my::C. + /// Types associated to my::Z. template <> - struct vtypes<category::my_cat, C> + struct vtypes<category::my_cat, Z> { // A type defined only here (and not in the super class). typedef double zorg_type; }; - struct C // no inheritance + struct Z // no inheritance { // Aliases. - typedef my_type_of_(C, foo) foo_type; - typedef my_type_of_(C, quux) quux_type; - typedef my_type_of_(C, zorg) zorg_type; + typedef my_type_of_(Z, foo) foo_type; + typedef my_type_of_(Z, bar) bar_type; + typedef my_type_of_(Z, baz) baz_type; + typedef my_type_of_(Z, quux) quux_type; + typedef my_type_of_(Z, yin) yin_type; + typedef my_type_of_(Z, zorg) zorg_type; // Check C's vtypes. - ~C() + ~Z() { - packed_vtypes<category::my_cat, C>::ensure(); + packed_vtypes<category::my_cat, Z>::ensure(); } }; @@ -220,13 +223,17 @@ mlc::assert_<mlc_eq(my::A::bar_type, mlc::int_<42>)>::check(); // Check types associated to B. - mlc::assert_<mlc_neq(my::B::bar_type, my::A::bar_type)>::check(); mlc::assert_<mlc_eq(my::B::baz_type, char)>::check(); mlc::assert_<mlc_eq(my::B::quux_type, long)>::check(); mlc::assert_<mlc_eq(my::B::yin_type, unsigned long)>::check(); - // Check types associated to C. - mlc::assert_<mlc_eq(my::C::foo_type, int)>::check(); - mlc::assert_<mlc_eq(my::C::quux_type, long)>::check(); - mlc::assert_<mlc_eq(my::C::zorg_type, double)>::check(); + mlc::assert_<mlc_neq(my::B::bar_type, my::A::bar_type)>::check(); + + // Check types associated to Z. + mlc::assert_<mlc_eq(my::Z::foo_type, int)>::check(); + mlc::assert_<mlc_eq(my::Z::bar_type, double)>::check(); + mlc::assert_<mlc_eq(my::Z::baz_type, char)>::check(); + mlc::assert_<mlc_eq(my::Z::quux_type, long)>::check(); + mlc::assert_<mlc_eq(my::Z::yin_type, unsigned long)>::check(); + mlc::assert_<mlc_eq(my::Z::zorg_type, double)>::check(); }

18 years, 7 months

495: Complete the support of multiple inheritance in SCOOP w.r.t. vtype retrieval.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Though a small test case is provided, theses new features have not been checked thoroughly. In particular, we should provide tests known to fail, to ensure the quality/relevance or error messages. stc/vtypes.cc is now a complex system. I'd love to write a real documentation for it, but I'm pretty sure it's going to evolve again in a near future (some features might even be superfluous, like pseudo inheritance, and dropped). I'll try to start an embryo of documentation on Olena's Trac. Comments welcome! :) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Complete the support of multiple inheritance in SCOOP: adjust the algorithm of virtual type retrieval to take multiple base classes into account. * stc/internal/extract_vtype_from_list.hh: New file. * stc/vtypes.hh: Include it. (ERROR::FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG): Rename as... (ERROR::FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG): ...this. (ERROR::FIRST_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_TAG) (ERROR::THIRD_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_LIST): New structs (error messages). (stc_internal_maybe_get_nth_super_type): New macro. (get_supers_list): Use it. (maybe_super_type): Rename as... (maybe_get_super_type): ...this. (get_vtype): Rename as... (get_vtype_helper): ...this. (stc_internal_rec_get_vtype): New macro. (rec_get_vtype_from_list): New struct. (rec_get_vtype): Use it to rewrite the retrieval algorithm to take multiple base classes into account. Complete static assertions on the nature of the first parameter (retrieval method tag). * stc/Makefile.am (nobase_stc_HEADERS): Add internal/extract_vtype_from_list.hh. * tests/vtypes-multiple-supers.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add vtypes-multiple-supers. (vtypes_multiple_supers_SOURCES): New. * tests/vtypes.cc (packed_vtypes <category::my_cat, T>): Move this class just after the declaration of my::cat. stc/Makefile.am | 4 stc/internal/extract_vtype_from_list.hh | 158 +++++++++++++++++++++++ stc/vtypes.hh | 185 +++++++++++++++++++++------- tests/Makefile.am | 4 tests/vtypes-multiple-supers.cc | 211 ++++++++++++++++++++++++++++++++ tests/vtypes.cc | 33 ++--- 6 files changed, 534 insertions(+), 61 deletions(-) Index: tests/vtypes-multiple-supers.cc --- tests/vtypes-multiple-supers.cc (revision 0) +++ tests/vtypes-multiple-supers.cc (revision 0) @@ -0,0 +1,211 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <stc/vtypes.hh> +#include <mlc/cmp.hh> +#include <mlc/assert.hh> +#include <mlc/int.hh> + +// This test focuses on the support of virtual types in hierachies +// with multiple inheritance. + +// FIXME: To do: Check external vtypes, too. + +/// Helper macros. +/// \{ +#define my_type_of(FromType, Typedef) \ + typename my_type_of_(FromType, Typedef) + +#define my_type_of_(FromType, Typedef) \ + stc_local_type_of_(my::category::my_cat, FromType, Typedef) +/// \} + + +namespace my +{ + /*-----------. + | Typedefs. | + `-----------*/ + + mlc_decl_typedef(foo_type); + mlc_decl_typedef(bar_type); + mlc_decl_typedef(baz_type); + + + /*----------------------. + | Namespace equipment. | + `----------------------*/ + + stc_equip_namespace_with_vtypes(); + + + /*----------------. + | Various types. | + `----------------*/ + + struct alpha; + struct beta; + + + /*-----------. + | Category. | + `-----------*/ + + // We only use one category here. + namespace category + { + struct my_cat; + } + + /// Packing of virtual types of any class belonging to the category my::cat. + template <typename T> + struct packed_vtypes <category::my_cat, T> + { + typedef my_type_of(T, foo) foo_type; + + static void ensure() + { + mlc::assert_< mlc_is_ok(foo_type) >::check(); + } + }; + + + /*----. + | A. | + `----*/ + + // Forward declaration. + struct A; + + /// Types associated to my::A. + template <> + struct vtypes<category::my_cat, my::A> + { + typedef int foo_type; + typedef alpha bar_type; + }; + + struct A + { + // Aliases. + typedef my_type_of_(A, foo) foo_type; + typedef my_type_of_(A, bar) bar_type; + + // Check A's vtypes. + ~A() + { + packed_vtypes<category::my_cat, A>::ensure(); + } + }; + + + /*--. + | B | + `--*/ + + // Forward declaration. + struct B; + + /// Types associated to my::B. + template <> + struct vtypes<category::my_cat, B> + { + typedef float foo_type; + typedef beta baz_type; + }; + + struct B + { + // Aliases. + typedef my_type_of_(B, foo) foo_type; + typedef my_type_of_(B, baz) baz_type; + + // Check B's vtypes. + ~B() + { + packed_vtypes<category::my_cat, B>::ensure(); + } + }; + + + /*------. + | A B | + | ^ ^ | + | \ / | + | C | + `------*/ + + // Forward declaration. + struct C; + + // Super classes. + stc_set_nth_super(C, 1, A); + stc_set_nth_super(C, 2, B); + + /// Types associated to my::C. + template <> + struct vtypes<category::my_cat, C> + { + // This typedef remove the ambiguity on the `foo' vtype: this vtype + // is provided by both A and B. Here, let `foo' take the value from + // A's vtype (but we could also have chosen another value, like `int'). + typedef my_type_of_(A, foo) foo_type; + }; + + struct C : stc_get_supers(C) + { + // Aliases. + typedef my_type_of_(C, foo) foo_type; + typedef my_type_of_(C, bar) bar_type; + typedef my_type_of_(C, baz) baz_type; + + // Check C's vtypes. + ~C() + { + packed_vtypes<category::my_cat, C>::ensure(); + } + }; + +} // end of namespace my + + +int +main() +{ + // Check types associated to A. + mlc::assert_<mlc_eq(my::A::foo_type, int)>::check(); + mlc::assert_<mlc_eq(my::A::bar_type, my::alpha)>::check(); + + // Check types associated to B. + mlc::assert_<mlc_eq(my::B::foo_type, float)>::check(); + mlc::assert_<mlc_eq(my::B::baz_type, my::beta)>::check(); + + // Check types associated to C. + mlc::assert_<mlc_eq(my::C::foo_type, my::A::foo_type)>::check(); + mlc::assert_<mlc_eq(my::C::bar_type, my::alpha)>::check(); + mlc::assert_<mlc_eq(my::C::baz_type, my::beta)>::check(); +} Index: tests/Makefile.am --- tests/Makefile.am (revision 494) +++ tests/Makefile.am (working copy) @@ -13,7 +13,8 @@ exact \ multiple-supers \ super \ - vtypes + vtypes \ + vtypes-multiple-supers any_SOURCES = any.cc entry_SOURCES = entry.cc @@ -21,5 +22,6 @@ multiple_supers_SOURCES = multiple-supers.cc super_SOURCES = super.cc vtypes_SOURCES = vtypes.cc +vtypes_multiple_supers_SOURCES = vtypes-multiple-supers.cc TESTS = $(check_PROGRAMS) Index: tests/vtypes.cc --- tests/vtypes.cc (revision 494) +++ tests/vtypes.cc (working copy) @@ -71,6 +71,22 @@ struct my_cat; } + /// Packing of virtual types of any class belonging to the category my::cat. + template <typename T> + struct packed_vtypes <category::my_cat, T> + { + typedef my_type_of(T, foo) foo_type; + typedef my_type_of(T, bar) bar_type; + typedef my_type_of(T, baz) baz_type; + + static void ensure() + { + mlc::assert_< mlc_is_ok(foo_type) >::check(); + mlc::assert_< mlc_is_ok(bar_type) >::check(); + mlc::assert_< mlc_is_ok(baz_type) >::check(); + } + }; + /*----. | A. | @@ -93,22 +109,6 @@ typedef mlc::undefined baz_type; }; - /// Packing of virtual types of any A class. - template <typename T> - struct packed_vtypes <category::my_cat, T> - { - typedef my_type_of(T, foo) foo_type; - typedef my_type_of(T, bar) bar_type; - typedef my_type_of(T, baz) baz_type; - - static void ensure() - { - mlc::assert_< mlc_is_ok(foo_type) >::check(); - mlc::assert_< mlc_is_ok(bar_type) >::check(); - mlc::assert_< mlc_is_ok(baz_type) >::check(); - } - }; - struct A { // Aliases. @@ -121,7 +121,6 @@ // packed_vtypes<category::my, A> is not checked here, since A's // baz_type virtual type is undefined. } - }; Index: stc/vtypes.hh --- stc/vtypes.hh (revision 494) +++ stc/vtypes.hh (working copy) @@ -51,6 +51,8 @@ # include <mlc/valist.hh> # include <stc/valist_aggregator.hh> +# include <stc/internal/extract_vtype_from_list.hh> + /*-----------------. | Error messages. | @@ -62,9 +64,13 @@ namespace ERROR { - struct FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG; struct PARAMETER_OF_get_super_types_helper_IS_NOT_A_VALID_VALIST; + struct FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG; + + struct FIRST_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_TAG; + struct THIRD_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_LIST; + } // end of namespace stc::ERROR } // end of namespace stc @@ -75,10 +81,21 @@ | Equipment. | `------------*/ +/// Internal macros, not to be used by the client. +/// \{ + // Note: TypedefName *must* be of the form `typedef_::foo'. # define stc_internal_get_typedef(Type, TypedefName) \ typename TypedefName::template from_< Type >::ret +# define stc_internal_maybe_get_nth_super_type(Type, Nth) \ + typename internal::maybe_get_super_type< Type, Nth >::ret + +# define stc_internal_rec_get_vtype(Type) \ + typename rec_get_vtype< method, category, Type, typedef_type >::ret + +/// \} + // FIXME: Complete support for hierarchies with several super classes. @@ -112,7 +129,7 @@ namespace internal \ { \ template <typename type, unsigned N> \ - struct maybe_super_type \ + struct maybe_get_super_type \ { \ typedef typename \ mlc::if_< mlc_is_a( mlc_comma_1( set_super_type<type, N> ), \ @@ -126,22 +143,22 @@ template <typename type> \ struct get_supers_list \ { \ - /* FIXME: Factor with a macro? */ \ - typedef typename internal::maybe_super_type<type, 1>::ret s1; \ - typedef typename internal::maybe_super_type<type, 2>::ret s2; \ - typedef typename internal::maybe_super_type<type, 3>::ret s3; \ - typedef typename internal::maybe_super_type<type, 4>::ret s4; \ - typedef typename internal::maybe_super_type<type, 5>::ret s5; \ - typedef typename internal::maybe_super_type<type, 6>::ret s6; \ - typedef typename internal::maybe_super_type<type, 7>::ret s7; \ - typedef typename internal::maybe_super_type<type, 8>::ret s8; \ - typedef typename internal::maybe_super_type<type, 9>::ret s9; \ + /* FIXME: Factor with a loop macro? */ \ + typedef stc_internal_maybe_get_nth_super_type(type, 1) s1; \ + typedef stc_internal_maybe_get_nth_super_type(type, 2) s2; \ + typedef stc_internal_maybe_get_nth_super_type(type, 3) s3; \ + typedef stc_internal_maybe_get_nth_super_type(type, 4) s4; \ + typedef stc_internal_maybe_get_nth_super_type(type, 5) s5; \ + typedef stc_internal_maybe_get_nth_super_type(type, 6) s6; \ + typedef stc_internal_maybe_get_nth_super_type(type, 7) s7; \ + typedef stc_internal_maybe_get_nth_super_type(type, 8) s8; \ + typedef stc_internal_maybe_get_nth_super_type(type, 9) s9; \ \ typedef mlc::valist_<s1, s2, s3, s4, s5, s6, s7, s8, s9> ret; \ }; \ \ \ - /* Get supers classes. */ \ + /* Get super classes. */ \ \ namespace internal \ { \ @@ -194,7 +211,6 @@ /* ``Pseudo'' inheritance. */ \ /* ------------------------ */ \ \ - /* FIXME: Add a multiple pseudoinheritance mechanism? */ \ template <typename type> \ struct set_pseudosuper_type \ { \ @@ -270,21 +286,22 @@ \ } /** end of stc::internal::tag */ \ \ - \ /** Try to get \a typedef_type from \a from_type. In case this */ \ /** typedef is mlc::not_found, don't perform a recursive */ \ /** retrieval, simply return mlc::not_found. */ \ template <typename method, typename category, \ typename from_type, typename typedef_type> \ - struct get_vtype \ + struct get_vtype_helper \ { \ /* Nothing (no method selected). */ \ }; \ \ /** Specialization of get_vtypes for retrievals within */ \ /** internal vtypes. */ \ - template <typename category, typename from_type, typename typedef_type> \ - struct get_vtype<tag::internal, category, from_type, typedef_type> \ + template <typename category, \ + typename from_type, typename typedef_type> \ + struct get_vtype_helper<tag::internal, category, \ + from_type, typedef_type> \ { \ /** Set of vtypes associated with FROM_TYPE. */ \ typedef vtypes<category, from_type> types; \ @@ -294,8 +311,10 @@ \ /** Specialization of get_vtypes for retrievals within */ \ /** external vtypes. */ \ - template <typename category, typename from_type, typename typedef_type> \ - struct get_vtype<tag::external, category, from_type, typedef_type> \ + template <typename category, \ + typename from_type, typename typedef_type> \ + struct get_vtype_helper<tag::external, category, \ + from_type, typedef_type> \ { \ /** Set of vtypes associated with FROM_TYPE. */ \ typedef ext_vtype<category, from_type, typedef_type> ext_type; \ @@ -305,23 +324,46 @@ \ \ /* FIXME: Do a basic scheme of the algorithm in pseudo-code. */ \ + \ /* FIXME: Check for mlc::undefined? */ \ \ - /** Recursive retrieval of a virtual type. */ \ + /* Forward declaration. */ \ + template <typename method, typename category, \ + typename from_list, typename typedef_type> \ + struct rec_get_vtype_from_list; \ + \ + /** Recursive retrieval of the virtual type \a typedef_type inside */ \ + /** the class \a from_type. */ \ template <typename method, typename category, \ typename from_type, typename typedef_type> \ struct rec_get_vtype : \ private mlc::assert_< mlc_is_a(method, tag::method), \ - stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG > \ + stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG > \ { \ + /** Get potential vtype \a typedef_type from the current class */ \ + /** (\a from_type). */ \ typedef typename \ - get_vtype<method, category, from_type, typedef_type>::ret type; \ + get_vtype_helper< method, category, from_type, typedef_type>::ret \ + type; \ + \ + /** Implicit parents (i.e. supers), if any. */ \ + typedef typename get_supers_list<from_type>::ret supers_list; \ + /** Vtype deduced from the vtypes of the base class(es) of */ \ + /** \a from_type, if any. */ \ + typedef typename \ + rec_get_vtype_from_list< method, category, \ + supers_list, typedef_type >::ret \ + vtype_from_supers; \ \ - /** Implicit parent (i.e. super), if any. */ \ - typedef stc_get_super(from_type) super; \ /** Pseudosuper class, if any. */ \ typedef stc_get_pseudosuper(from_type) pseudosuper; \ + /** Vtype deduced from the vtype of the pseudo super class of */ \ + /** \a from_type, if any. */ \ + typedef typename \ + rec_get_vtype< method, category, pseudosuper, typedef_type >::ret \ + vtype_from_pseudo_super; \ \ + /* Core of the search algorithm. */ \ typedef typename \ mlc::if_< \ mlc::neq_< type, mlc::not_found >, \ @@ -331,27 +373,17 @@ /* associated to FROM_TYPE) */ \ type, \ /* else */ \ - /* check if the vtype of the `super' of FROM_TYPE */ \ + /* check if the vtypes of the `supers' of FROM_TYPE */ \ /* has the typedef */ \ typename \ - mlc::if_< mlc::neq_< typename rec_get_vtype< method, \ - category, \ - super, \ - typedef_type >::ret, \ - mlc::not_found >, \ + mlc::if_< mlc::neq_< vtype_from_supers, mlc::not_found >, \ /* then */ \ /* return it */ \ - typename rec_get_vtype< method, \ - category, \ - super, \ - typedef_type >::ret, \ + vtype_from_supers, \ /* else */ \ - /* check if the FROM_TYPE has a decl_parent */ \ + /* check if the FROM_TYPE has a pseudo super */ \ /* and try to retrieve the typedef from it. */ \ - typename rec_get_vtype< method, \ - category, \ - pseudosuper, \ - typedef_type >::ret >::ret >::ret \ + vtype_from_pseudo_super >::ret >::ret \ ret; \ }; \ \ @@ -361,20 +393,85 @@ /** Case where \a from_type = mlc::none (end of a recursive */ \ /** retrieval following `super' types). */ \ template <typename method, typename category, typename typedef_type> \ - struct rec_get_vtype<method, category, mlc::none, typedef_type> \ + struct rec_get_vtype<method, category, mlc::none, typedef_type> : \ + private mlc::assert_< mlc_is_a(method, tag::method), \ + stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG > \ { \ typedef mlc::not_found ret; \ }; \ /** Case where \a from_type = mlc::not_found (end of a recursive */ \ /** retrieval following `super' types). */ \ template <typename method, typename category, typename typedef_type> \ - struct rec_get_vtype<method, category, mlc::not_found, typedef_type> \ + struct rec_get_vtype<method, category, mlc::not_found, typedef_type> : \ + private mlc::assert_< mlc_is_a(method, tag::method), \ + stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG > \ { \ typedef mlc::not_found ret; \ }; \ /** \} */ \ \ \ + /** Recursive retrieval of vtype \a typedef_type inside */ \ + /** \a from_list. */ \ + /** \{ */ \ + \ + /* Default case: \a from_type is not a mlc::valist_, abort. */ \ + template <typename method, typename category, \ + typename from_list, typename typedef_type> \ + struct rec_get_vtype_from_list : \ + private mlc::abort_< from_list, \ + stc::ERROR::THIRD_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_LIST > \ + { \ + }; \ + \ + /** Case where the list is empty. Suprisingly, the general */ \ + /** specialization for mlc::valist<e1, ..., e9> is not enough: */ \ + /** this specialization is needed too. */ \ + template <typename method, typename category, typename typedef_type> \ + struct rec_get_vtype_from_list< \ + method, category, mlc::valist_<>, typedef_type> \ + { \ + typedef mlc::not_found ret; \ + }; \ + \ + /* Case where \a from_list is a genuine list. */ \ + template <typename method, typename category, \ + typename e1, typename e2, typename e3, \ + typename e4, typename e5, typename e6, \ + typename e7, typename e8, typename e9, \ + typename typedef_type> \ + struct rec_get_vtype_from_list< \ + method, category, \ + mlc::valist_<e1, e2, e3, e4, e5, e6, e7, e8, e9>, typedef_type \ + > : \ + private mlc::assert_< mlc_is_a(method, tag::method), \ + stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_TAG > \ + { \ + /* For each item of the list \a from_list, perform a */ \ + /* rec_get_vtype search. */ \ + /* FIXME: Factor with a loop macro? */ \ + typedef stc_internal_rec_get_vtype(e1) res1; \ + typedef stc_internal_rec_get_vtype(e2) res2; \ + typedef stc_internal_rec_get_vtype(e3) res3; \ + typedef stc_internal_rec_get_vtype(e4) res4; \ + typedef stc_internal_rec_get_vtype(e5) res5; \ + typedef stc_internal_rec_get_vtype(e6) res6; \ + typedef stc_internal_rec_get_vtype(e7) res7; \ + typedef stc_internal_rec_get_vtype(e8) res8; \ + typedef stc_internal_rec_get_vtype(e9) res9; \ + \ + /* Then, create a list from the results. */ \ + typedef \ + mlc::valist_<res1, res2, res3, res4, res5, res6, res7, res8, res9> \ + res_list; \ + \ + /* Finally, match this list against a set of valid patterns. */ \ + /* If the match fails, return mlc::not_found. */ \ + typedef typename \ + stc::internal::extract_vtype_from_list<res_list>::ret ret; \ + }; \ + \ + \ /* ------------------------------------- */ \ /* External/internal typedef selection. */ \ /* ------------------------------------- */ \ @@ -504,6 +601,10 @@ // Get. +// FIXME: The error message given by the compiler is not explicit +// when trying to use stc_get_supers on a class which has no +// (declared) super class. Improve this. + /** \a stc_get_supers(Type) returns a class which inerits from all the classes declared as super types of \a Type. Index: stc/Makefile.am --- stc/Makefile.am (revision 494) +++ stc/Makefile.am (working copy) @@ -6,4 +6,6 @@ entry.hh \ exact.hh \ valist_aggregator.hh \ - vtypes.hh + vtypes.hh \ + \ + internal/extract_vtype_from_list.hh Index: stc/internal/extract_vtype_from_list.hh --- stc/internal/extract_vtype_from_list.hh (revision 0) +++ stc/internal/extract_vtype_from_list.hh (revision 0) @@ -0,0 +1,158 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/** \file stc/internal/extract_vtype_from_list.hh + + \brief Match a list of types against a set of valid patterns for + vtype retrieval + + This file is part of the rec_get_vtype_from_list from + stc/vtypes.hh. */ + +#ifndef STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST +# define STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST + +# include <mlc/flags.hh> +# include <mlc/valist.hh> + +namespace stc +{ + + namespace internal + { + // Shotcut, for readability purpose. + typedef mlc::not_found nil ; + + /* FIXME: Currently, we don't distinguish these cases: + - a list with no vtype, + - a list with two vtypes or more. + extract_vtype_from_list returns mlc::not_found for both. + We probably want a distinction between these two cases, but + it implies handling a lot more cases in the matching. */ + + /** Match \a list against a set of valid patterns to extract + a vtype from it. Return this vtype the search succeeds, + otherwise return mlc::not_found. */ + /** \{ */ + + /*----------------. + | Invalid cases. | + `----------------*/ + + /// Default case: search for a single vtype failed, because there + /// is more than one vtype. + template <typename list> + struct extract_vtype_from_list + { + typedef mlc::not_found ret; + }; + + /// Case where there is no vtype in the list. + template <> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, nil, nil, nil, nil, nil > > + { + typedef mlc::not_found ret; + }; + + + /*--------------. + | Valid cases. | + `--------------*/ + + // There is one and only one valid vtype in the following + // patterns. + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< vtype, nil, nil, nil, nil, nil, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, vtype, nil, nil, nil, nil, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, vtype, nil, nil, nil, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, vtype, nil, nil, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, vtype, nil, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, nil, vtype, nil, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, nil, nil, vtype, nil, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, nil, nil, nil, vtype, nil > > + { + typedef vtype ret; + }; + + template <typename vtype> + struct extract_vtype_from_list< + mlc::valist_< nil, nil, nil, nil, nil, nil, nil, nil, vtype > > + { + typedef vtype ret; + }; + /** \} */ + + } // end of namespace stc::internal + +} // end of namespace stc + +#endif // ! STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST

18 years, 7 months

494: Catch up with Static's support for multiple inheritance.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with Static's support for multiple inheritance. * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh: s/stc_super_/stc_get_supers/. * tests/image_entry.cc: Add a missing `public' qualifier for exported types. oln/core/1d/grid1d.hh | 2 +- oln/core/2d/grid2d.hh | 2 +- oln/core/3d/grid3d.hh | 2 +- tests/image_entry.cc | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 493) +++ tests/image_entry.cc (working copy) @@ -67,6 +67,7 @@ // A very simple 1-D image. class image : public oln::set_super_type<my::image>::ret { + public: typedef image self_type; // Internal vtypes. typedef oln_type_of_(self_type, grid) grid_type; Index: oln/core/1d/grid1d.hh --- oln/core/1d/grid1d.hh (revision 493) +++ oln/core/1d/grid1d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 1-dimension rectangular grid. - struct grid1d : public stc_super_(grid1d) + struct grid1d : public stc_get_supers(grid1d) { protected: grid1d() {} Index: oln/core/2d/grid2d.hh --- oln/core/2d/grid2d.hh (revision 493) +++ oln/core/2d/grid2d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 2-dimension rectangular grid. - struct grid2d : public stc_super_(grid2d) + struct grid2d : public stc_get_supers(grid2d) { protected: grid2d() {} Index: oln/core/3d/grid3d.hh --- oln/core/3d/grid3d.hh (revision 493) +++ oln/core/3d/grid3d.hh (working copy) @@ -57,7 +57,7 @@ }; /// A 3-dimension rectangular grid. - struct grid3d : public stc_super_(grid3d) + struct grid3d : public stc_get_supers(grid3d) { protected: grid3d() {}

18 years, 7 months

493: Allow multiple super classes in SCOOP's static hierarchies.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static The support for multiple inheritance in SCOOP is not complete: the mechanism for retrieving virtual types queries only the first base class, not the (possible) other ones. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Allow multiple super classes in SCOOP's static hierarchies. * stc/valist_aggregator.hh: New. * stc/vtypes.hh: Include it. (ERROR::PARAMETER_OF_get_super_types_helper_IS_NOT_A_VALID_VALIST): New struct. (set_super_type): Inherit from mlc::undefined by default. (internal::maybe_super_type, get_supers_list) (internal::get_super_types_helper, get_super_types) (rec_get_vtype): s/stc_super/stc_get_super/. s/stc_pseudosuper/stc_get_pseudosuper/. (stc_set_super): Remove previous definition of this macro, and make it a shortcut for... (stc_set_nth_super): ...this one (new). (stc_get_supers, stc_get_nth_super_, stc_get_nth_super_) (stc_get_super_, stc_get_super_): New macros. (stc_super, stc_super_): Remove macros. (stc_pseudosuper, stc_pseudosuper_): Rename macros as... (stc_get_pseudosuper, stc_get_pseudosuper_): ...these. * tests/super.cc, tests/multiple-supers.cc: New tests. * tests/vtypes.cc: s/stc_get_supers_/stc_get_supers/g. * stc/Makefile.am (nobase_stc_HEADERS): Add exact.hh and valist_aggregator.hh. * tests/Makefile.am (check_PROGRAMS): Add multiple-supers, super. (multiple_supers_SOURCES, super_SOURCES): New. stc/Makefile.am | 2 stc/valist_aggregator.hh | 138 ++++++++++++++++++++++++++++++++ stc/vtypes.hh | 199 ++++++++++++++++++++++++++++++++++++++++------- tests/Makefile.am | 4 tests/multiple-supers.cc | 109 +++++++++++++++++++++++++ tests/super.cc | 97 ++++++++++++++++++++++ tests/vtypes.cc | 4 7 files changed, 524 insertions(+), 29 deletions(-) Index: tests/super.cc --- tests/super.cc (revision 0) +++ tests/super.cc (revision 0) @@ -0,0 +1,97 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +// Check Static's super relationship. + +#include <stc/vtypes.hh> +#include <mlc/is_a.hh> +#include <mlc/assert.hh> + + +namespace my +{ + + /*----------------------. + | Namespace equipment. | + `----------------------*/ + + stc_equip_namespace_with_vtypes(); + + + /*----. + | A. | + `----*/ + + struct A + { + }; + + + /*------------. + | B ---|> A. | + `------------*/ + + // Forward declaration. + struct B; + + // Warning, this sugar might be removed in the future. + stc_set_super(B, A); + + struct B : public stc_get_supers(B) + { + }; + + + /*---. + | C. | + `---*/ + + // Forward declaration. + struct C; + + /* C doesn't derive from B, but we want its vtypes to ``inherit'' + from B's vtypes. Note that there are actually no vtypes in this + simple test, but it doesn't matter: we are only checking the + super relationship here. */ + + // Warning, this sugar might be removed in the future. + /// Link to B (``pseudo'' inheritance). + stc_set_pseudosuper(C, B); + + struct C // no inheritance + { + }; + +} // end of namespace my + + +int +main() +{ + mlc::assert_<mlc_is_a_(my::B, my::A)>::check(); + mlc::assert_<mlc_is_not_a_(my::C, my::A)>::check(); +} Property changes on: tests/exact.cc ___________________________________________________________________ Name: svn:executable - * Index: tests/Makefile.am --- tests/Makefile.am (revision 492) +++ tests/Makefile.am (working copy) @@ -11,11 +11,15 @@ any \ entry \ exact \ + multiple-supers \ + super \ vtypes any_SOURCES = any.cc entry_SOURCES = entry.cc exact_SOURCES = exact.cc +multiple_supers_SOURCES = multiple-supers.cc +super_SOURCES = super.cc vtypes_SOURCES = vtypes.cc TESTS = $(check_PROGRAMS) Index: tests/vtypes.cc --- tests/vtypes.cc (revision 492) +++ tests/vtypes.cc (working copy) @@ -156,7 +156,7 @@ typedef unsigned long ret; }; - struct B : public stc_super_(B) + struct B : public stc_get_supers(B) { // Aliases. typedef my_type_of_(B, foo) foo_type; @@ -210,7 +210,7 @@ } }; -} +} // end of namespace my int Index: tests/multiple-supers.cc --- tests/multiple-supers.cc (revision 0) +++ tests/multiple-supers.cc (revision 0) @@ -0,0 +1,109 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +// Check Static's multiple super relationship. + +#include <stc/vtypes.hh> +#include <mlc/is_a.hh> +#include <mlc/assert.hh> + + +namespace my +{ + + /*----------------------. + | Namespace equipment. | + `----------------------*/ + + stc_equip_namespace_with_vtypes(); + + + /*--. + | A | + `--*/ + + struct A + { + }; + + + /*--. + | B | + `--*/ + + struct B + { + }; + + + /*--. + | A | + | ^ | + | | | + | C | + `--*/ + + // Forward declaration. + struct C; + + // Warning, this sugar might be removed in the future. + stc_set_super(C, A); + + struct C : public stc_get_supers(C) + { + }; + + + /*------. + | A B | + | ^ ^ | + | \ / | + | D | + `------*/ + + // Forward declaration. + struct D; + + // Warning, this sugar might be removed in the future. + stc_set_nth_super(D, 1, A); + stc_set_nth_super(D, 2, B); + + struct D : public stc_get_supers(D) + { + }; + +} // end of namespace my + + +int +main() +{ + mlc::assert_<mlc_is_a_(my::C, my::A)>::check(); + + mlc::assert_<mlc_is_a_(my::D, my::A)>::check(); + mlc::assert_<mlc_is_a_(my::D, my::B)>::check(); +} Property changes on: stc/exact.hh ___________________________________________________________________ Name: svn:executable - * Index: stc/valist_aggregator.hh --- stc/valist_aggregator.hh (revision 0) +++ stc/valist_aggregator.hh (revision 0) @@ -0,0 +1,138 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file stc/valist_aggregator.hh +/// \brief Super class aggregation mechanism. +/// +/// Converts a mlc::valist_ into a class inheriting from all the +/// elements of the list. + +#ifndef STATIC_VALIST_AGGREGATOR_HH +# define STATIC_VALIST_AGGREGATOR_HH + +// FIXME: To be moved in Metalic? + +// FIXME: Propose a version where inheritance is virtual (with an +// optional fine-grained version, where `virtual' presence can be +// choose individually for each element?) + +#include <mlc/abort.hh> +#include <mlc/valist.hh> + +namespace stc +{ + namespace ERROR + { + + struct PARAMETER_OF_internal_valist_aggregator_OUT_OF_BOUNDS; + + } // end of namespace stc::ERROR + + + // There is a lot a redundant code here; the Boost Preprocessor + // Library would be a nice solution, but we don't want to depend on + // third-party libraries. + + + /// Defaut version: abort. + template <typename super_list> + struct valist_aggregator : + private mlc::abort_< + super_list, + stc::ERROR::PARAMETER_OF_internal_valist_aggregator_OUT_OF_BOUNDS + > + { + }; + + /// Version for 2 super classes. + template <typename E1, typename E2> + struct valist_aggregator< mlc::valist_ <E1,E2> > : + public E1, public E2 + { + }; + + /// Version for 3 super classes. + template <typename E1, typename E2, typename E3> + struct valist_aggregator< mlc::valist_ <E1,E2,E3 > > : + public E1, public E2, public E3 + { + }; + + /// Version for 4 super classes. + template <typename E1, typename E2, typename E3, typename E4> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4> > : + public E1, public E2, public E3, public E4 + { + }; + + /// Version for 5 super classes. + template <typename E1, typename E2, typename E3, typename E4, typename E5> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4,E5> > : + public E1, public E2, public E3, public E4, public E5 + { + }; + + /// Version for 6 super classes. + template <typename E1, typename E2, typename E3, typename E4, typename E5, + typename E6> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4,E5,E6> > : + public E1, public E2, public E3, public E4, public E5, + public E6 + { + }; + + /// Version for 7 super classes. + template <typename E1, typename E2, typename E3, typename E4, typename E5, + typename E6, typename E7> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4,E5,E6,E7> > : + public E1, public E2, public E3, public E4, public E5, + public E6, public E7 + { + }; + + /// Version for 8 super classes. + template <typename E1, typename E2, typename E3, typename E4, typename E5, + typename E6, typename E7, typename E8> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4,E5,E6,E7,E8> > : + public E1, public E2, public E3, public E4, public E5, + public E6, public E7, public E8 + { + }; + + /// Version for 9 super classes. + template <typename E1, typename E2, typename E3, typename E4, typename E5, + typename E6, typename E7, typename E8, typename E9> + struct valist_aggregator< mlc::valist_ <E1,E2,E3,E4,E5,E6,E7,E8,E9> > : + public E1, public E2, public E3, public E4, public E5, + public E6, public E7, public E8, public E9 + { + }; + /// \} + +} // end of namespace stc + +#endif // ! STATIC_VALIST_AGGREGATOR_HH Index: stc/vtypes.hh --- stc/vtypes.hh (revision 492) +++ stc/vtypes.hh (working copy) @@ -36,11 +36,20 @@ # include <mlc/flags.hh> # include <mlc/typedef.hh> # include <mlc/ret.hh> + +# include <mlc/assert.hh> +# include <mlc/abort.hh> + # include <mlc/bool.hh> +# include <mlc/int.hh> + # include <mlc/cmp.hh> # include <mlc/if.hh> # include <mlc/is_a.hh> -# include <mlc/assert.hh> + +# include <mlc/comma.hh> +# include <mlc/valist.hh> +# include <stc/valist_aggregator.hh> /*-----------------. @@ -52,8 +61,12 @@ /// Error messages raised by static assertions. namespace ERROR { + struct FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG; + struct PARAMETER_OF_get_super_types_helper_IS_NOT_A_VALID_VALIST; + } // end of namespace stc::ERROR + } // end of namespace stc @@ -66,7 +79,11 @@ # define stc_internal_get_typedef(Type, TypedefName) \ typename TypedefName::template from_< Type >::ret -// FIXME: Add support for hierarchies with several super classes. + +// FIXME: Complete support for hierarchies with several super classes. + +// FIXME: Could we extract some classes from this gigantic macro? + # define stc_equip_namespace_with_vtypes() \ \ /* ----------------------- */ \ @@ -81,17 +98,103 @@ /* Inheritance. */ \ /* ------------- */ \ \ - template <typename type> \ - struct set_super_type \ + /* Set super classes. */ \ + \ + template<typename type, unsigned N = 1> \ + struct set_super_type : public mlc::undefined \ { \ typedef mlc::none ret; \ }; \ \ \ + /* Get supers list. */ \ + \ + namespace internal \ + { \ + template <typename type, unsigned N> \ + struct maybe_super_type \ + { \ + typedef typename \ + mlc::if_< mlc_is_a( mlc_comma_1( set_super_type<type, N> ), \ + mlc::undefined ), \ + mlc::internal::valist_none, \ + mlc_ret(mlc_comma_1(set_super_type< type, N >)) >::ret \ + ret; \ + }; \ + } /* end of namespace internal */ \ + \ + template <typename type> \ + struct get_supers_list \ + { \ + /* FIXME: Factor with a macro? */ \ + typedef typename internal::maybe_super_type<type, 1>::ret s1; \ + typedef typename internal::maybe_super_type<type, 2>::ret s2; \ + typedef typename internal::maybe_super_type<type, 3>::ret s3; \ + typedef typename internal::maybe_super_type<type, 4>::ret s4; \ + typedef typename internal::maybe_super_type<type, 5>::ret s5; \ + typedef typename internal::maybe_super_type<type, 6>::ret s6; \ + typedef typename internal::maybe_super_type<type, 7>::ret s7; \ + typedef typename internal::maybe_super_type<type, 8>::ret s8; \ + typedef typename internal::maybe_super_type<type, 9>::ret s9; \ + \ + typedef mlc::valist_<s1, s2, s3, s4, s5, s6, s7, s8, s9> ret; \ + }; \ + \ + \ + /* Get supers classes. */ \ + \ + namespace internal \ + { \ + \ + /** Accessor helper. */ \ + template<typename type> \ + struct get_super_types_helper; \ + \ + /** Accessor helper: specialization for the case of a single */ \ + /** super class. */ \ + template<typename super> \ + struct get_super_types_helper< mlc::valist_ <super> > \ + { \ + /** Return the super class directly. */ \ + typedef super ret; \ + }; \ + \ + /** Accessor helper: specializations for the case of two super */ \ + /** classes or more. */ \ + template <typename super1, typename super2, typename super3> \ + struct get_super_types_helper< mlc::valist_ <super1, super2, super3> > \ + { \ + /** Return an aggregate of the super classes. */ \ + typedef stc::valist_aggregator< mlc::valist_ <super1, super2, super3> > \ + ret; \ + }; \ + \ + /** Accessor helper: default case (abort). */ \ + template<typename type> \ + struct get_super_types_helper : \ + public mlc::abort_< \ + type, \ + stc::ERROR::PARAMETER_OF_get_super_types_helper_IS_NOT_A_VALID_VALIST \ + > \ + { \ + }; \ + \ + } /* end of namespace internal */ \ + \ + \ + template<typename type> \ + struct get_super_types \ + { \ + typedef typename get_supers_list<type>::ret supers_list; \ + typedef typename internal::get_super_types_helper<supers_list>::ret ret; \ + }; \ + \ + \ /* ------------------------ */ \ /* ``Pseudo'' inheritance. */ \ /* ------------------------ */ \ \ + /* FIXME: Add a multiple pseudoinheritance mechanism? */ \ template <typename type> \ struct set_pseudosuper_type \ { \ @@ -215,9 +318,9 @@ get_vtype<method, category, from_type, typedef_type>::ret type; \ \ /** Implicit parent (i.e. super), if any. */ \ - typedef stc_super(from_type) super; \ + typedef stc_get_super(from_type) super; \ /** Pseudosuper class, if any. */ \ - typedef stc_pseudosuper(from_type) pseudosuper; \ + typedef stc_get_pseudosuper(from_type) pseudosuper; \ \ typedef typename \ mlc::if_< \ @@ -376,17 +479,64 @@ | Macros. | `---------*/ -/* FIXME: I don't know whether this macro will be really usable; what +// ------------- // +// Inheritance. // +// ------------- // + +// Set. + +/* FIXME: I don't know whether these macros will be really usable; what if Type is a template class? We would have to provide additional - versions of this macro, with support for one parameter, two + versions of these macros, with support for one parameter, two parameters, etc. */ /// \def Declare the immediate base class \a Super of \a Type. -# define stc_set_super(Type, Super) \ +#define stc_set_nth_super(Type, N, Super) \ template <> \ - struct set_super_type<Type> \ + struct set_super_type< Type, N > \ { \ typedef Super ret; \ - } + }; + +// Shortcut. +#define stc_set_super(Type, Super) \ + stc_set_nth_super(Type, 1, Super) + + +// Get. + +/** \a stc_get_supers(Type) returns a class which inerits from all the + classes declared as super types of \a Type. + + However, there is an exception when Type as single super: + stc_get_supers returns this super class directly, not a class + ineriting from it, to avoid a useless indirection. */ +#define stc_get_supers(Type) \ + get_super_types< Type >::ret + +/// \def Get the Nth immediate base class(es) of Type (version to be +/// used inside a template). +# define stc_get_nth_super(Type, Nth) \ + typename stc_get_nth_super_(Type, Nth) + +/// \def Get the Nth immediate base class(es) of Type (version to be +/// used outside a template). +# define stc_get_nth_super_(Type, Nth) \ + set_super_type< Type, Nth >::ret + +/// \def Get the fisrt immediate base class of Type (version to be +/// used inside a template). +# define stc_get_super(Type) \ + typename stc_get_super_(Type) + +/// \def Get the first immediate base class of Type (version to be +/// used outside a template). +# define stc_get_super_(Type) \ + stc_get_nth_super_(Type, 1) + + +// -------------------- // +// Pseudo inheritance. // +// -------------------- // /* FIXME: I don't know whether this macro will be really usable; what if Type is a template class? We would have to provide additional @@ -400,25 +550,20 @@ typedef PseudoSuper ret; \ } -/// \def Get the immediate base class of T (version to be used inside -/// a template). -# define stc_super(T) \ - typename stc_super_(T) - -/// \def Get the immediate base class of T (version to be used outside -/// a template). -# define stc_super_(T) \ - set_super_type<T>::ret - -/// \def Get the pseudosuper class of T (version to be used inside a +/// \def Get the pseudosuper class of Type (version to be used inside a /// template). -# define stc_pseudosuper(T) \ - typename stc_pseudosuper_(T) +# define stc_get_pseudosuper(Type) \ + typename stc_get_pseudosuper_(Type) -/// \def Get the pseudosuper class of T (version to be used outside a +/// \def Get the pseudosuper class of Type (version to be used outside a /// template). -# define stc_pseudosuper_(T) \ - set_pseudosuper_type<T>::ret +# define stc_get_pseudosuper_(Type) \ + set_pseudosuper_type< Type >::ret + + +// ---------------------- // +// Virtual types access. // +// ---------------------- // // FIXME: Perhaps only ``external'' (i.e., non local) versions of // stc_type_of are really useful (since they are more precise), and we Index: stc/Makefile.am --- stc/Makefile.am (revision 492) +++ stc/Makefile.am (working copy) @@ -4,4 +4,6 @@ nobase_stc_HEADERS = \ any.hh \ entry.hh \ + exact.hh \ + valist_aggregator.hh \ vtypes.hh

18 years, 7 months

492: Replace stc::internal::not_user_defined with mlc::undefined.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Replace stc::internal::not_user_defined with mlc::undefined. * stc/entry.hh (internal::not_user_defined): Remove class. s/internal::not_user_defined/mlc::undefined/g. entry.hh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: stc/entry.hh --- stc/entry.hh (revision 491) +++ stc/entry.hh (working copy) @@ -98,6 +98,7 @@ #include <mlc/if.hh> #include <mlc/is_a.hh> +#include <mlc/flags.hh> #include <mlc/comma.hh> namespace stc @@ -106,17 +107,15 @@ { // End of the recurring inheritance. struct none {}; - // No user class should derive from this class. - struct not_user_defined {}; } /** \brief Entry point of a hierarchy. To be possibly specialized by the user. - This class is use as selector ``plugging'' itself (inheriting) + This class is used as selector ``plugging'' itself (inheriting) to (from) a bottom class in one of the multiple hierarchies. */ template <typename exact, unsigned num> - struct set_entry_node : public internal::not_user_defined + struct set_entry_node : public mlc::undefined { // Nothing. }; @@ -129,7 +128,7 @@ struct get_entry_node : public set_entry_node<exact, num>, public mlc::if_< mlc_is_a( mlc_comma_1( set_entry_node<exact, num + 1> ), - internal::not_user_defined ), + mlc::undefined ), internal::none, internal::get_entry_node<exact, num + 1> >::ret {

18 years, 7 months

Re: [Olena-patches] 482: Scool parser.

by Roland Levillain

mefyl <mefyl(a)free.fr> writes: > Roland Levillain wrote: >> Wow! That's a big contribution! :) > Thanks. Sorry for the mistakes in the Changelog, it was my first commit. No problem. :) >> I suggest renaming `tools' to `scool' (and adding a ChangeLog to this >> directory). What do you think? > That's right, we shall name the directory 'scool'. Furthermore, we > thought we shall not leave it inside olena, so I think we are going to > move my work and Thomas' one to oln/scool; what do you think about > that? Agreed! >> (And if you don't need Transformers anymore, consider removing the >> svn::external links.) > Will be fixed in next patch Ok.

18 years, 7 months

491: Please ICC w.r.t. the substitution of arguments of macros.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Please the Intel C++ Compiler w.r.t. the substitution of arguments of macros as template parameters. * mlc/case.hh (mlc_case, mlc_case_) * mlc/cmp.hh (mlc_eq, mlc_neq, mlc_is_bexpr, mlc_is_not_bexpr) (mlc_is_found, mlc_is_not_found, mlc_is_undefined) (mlc_is_defined, mlc_is_ok, mlc_is_not_ok, mlc_is_builtin) (mlc_is_not_builtin) * mlc/elt.hh (mlc_elt, mlc_elt_) * mlc/if.hh (mlc_if, mlc_if_) * mlc/implies.hh (mlc_implies) * mlc/switch.hh (mlc_switch, mlc_switch_) * mlc/typedef.hh (mlc_typedef, mlc_typedef_, mlc_typedef_in) (mlc_typedef_in, mlc_typedef_onlyif, mlc_typedef_onlyif_) * mlc/value.hh (mlc_value): Add space around the arguments of these macro to please icpc, whose preprocessor doesn't add extra space when expanding macros, leading sometimes to syntax errors. cmp.hh | 0 1 file changed Index: mlc/elt.hh Index: mlc/if.hh Index: mlc/typedef.hh Index: mlc/switch.hh Index: mlc/implies.hh Index: mlc/case.hh Index: mlc/value.hh Index: mlc/cmp.hh

18 years, 7 months

490: Factor the recursive retrieval in internal and external vtypes.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Factor the recursive retrieval in internal and external vtypes. * stc/vtypes.hh (stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG): New. (tag::method, tag::internal, tag::external): New. (get_vtype): New. (rec_get_vtype): Handle both internal and external vtypes. (rec_ext_vtype): Remove. vtypes.hh | 162 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 489) +++ stc/vtypes.hh (working copy) @@ -40,6 +40,22 @@ # include <mlc/cmp.hh> # include <mlc/if.hh> # include <mlc/is_a.hh> +# include <mlc/assert.hh> + + +/*-----------------. +| Error messages. | +`-----------------*/ + +namespace stc +{ + /// Error messages raised by static assertions. + namespace ERROR + { + struct FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG; + } // end of namespace stc::ERROR +} // end of namespace stc + /*------------. @@ -137,88 +153,66 @@ /* Recursive retrieval of an internal vtype. */ \ /* ------------------------------------------ */ \ \ - /* FIXME: Do a basic scheme of the algorithm in pseudo-code. */ \ + /** Tags for retrieval methods. */ \ + namespace tag \ + { \ \ - /* FIXME: Check for mlc::undefined? */ \ + /** Abstraction for method tags. */ \ + struct method {}; \ \ - /* FIXME: The presence of `vtypes' is the only thing that makes */ \ - /* this code different from the retrieval within an external */ \ - /* vtype. How can we factor this? */ \ - template <typename category, typename from_type, typename typedef_type> \ - struct rec_get_vtype \ - { \ - /** Set of vtypes associated with FROM_TYPE. */ \ - typedef vtypes<category, from_type> types; \ - /** Typedef in the current vtypes (may be mlc::not_found). */ \ - typedef stc_internal_get_typedef(types, typedef_type) type; \ + /** Tag for retrieval within internal vtypes. */ \ + struct internal : public method {}; \ + /** Tag for retrieval within external vtypes. */ \ + struct external : public method {}; \ \ - /** Implicit parent (i.e. super), if any. */ \ - typedef stc_super(from_type) super; \ - /** Pseudosuper class, if any. */ \ - typedef stc_pseudosuper(from_type) pseudosuper; \ + } /** end of stc::internal::tag */ \ \ - typedef typename \ - mlc::if_< \ - mlc::neq_< type, mlc::not_found >, \ - /* then */ \ - /* return it */ \ - /* (the typedef has been found in the vtypes */ \ - /* associated to FROM_TYPE) */ \ - type, \ - /* else */ \ - /* check if the vtype of the `super' of FROM_TYPE */ \ - /* has the typedef */ \ - typename \ - mlc::if_< mlc::neq_< typename rec_get_vtype< category, \ - super, \ - typedef_type >::ret, \ - mlc::not_found >, \ - /* then */ \ - /* return it */ \ - typename rec_get_vtype< category, \ - super, \ - typedef_type >::ret, \ - /* else */ \ - /* check if the FROM_TYPE has a decl_parent */ \ - /* and try to retrieve the typedef from it. */ \ - typename rec_get_vtype< category, \ - pseudosuper, \ - typedef_type >::ret >::ret >::ret \ - ret; \ - }; \ \ - /** Ends of the recursive retrieval (mlc::none is at the end of the */ \ - /** transitive closure of every `super' relation). */ \ - /** \{ */ \ - /** Case where \a from_type = mlc::none (end of a recursive */ \ - /** retrieval following `super' types). */ \ - template <typename category, typename typedef_type> \ - struct rec_get_vtype<category, mlc::none, typedef_type> \ + /** Try to get \a typedef_type from \a from_type. In case this */ \ + /** typedef is mlc::not_found, don't perform a recursive */ \ + /** retrieval, simply return mlc::not_found. */ \ + template <typename method, typename category, \ + typename from_type, typename typedef_type> \ + struct get_vtype \ { \ - typedef mlc::not_found ret; \ + /* Nothing (no method selected). */ \ }; \ - /** Case where \a from_type = mlc::not_found (end of a recursive */ \ - /** retrieval following `super' types). */ \ - template <typename category, typename typedef_type> \ - struct rec_get_vtype<category, mlc::not_found, typedef_type> \ + \ + /** Specialization of get_vtypes for retrievals within */ \ + /** internal vtypes. */ \ + template <typename category, typename from_type, typename typedef_type> \ + struct get_vtype<tag::internal, category, from_type, typedef_type> \ { \ - typedef mlc::not_found ret; \ + /** Set of vtypes associated with FROM_TYPE. */ \ + typedef vtypes<category, from_type> types; \ + /** Typedef in the current vtypes (may be mlc::not_found). */ \ + typedef stc_internal_get_typedef(types, typedef_type) ret; \ }; \ - /** \} */ \ - \ - /* ------------------------------------------ */ \ - /* Recursive retrieval of an external vtype. */ \ - /* ------------------------------------------ */ \ - \ - /* FIXME: Merge this with rec_get_vtype. */ \ \ + /** Specialization of get_vtypes for retrievals within */ \ + /** external vtypes. */ \ template <typename category, typename from_type, typename typedef_type> \ - struct rec_get_ext_vtype \ + struct get_vtype<tag::external, category, from_type, typedef_type> \ { \ /** Set of vtypes associated with FROM_TYPE. */ \ typedef ext_vtype<category, from_type, typedef_type> ext_type; \ /** Typedef in the current vtypes (may be mlc::not_found). */ \ - typedef mlc_ret(ext_type) type; \ + typedef mlc_ret(ext_type) ret; \ + }; \ + \ + \ + /* FIXME: Do a basic scheme of the algorithm in pseudo-code. */ \ + /* FIXME: Check for mlc::undefined? */ \ + \ + /** Recursive retrieval of a virtual type. */ \ + template <typename method, typename category, \ + typename from_type, typename typedef_type> \ + struct rec_get_vtype : \ + private mlc::assert_< mlc_is_a(method, tag::method), \ + stc::ERROR::FIRST_PARAMETER_OF_rec_get_vtype_SHOULD_BE_A_TAG > \ + { \ + typedef typename \ + get_vtype<method, category, from_type, typedef_type>::ret type; \ \ /** Implicit parent (i.e. super), if any. */ \ typedef stc_super(from_type) super; \ @@ -237,19 +231,22 @@ /* check if the vtype of the `super' of FROM_TYPE */ \ /* has the typedef */ \ typename \ - mlc::if_< mlc::neq_< typename rec_get_ext_vtype< category, \ + mlc::if_< mlc::neq_< typename rec_get_vtype< method, \ + category, \ super, \ typedef_type >::ret, \ mlc::not_found >, \ /* then */ \ /* return it */ \ - typename rec_get_ext_vtype< category, \ + typename rec_get_vtype< method, \ + category, \ super, \ typedef_type >::ret, \ /* else */ \ /* check if the FROM_TYPE has a decl_parent */ \ /* and try to retrieve the typedef from it. */ \ - typename rec_get_ext_vtype< category, \ + typename rec_get_vtype< method, \ + category, \ pseudosuper, \ typedef_type >::ret>::ret>::ret \ ret; \ @@ -260,20 +257,21 @@ /** \{ */ \ /** Case where \a from_type = mlc::none (end of a recursive */ \ /** retrieval following `super' types). */ \ - template <typename category, typename typedef_type> \ - struct rec_get_ext_vtype<category, mlc::none, typedef_type> \ + template <typename method, typename category, typename typedef_type> \ + struct rec_get_vtype<method, category, mlc::none, typedef_type> \ { \ typedef mlc::not_found ret; \ }; \ /** Case where \a from_type = mlc::not_found (end of a recursive */ \ /** retrieval following `super' types). */ \ - template <typename category, typename typedef_type> \ - struct rec_get_ext_vtype<category, mlc::not_found, typedef_type> \ + template <typename method, typename category, typename typedef_type> \ + struct rec_get_vtype<method, category, mlc::not_found, typedef_type> \ { \ typedef mlc::not_found ret; \ }; \ /** \} */ \ \ + \ /* ------------------------------------- */ \ /* External/internal typedef selection. */ \ /* ------------------------------------- */ \ @@ -329,20 +327,22 @@ template <typename category, typename from_type, typename typedef_type> \ struct type_of_ \ { \ - /* Look for the typedef as an external type. */ \ - typedef typename \ - internal::rec_get_ext_vtype<category, from_type, typedef_type>::ret \ - external_typedef; \ /* Look for the typedef in internal types. */ \ typedef typename \ - internal::rec_get_vtype<category, from_type, typedef_type>::ret \ + internal::rec_get_vtype<internal::tag::internal, category, \ + from_type, typedef_type>::ret \ internal_typedef; \ + /* Look for the typedef as an external type. */ \ + typedef typename \ + internal::rec_get_vtype<internal::tag::external, category, \ + from_type, typedef_type>::ret \ + external_typedef; \ \ /* Did we found the virtual type? */ \ - static const bool found_external_p = \ - mlc_bool(mlc::is_found_<external_typedef>); \ static const bool found_internal_p = \ mlc_bool(mlc::is_found_<internal_typedef>); \ + static const bool found_external_p = \ + mlc_bool(mlc::is_found_<external_typedef>); \ \ typedef typename \ internal::select_typedef<found_external_p, found_internal_p, \

18 years, 7 months

482: Scool parser.

by mefyl

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Quentin Hocquet <mefyl(a)lrde.epita.fr> Scool parser. * tools: New. * tools/test.yml: New. * tools/transformer: New. * tools/transformer/scoolc.str: New. * tools/transformer/Makefile: New. * tools/tests: New. * tools/tests/syntax error: New. * tools/tests/syntax error/wrong.scl: New. * tools/tests/parse-ref: New. * tools/tests/parse-ref/vardec.ref: New. * tools/tests/parse-ref/fundec.ref: New. * tools/tests/parse-ref/funcall_no-args.ref: New. * tools/tests/parse-ref/emtpy-class_dec.ref: New. * tools/tests/parse-ref/empty-class_dec.ref: New. * tools/tests/parse-ref/varinit.ref: New. * tools/tests/parse-ref/no-args_funtype.ref: New. * tools/tests/parse-ref/manydec.ref: New. * tools/tests/parse-ref/class_dec.ref: New. * tools/tests/parse-ref/wiki1.ref: New. * tools/tests/parse-ref/funcall.ref: New. * tools/tests/parse-ref/bi-exp.ref: New. * tools/tests/parse-ref/function.ref: New. * tools/tests/parse-ref/wiki2.ref: New. * tools/tests/parse-ref/consinit.ref: New. * tools/tests/parse-ref/wiki3.ref: New. * tools/tests/parse-ref/funtype.ref: New. * tools/tests/parse-ref/empty.ref: New. * tools/tests/parse-ref/type_static-call.ref: New. * tools/tests/parse-ref/guard.ref: New. * tools/tests/good: New. * tools/tests/good/type_static-call.scl: New. * tools/tests/good/guard.scl: New. * tools/tests/good/fundec.scl: New. * tools/tests/good/vardec.scl: New. * tools/tests/good/funcall_no-args.scl: New. * tools/tests/good/varinit.scl: New. * tools/tests/good/empty-class_dec.scl: New. * tools/tests/good/manydec.scl: New. * tools/tests/good/class_dec.scl: New. * tools/tests/good/no-args_funtype.scl: New. * tools/tests/good/bi-exp.scl: New. * tools/tests/good/wiki1.scl: New. * tools/tests/good/funcall.scl: New. * tools/tests/good/wiki2.scl: New. * tools/tests/good/function.scl: New. * tools/tests/good/consinit.scl: New. * tools/tests/good/wiki3.scl: New. * tools/tests/good/funtype.scl: New. * tools/tests/good/empty.scl: New. * tools/scoolc: New. * tools/gen.yml: New. * tools/parser: New. * tools/parser/grammar: New. * tools/parser/grammar/Class.sdf: New. * tools/parser/grammar/Decl.sdf: New. * tools/parser/grammar/Exp.sdf: New. * tools/parser/grammar/ExpOrType.sdf: New. * tools/parser/grammar/Scool.sdf: New. * tools/parser/grammar/Lexical.sdf: New. * tools/parser/grammar/Type.sdf: New. * tools/parser/grammar/Guard.sdf: New. * tools/parser/grammar/Stm.sdf: New. * tools/parser/parse-scool: New. * tools/parser/Makefile: New. * tools/Makefile: New. 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 insertions(+) Index: tools/test.yml --- tools/test.yml (revision 0) +++ tools/test.yml (revision 0) @@ -0,0 +1,18 @@ +--- +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/transformer/scoolc.str --- tools/transformer/scoolc.str (revision 0) +++ tools/transformer/scoolc.str (revision 0) @@ -0,0 +1,6 @@ +module scoolc + +imports liblib Scool + +strategies + main = io-wrap(id) Index: tools/transformer/Makefile --- tools/transformer/Makefile (revision 0) +++ tools/transformer/Makefile (revision 0) @@ -0,0 +1,6 @@ + +scoolc: scoolc.str + strc -i $< -I ../parser -la stratego-lib + +clean: + rm -rf scoolc scoolc.dep scoolc.o scoolc.c .libs Index: tools/tests/syntax error/wrong.scl --- tools/tests/syntax error/wrong.scl (revision 0) +++ tools/tests/syntax error/wrong.scl (revision 0) @@ -0,0 +1 @@ +var i::int; Index: tools/tests/parse-ref/vardec.ref --- tools/tests/parse-ref/vardec.ref (revision 0) +++ tools/tests/parse-ref/vardec.ref (revision 0) @@ -0,0 +1 @@ +Program([VarDec("i",Var("int"))]) Index: tools/tests/parse-ref/fundec.ref --- tools/tests/parse-ref/fundec.ref (revision 0) +++ tools/tests/parse-ref/fundec.ref (revision 0) @@ -0,0 +1 @@ +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 0) +++ tools/tests/parse-ref/funcall_no-args.ref (revision 0) @@ -0,0 +1 @@ +Program([FunDec("doit",[],Var("int"),[Return(FunCall("chiche",[]))])]) Index: tools/tests/parse-ref/emtpy-class_dec.ref Index: tools/tests/parse-ref/empty-class_dec.ref --- tools/tests/parse-ref/empty-class_dec.ref (revision 0) +++ tools/tests/parse-ref/empty-class_dec.ref (revision 0) @@ -0,0 +1 @@ +Program([ConsDec("foo",Class,Class([]))]) Index: tools/tests/parse-ref/varinit.ref --- tools/tests/parse-ref/varinit.ref (revision 0) +++ tools/tests/parse-ref/varinit.ref (revision 0) @@ -0,0 +1 @@ +Program([VarDec("i",Var("int"),Int("42"))]) Index: tools/tests/parse-ref/no-args_funtype.ref --- tools/tests/parse-ref/no-args_funtype.ref (revision 0) +++ tools/tests/parse-ref/no-args_funtype.ref (revision 0) @@ -0,0 +1 @@ +Program([VarDec("f",FunType([],Var("void")))]) Index: tools/tests/parse-ref/manydec.ref --- tools/tests/parse-ref/manydec.ref (revision 0) +++ tools/tests/parse-ref/manydec.ref (revision 0) @@ -0,0 +1 @@ +Program([ConsDec("answer",Var("int"),Int("42")),VarDec("i",Var("int")),VarDec("j",Var("int"),Var("i"))]) Index: tools/tests/parse-ref/class_dec.ref --- tools/tests/parse-ref/class_dec.ref (revision 0) +++ tools/tests/parse-ref/class_dec.ref (revision 0) @@ -0,0 +1 @@ +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/wiki1.ref --- tools/tests/parse-ref/wiki1.ref (revision 0) +++ tools/tests/parse-ref/wiki1.ref (revision 0) @@ -0,0 +1 @@ +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/funcall.ref --- tools/tests/parse-ref/funcall.ref (revision 0) +++ tools/tests/parse-ref/funcall.ref (revision 0) @@ -0,0 +1 @@ +Program([FunDec("doit",[],Var("int"),[Return(FunCall("chiche",[String("\"pelle\""),String("\"branle\"")]))])]) Index: tools/tests/parse-ref/bi-exp.ref --- tools/tests/parse-ref/bi-exp.ref (revision 0) +++ tools/tests/parse-ref/bi-exp.ref (revision 0) @@ -0,0 +1 @@ +Program([ConsDec("i",Var("int"),BiFunCall("pow",[Int("4")],[Int("3")]))]) Index: tools/tests/parse-ref/function.ref --- tools/tests/parse-ref/function.ref (revision 0) +++ tools/tests/parse-ref/function.ref (revision 0) @@ -0,0 +1 @@ +Program([FunDec("answer",[],Var("int"),[Return(Int("42"))])]) Index: tools/tests/parse-ref/wiki2.ref --- tools/tests/parse-ref/wiki2.ref (revision 0) +++ tools/tests/parse-ref/wiki2.ref (revision 0) @@ -0,0 +1 @@ +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/consinit.ref --- tools/tests/parse-ref/consinit.ref (revision 0) +++ tools/tests/parse-ref/consinit.ref (revision 0) @@ -0,0 +1 @@ +Program([ConsDec("i",Var("int"),Int("3"))]) Index: tools/tests/parse-ref/wiki3.ref --- tools/tests/parse-ref/wiki3.ref (revision 0) +++ tools/tests/parse-ref/wiki3.ref (revision 0) @@ -0,0 +1 @@ +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 0) +++ tools/tests/parse-ref/funtype.ref (revision 0) @@ -0,0 +1 @@ +Program([VarDec("f",FunType([Var("int"),Var("bool")],Var("float")))]) Index: tools/tests/parse-ref/empty.ref --- tools/tests/parse-ref/empty.ref (revision 0) +++ tools/tests/parse-ref/empty.ref (revision 0) @@ -0,0 +1 @@ +Program([]) Index: tools/tests/parse-ref/type_static-call.ref --- tools/tests/parse-ref/type_static-call.ref (revision 0) +++ tools/tests/parse-ref/type_static-call.ref (revision 0) @@ -0,0 +1 @@ +Program([VarDec("l",StaticFunCall("list",[Var("int")]))]) Index: tools/tests/parse-ref/guard.ref --- tools/tests/parse-ref/guard.ref (revision 0) +++ tools/tests/parse-ref/guard.ref (revision 0) @@ -0,0 +1 @@ +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 0) +++ tools/tests/good/type_static-call.scl (revision 0) @@ -0,0 +1 @@ +var l : list[int]; Index: tools/tests/good/guard.scl --- tools/tests/good/guard.scl (revision 0) +++ tools/tests/good/guard.scl (revision 0) @@ -0,0 +1 @@ +f : [i : int where i > 0]() -> int = {} \ No newline at end of file Index: tools/tests/good/fundec.scl --- tools/tests/good/fundec.scl (revision 0) +++ tools/tests/good/fundec.scl (revision 0) @@ -0,0 +1,2 @@ +f : (a: int, b : int) -> bool = +{} Index: tools/tests/good/vardec.scl --- tools/tests/good/vardec.scl (revision 0) +++ tools/tests/good/vardec.scl (revision 0) @@ -0,0 +1 @@ +var i : int; Index: tools/tests/good/funcall_no-args.scl --- tools/tests/good/funcall_no-args.scl (revision 0) +++ tools/tests/good/funcall_no-args.scl (revision 0) @@ -0,0 +1,4 @@ +doit : () -> int = +{ + -> chiche(); +} \ No newline at end of file Index: tools/tests/good/varinit.scl --- tools/tests/good/varinit.scl (revision 0) +++ tools/tests/good/varinit.scl (revision 0) @@ -0,0 +1 @@ +var i : int := 42; Index: tools/tests/good/empty-class_dec.scl --- tools/tests/good/empty-class_dec.scl (revision 0) +++ tools/tests/good/empty-class_dec.scl (revision 0) @@ -0,0 +1 @@ +foo : class = {}; \ No newline at end of file Index: tools/tests/good/manydec.scl --- tools/tests/good/manydec.scl (revision 0) +++ tools/tests/good/manydec.scl (revision 0) @@ -0,0 +1,4 @@ +answer : int = 42; + +var i : int; +var j : int := i; Index: tools/tests/good/class_dec.scl --- tools/tests/good/class_dec.scl (revision 0) +++ tools/tests/good/class_dec.scl (revision 0) @@ -0,0 +1,15 @@ +point : class = +{ + public + { + x : () -> int = + { + -> x; + } + } + private + { + var x :int; + var y :int; + } +}; \ No newline at end of file Index: tools/tests/good/no-args_funtype.scl --- tools/tests/good/no-args_funtype.scl (revision 0) +++ tools/tests/good/no-args_funtype.scl (revision 0) @@ -0,0 +1 @@ +var f : () -> void; \ No newline at end of file Index: tools/tests/good/bi-exp.scl --- tools/tests/good/bi-exp.scl (revision 0) +++ tools/tests/good/bi-exp.scl (revision 0) @@ -0,0 +1 @@ +i : int = pow[4](3); \ No newline at end of file Index: tools/tests/good/wiki1.scl --- tools/tests/good/wiki1.scl (revision 0) +++ tools/tests/good/wiki1.scl (revision 0) @@ -0,0 +1,9 @@ + +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 0) +++ tools/tests/good/funcall.scl (revision 0) @@ -0,0 +1,4 @@ +doit : () -> int = +{ + -> chiche("pelle", "branle"); +} \ No newline at end of file Index: tools/tests/good/wiki2.scl --- tools/tests/good/wiki2.scl (revision 0) +++ tools/tests/good/wiki2.scl (revision 0) @@ -0,0 +1,5 @@ +f : () -> void = +{ + var a : array[2,int16]; + var i : int16 := a.at(0); +} Index: tools/tests/good/function.scl --- tools/tests/good/function.scl (revision 0) +++ tools/tests/good/function.scl (revision 0) @@ -0,0 +1,4 @@ +answer : () -> int = +{ + -> 42; +} \ No newline at end of file Index: tools/tests/good/consinit.scl --- tools/tests/good/consinit.scl (revision 0) +++ tools/tests/good/consinit.scl (revision 0) @@ -0,0 +1 @@ +i : int = 3; \ No newline at end of file Index: tools/tests/good/wiki3.scl --- tools/tests/good/wiki3.scl (revision 0) +++ tools/tests/good/wiki3.scl (revision 0) @@ -0,0 +1,9 @@ +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 0) +++ tools/tests/good/funtype.scl (revision 0) @@ -0,0 +1 @@ +var f : (int, bool) -> float; \ No newline at end of file Index: tools/tests/good/empty.scl Index: tools/scoolc --- tools/scoolc (revision 0) +++ tools/scoolc (revision 0) @@ -0,0 +1,4 @@ +#!/bin/sh +# -*- sh -*- + +parser/parse-scool $1 | transformer/scoolc Property changes on: tools/scoolc ___________________________________________________________________ Name: svn:executable + * Index: tools/gen.yml --- tools/gen.yml (revision 0) +++ tools/gen.yml (revision 0) @@ -0,0 +1,9 @@ +--- +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 0) +++ tools/parser/grammar/Class.sdf (revision 0) @@ -0,0 +1,18 @@ +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 0) +++ tools/parser/grammar/Decl.sdf (revision 0) @@ -0,0 +1,48 @@ +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 0) +++ tools/parser/grammar/Exp.sdf (revision 0) @@ -0,0 +1,43 @@ +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/ExpOrType.sdf --- tools/parser/grammar/ExpOrType.sdf (revision 0) +++ tools/parser/grammar/ExpOrType.sdf (revision 0) @@ -0,0 +1,12 @@ +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/Scool.sdf --- tools/parser/grammar/Scool.sdf (revision 0) +++ tools/parser/grammar/Scool.sdf (revision 0) @@ -0,0 +1,11 @@ +module Scool + +imports + Decl + +exports + sorts Program + context-free start-symbols Program + context-free syntax + + Decl* -> Program {cons("Program")} Index: tools/parser/grammar/Lexical.sdf --- tools/parser/grammar/Lexical.sdf (revision 0) +++ tools/parser/grammar/Lexical.sdf (revision 0) @@ -0,0 +1,28 @@ +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/Type.sdf --- tools/parser/grammar/Type.sdf (revision 0) +++ tools/parser/grammar/Type.sdf (revision 0) @@ -0,0 +1,18 @@ +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/Guard.sdf --- tools/parser/grammar/Guard.sdf (revision 0) +++ tools/parser/grammar/Guard.sdf (revision 0) @@ -0,0 +1,10 @@ +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 0) +++ tools/parser/grammar/Stm.sdf (revision 0) @@ -0,0 +1,17 @@ +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 0) +++ tools/parser/parse-scool (revision 0) @@ -0,0 +1,8 @@ +#!/bin/sh +# -*- sh -*- + +if [ $# -eq 0 ]; then + echo "usage: parse-scool file.scl" +else + sglri -p parser/Scool.tbl -i $1 +fi Property changes on: tools/parser/parse-scool ___________________________________________________________________ Name: svn:executable + * Index: tools/parser/Makefile --- tools/parser/Makefile (revision 0) +++ tools/parser/Makefile (revision 0) @@ -0,0 +1,20 @@ +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 0) +++ tools/Makefile (revision 0) @@ -0,0 +1,14 @@ +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

18 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches