Olena-patches June 2006

olena-patches@lrde.epita.fr

2 participants
27 discussions

Re: [Olena-patches] 482: Scool parser.
by Roland Levillain 05 Jun '06

05 Jun '06

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.

1 0

491: Please ICC w.r.t. the substitution of arguments of macros.
by Roland Levillain 01 Jun '06

01 Jun '06

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

1 0

490: Factor the recursive retrieval in internal and external vtypes.
by Roland Levillain 01 Jun '06

01 Jun '06

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, \

1 0

482: Scool parser.
by mefyl 01 Jun '06

01 Jun '06

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

2 1

488: Enforce coding style in stc::exact.
by Roland Levillain 01 Jun '06

01 Jun '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Enforce coding style in stc::exact. * stc/any.hh, tests/exact.cc: s/exact_t/exact_type/g. * stc/exact.hh: Likewise. s/case_t/case_type/. Remove superfluous `inline' qualifiers. stc/any.hh | 6 +++--- stc/exact.hh | 17 ++++++++--------- tests/exact.cc | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) Index: tests/exact.cc --- tests/exact.cc (revision 487) +++ tests/exact.cc (working copy) @@ -118,7 +118,7 @@ //----------------------------------------- { concrete t; - const concrete::exact_t& tmp = stc::exact(t); + const concrete::exact_type& tmp = stc::exact(t); std::cout << &t << " = " << &tmp << std::endl; } @@ -132,7 +132,7 @@ { concrete t; sub_abstraction<concrete>& st = t; - const sub_abstraction<concrete>::exact_t& tmp = stc::exact(st); + const sub_abstraction<concrete>::exact_type& tmp = stc::exact(st); std::cout << &t << " = " << &tmp << std::endl; tmp.foo(); @@ -147,7 +147,7 @@ { concrete t; abstraction<concrete>& a = t; - const abstraction<concrete>::exact_t& tmp = stc::exact(a); + const abstraction<concrete>::exact_type& tmp = stc::exact(a); std::cout << &t << " = " << &tmp << std::endl; } Index: stc/exact.hh --- stc/exact.hh (revision 487) +++ stc/exact.hh (working copy) @@ -94,9 +94,9 @@ { struct protected_ { - typedef typename T::exact_t ret; + typedef typename T::exact_type ret; - static inline ret& impl(T& t) + static ret& impl(T& t) { return t.exact(); } @@ -110,12 +110,11 @@ { typedef T ret; - static inline ret& impl(T& t) + static ret& impl(T& t) { return t; } }; - }; @@ -124,10 +123,10 @@ { typedef typename switch_<tag::exact, T>::ret ret; - static inline ret& impl(const T& t) + static ret& impl(const T& t) { - typedef typename case_<tag::exact, T>::ret case_t; - return case_t::impl(const_cast<T&>(t)); + typedef typename case_<tag::exact, T>::ret case_type; + return case_type::impl(const_cast<T&>(t)); } }; @@ -137,7 +136,7 @@ { typedef const typename to_exact_<T>::ret ret; - static inline ret& impl(const T& t) + static ret& impl(const T& t) { return to_exact_<T>::impl(const_cast<T&>(t)); } @@ -149,7 +148,7 @@ { typedef typename to_exact_<T>::ret * ret; - static inline ret impl(T* t) + static ret impl(T* t) { return & to_exact_<T>::impl(*t); } Index: stc/any.hh --- stc/any.hh (revision 487) +++ stc/any.hh (working copy) @@ -67,7 +67,7 @@ struct any <E, dispatch_policy::best_speed> { - typedef E exact_t; + typedef E exact_type; E& exact() { precondition(exact_ptr != 0); @@ -131,7 +131,7 @@ struct any <E, dispatch_policy::best_memory> { - typedef E exact_t; + typedef E exact_type; E& exact() { # if defined __GNUC__ && __GNUC__ >= 3 @@ -189,7 +189,7 @@ struct any <E, dispatch_policy::simple> { - typedef E exact_t; + typedef E exact_type; E& exact() { return *(E*)(void*)this;

1 0

486: Add stc::exact.
by Thomas Moulard 01 Jun '06

01 Jun '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Thomas Moulard <thomas.moulard(a)lrde.epita.fr> Add stc::exact. * static/tests/exact.cc: test suite of stc::exact (new file). * static/stc/exact.hh: implementation of stc::exact (new file). * static/stc/any.hh: adding a typedef exact_t in stc::any. * metalic/mlc/case.hh: fixing a bug in the protected defaults cases. metalic/mlc/case.hh | 30 ++----- static/stc/any.hh | 6 + static/stc/exact.hh | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++ static/tests/exact.cc | 161 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 373 insertions(+), 22 deletions(-) Index: static/tests/exact.cc --- static/tests/exact.cc (revision 0) +++ static/tests/exact.cc (revision 0) @@ -0,0 +1,161 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 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 <iostream> +#include <exact.hh> // FIXME: was stc/exact.hh + +template <typename E> +struct abstraction : public stc::any<E> +{ +}; + + +template <typename E> +struct sub_abstraction : public abstraction<E> +{ +}; + +struct itself {}; + + +template <typename T = itself> +struct concrete_ : public sub_abstraction< concrete_<T> > +{ + void foo() const + { + std::cout << "foo() " << std::endl; + } +}; + +typedef concrete_<> concrete; + + +int main() +{ + //----------------------------------------- + + { + std::cout << stc::exact(42) << std::endl; + } + + { + int i = 42; + std::cout << stc::exact(i) << std::endl; + } + + { + const int i = 42; + std::cout << stc::exact(i) << std::endl; + } + + + { + int i = 42; + int * pi = &i; + std::cout << pi << " = " + << stc::exact(pi) << std::endl; + } + + { + int i = 42; + int * const pi = &i; + std::cout << pi << " = " + << stc::exact(pi) << std::endl; + } + + { + int i = 42; + const int * pi = &i; + std::cout << pi << " = " + << stc::exact(pi) << std::endl; + } + + { + int i = 42; + const int * const pi = &i; + std::cout << pi << " = " + << stc::exact(pi) << std::endl; + } + + // FIXME: Doesn't work! + +// { +// int i = 42; +// int * pi = &i; +// int ** ppi = π +// // stc::exact(ppi); + +// const int ci = 42; +// const int * cpi = &ci; +// const int ** cppi = &cpi; +// stc::exact(cppi); +// } + + //----------------------------------------- + { + concrete t; + const concrete::exact_t& tmp = stc::exact(t); + std::cout << &t << " = " + << &tmp << std::endl; + } + { + concrete *t = new concrete; + std::cout << t << " = " + << stc::exact(t) << std::endl; + } + + //----------------------------------------- + { + concrete t; + sub_abstraction<concrete>& st = t; + const sub_abstraction<concrete>::exact_t& tmp = stc::exact(st); + std::cout << &t << " = " + << &tmp << std::endl; + tmp.foo(); + } + { + sub_abstraction<concrete> *t = new concrete; + std::cout << t << " = " + << stc::exact(t) << std::endl; + } + + //----------------------------------------- + { + concrete t; + abstraction<concrete>& a = t; + const abstraction<concrete>::exact_t& tmp = stc::exact(a); + std::cout << &t << " = " + << &tmp << std::endl; + } + { + abstraction<concrete> *t = new concrete; + std::cout << t << " = " + << stc::exact(t) << std::endl; + } + +} Property changes on: static/tests/exact.cc ___________________________________________________________________ Name: svn:executable + * Index: static/stc/exact.hh --- static/stc/exact.hh (revision 0) +++ static/stc/exact.hh (revision 0) @@ -0,0 +1,198 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 EPITA Research and +// Development Laboratory. +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef STATIC_EXACT_HH +# define STATIC_EXACT_HH + +# include <stc/any.hh> + +# include <mlc/is_a.hh> +# include <mlc/case.hh> +# include <mlc/bexpr.hh> + + + + +# define stc_internal_is_any(T) \ +mlc::bexpr_< sizeof(internal::any_select(internal::makePtr< T >())) == sizeof(internal::yes_) > + + + +namespace stc +{ + + namespace internal + { + typedef char yes_; + struct no_ { char dummy[2]; }; + + template <typename E, typename P> + yes_ any_select(const stc::any<E,P>* arg); + + no_ any_select(...); + + template <typename T> + T* makePtr(); + + } + + template <typename T> + struct is_any_ + : public stc_internal_is_any(T) + { + }; + + template <typename T> + struct is_any_ < T* >; + + template <typename T> + struct is_any_ < const T >; + +} // end of namespace stc + + +mlc_case_equipment_for_namespace(stc); + + +namespace stc +{ + + + namespace tag + { + struct exact; + } + + + template <class T> + struct case_<tag::exact, T, 1> : public mlc::where_ < stc::is_any_<T> > + { + struct protected_ + { + typedef typename T::exact_t ret; + + static inline ret& impl(T& t) + { + return t.exact(); + } + }; + }; + + template <typename T> + struct default_case_<tag::exact, T> + { + struct protected_ + { + typedef T ret; + + static inline ret& impl(T& t) + { + return t; + } + }; + + }; + + + template <typename T> + struct to_exact_ + { + typedef typename switch_<tag::exact, T>::ret ret; + + static inline ret& impl(const T& t) + { + typedef typename case_<tag::exact, T>::ret case_t; + return case_t::impl(const_cast<T&>(t)); + } + }; + + + template <typename T> + struct to_exact_ < const T > + { + typedef const typename to_exact_<T>::ret ret; + + static inline ret& impl(const T& t) + { + return to_exact_<T>::impl(const_cast<T&>(t)); + } + }; + + + template <typename T> + struct to_exact_ < T* > + { + typedef typename to_exact_<T>::ret * ret; + + static inline ret impl(T* t) + { + return & to_exact_<T>::impl(*t); + } + }; + + + + template <typename T> + const typename to_exact_<const T>::ret& + exact(const T& t) + { + return to_exact_<const T>::impl(t); + } + + template <typename T> + typename to_exact_<T>::ret& + exact(T& t) + { + return to_exact_<T>::impl(t); + } + + template <typename T> + typename to_exact_<const T*>::ret + exact(const T* t) + { + return to_exact_<const T*>::impl(t); + } + + template <typename T> + typename to_exact_<T*>::ret + exact(T* t) + { + return to_exact_<T*>::impl(t); + } + + + template <typename T> + void exact(const T** t); + + template <typename T> + void exact(T** t); + + +} // end of namespace stc + +#endif // ! STATIC_EXACT_HH Property changes on: static/stc/exact.hh ___________________________________________________________________ Name: svn:executable + * Index: static/stc/any.hh --- static/stc/any.hh (revision 485) +++ static/stc/any.hh (working copy) @@ -67,6 +67,8 @@ struct any <E, dispatch_policy::best_speed> { + typedef E exact_t; + E& exact() { precondition(exact_ptr != 0); return *exact_ptr; @@ -129,6 +131,8 @@ struct any <E, dispatch_policy::best_memory> { + typedef E exact_t; + E& exact() { # if defined __GNUC__ && __GNUC__ >= 3 return static_cast<E&>(*this); @@ -185,6 +189,8 @@ struct any <E, dispatch_policy::simple> { + typedef E exact_t; + E& exact() { return *(E*)(void*)this; } Index: metalic/mlc/case.hh --- metalic/mlc/case.hh (revision 485) +++ metalic/mlc/case.hh (working copy) @@ -264,9 +264,15 @@ \ { \ typedef NAMESPACE::default_case_<context, data> case_t; \ + typedef typename protected_in_<case_t>::the protected_case_t; \ + \ + typedef typename mlc::if_< mlc::is_found_<protected_case_t>, \ + protected_case_t, \ + case_t >::ret eff_case_t; \ + \ typedef typename mlc::if_<mlc_is_a(case_t, mlc::undefined), \ mlc::none, \ - case_t>::ret ret; \ + eff_case_t>::ret ret; \ }; \ \ \ @@ -339,27 +345,7 @@ mlc::where_), \ mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \ mlc::undefined) >, \ - mlc::ERROR::A_case_STATEMENT_SHOULD_DERIVE_FROM_mlc_where_ >, \ - \ - private mlc::assert_< mlc::implies_< mlc::and_< mlc::eq_<use, mlc::internal::a_switch_case>, \ - mlc::is_defined_< NAMESPACE::case_<context, data, i> > >, \ - mlc::or_< mlc::ret_found_in_< NAMESPACE::case_<context, data, i> >, \ - typename protected_in_< NAMESPACE::case_<context, data, i> >::is_found > >, \ - mlc::ERROR::A_case_STATEMENT_IN_A_switch_SHOULD_HAVE_EITHER_A_ret_OR_A_protected >, \ - \ - private mlc::assert_< mlc::implies_< mlc::and_list_< mlc::eq_<use, mlc::internal::a_switch_case>, \ - mlc::is_defined_< NAMESPACE::case_<context, data, i> >, \ - mlc::or_< mlc::ret_found_in_< NAMESPACE::case_<context, data, i> >, \ - typename protected_in_< NAMESPACE::case_<context, data, i> >::is_found > >, \ - mlc::xor_< mlc::ret_found_in_< NAMESPACE::case_<context, data, i> >, \ - typename protected_in_< NAMESPACE::case_<context, data, i> >::is_found > >, \ - mlc::ERROR::A_case_STATEMENT_IN_A_switch_SHOULD_NOT_HAVE_BOTH_A_ret_AND_A_protected >, \ - \ - private mlc::assert_< mlc::implies_< mlc::and_list_< mlc::eq_<use, mlc::internal::a_switch_case>, \ - mlc::is_defined_< NAMESPACE::case_<context, data, i> >, \ - typename protected_in_< NAMESPACE::case_<context, data, i> >::is_found >, \ - typename protected_in_< NAMESPACE::case_<context, data, i> >::is_found_with_ret >, \ - mlc::ERROR::THE_protected_PART_OF_A_case_STATEMENT_IN_A_switch_SHOULD_HAVE_A_ret > \ + mlc::ERROR::A_case_STATEMENT_SHOULD_DERIVE_FROM_mlc_where_ > \ { \ typedef mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i+1>), \ mlc::case_selected) next_case_is_selected; \

2 1

487: Have tests/exact.cc be (actually) part of Static's test-suite.
by Roland Levillain 01 Jun '06

01 Jun '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Have tests/exact.cc be (actually) part of Static's test-suite. * stc/exact.hh: Aesthetic change. Fix copyright headers. * tests/exact.cc: Likewise. Fix an inclusion of header. * tests/Makefile.am (check_PROGRAMS): Add exact. (exact_SOURCES): New. * tests/any.cc: Aesthetic change. stc/exact.hh | 6 +++--- tests/Makefile.am | 2 ++ tests/any.cc | 2 +- tests/exact.cc | 5 ++--- 4 files changed, 8 insertions(+), 7 deletions(-) Index: tests/exact.cc --- tests/exact.cc (revision 486) +++ tests/exact.cc (working copy) @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 EPITA Research and -// Development Laboratory. +// 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 @@ -27,7 +26,7 @@ // Public License. #include <iostream> -#include <exact.hh> // FIXME: was stc/exact.hh +#include <stc/exact.hh> template <typename E> struct abstraction : public stc::any<E> Index: tests/Makefile.am --- tests/Makefile.am (revision 486) +++ tests/Makefile.am (working copy) @@ -10,10 +10,12 @@ check_PROGRAMS = \ any \ entry \ + exact \ vtypes any_SOURCES = any.cc entry_SOURCES = entry.cc +exact_SOURCES = exact.cc vtypes_SOURCES = vtypes.cc TESTS = $(check_PROGRAMS) Index: tests/any.cc --- tests/any.cc (revision 486) +++ tests/any.cc (working copy) @@ -28,8 +28,8 @@ /// Test stc::any. #include <stc/any.hh> -#include <mlc/cmp.hh> #include <mlc/assert.hh> +#include <mlc/cmp.hh> #include <mlc/logic.hh> #include <mlc/is_a.hh> Index: stc/exact.hh --- stc/exact.hh (revision 486) +++ stc/exact.hh (working copy) @@ -1,5 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 EPITA Research and -// Development Laboratory. +// 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 @@ -39,7 +38,8 @@ # define stc_internal_is_any(T) \ -mlc::bexpr_< sizeof(internal::any_select(internal::makePtr< T >())) == sizeof(internal::yes_) > + mlc::bexpr_< sizeof(internal::any_select(internal::makePtr< T >())) == \ + sizeof(internal::yes_) >

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2006