From: Maxime van Noppen &lt;yabo(a)lrde.epita.fr&gt; To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r120: Fix tests to reflect the constification of class methods by default URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-17 Maxime van Noppen &lt;yabo(a)lrde.epita.fr&gt; Fix tests to reflect the constification of class methods by default * class/c++_ast/method_001.aterm, * class/c++_ast/method_002.aterm, * class/c++_ast/method_003.aterm, * class/c++_ast/method_004.aterm, * class/c++_ast/method_005.aterm, * class/c++_src/method_001.cc, * class/c++_src/method_002.cc, * class/c++_src/method_003.cc, * class/c++_src/method_004.cc, * class/c++_src/method_005.cc, * function/c++_ast/call_001.aterm, * function/c++_ast/call_002.aterm, * function/c++_ast/call_003.aterm, * function/c++_ast/call_004.aterm, * function/c++_ast/call_005.aterm, * function/c++_ast/call_006.aterm, * function/c++_ast/declaration_001.aterm, * function/c++_ast/declaration_002.aterm, * function/c++_ast/declaration_003.aterm, * function/c++_ast/declaration_004.aterm, * function/c++_ast/declaration_005.aterm, * function/c++_ast/declaration_006.aterm, * function/c++_ast/declaration_007.aterm, * function/c++_ast/declaration_008.aterm, * function/c++_ast/definition_001.aterm, * function/c++_ast/definition_002.aterm, * function/c++_ast/definition_003.aterm, * function/c++_ast/definition_004.aterm, * function/c++_ast/definition_005.aterm, * function/c++_ast/definition_006.aterm, * function/c++_ast/definition_007.aterm, * variable/c++_src/declaration_005.cc, * misc/c++_src/empty.cc, * function/c++_ast/parameters_arguments_001.aterm, * function/c++_ast/parameters_arguments_002.aterm, * function/c++_ast/parameters_arguments_003.aterm, * function/c++_ast/parameters_arguments_005.aterm: Here. * class/c++_src/mutable_1.cc: New. * class/scool_ast/mutable_1.aterm: New. * function/c++_build/declaration_001.g++: New. * function/c++_build/declaration_002.g++: New. * function/c++_build/declaration_005.g++: New. * function/c++_build/declaration_006.g++: New. * function/c++_build/declaration_007.g++: New. * function/c++_build/declaration_008.g++: New. * function/c++_build/definition_001.g++: New. * function/c++_build/definition_003.g++: New. * function/c++_build/definition_004.g++: New. * function/c++_build/definition_005.g++: New. * function/c++_build/definition_006.g++: New. * function/c++_build/definition_007.g++: New. * function/c++_build/parameters_arguments_001.g++: New. * function/c++_build/parameters_arguments_002.g++: New. * function/c++_build/parameters_arguments_003.g++: New. * function/c++_build/parameters_arguments_005.g++: New. * misc/c++_build/empty.g++: New. * variable/c++_build/declaration_002.g++: New. * variable/c++_build/declaration_003.g++: New. * variable/c++_build/declaration_004.g++: New. * variable/c++_build/mixed_declarations_001.g++: New. * class/c++_ast/mutable_1.aterm: New. * class/c++_build/mutable_1.g++: New. class/c++_ast/method_001.aterm | 2 +- class/c++_ast/method_002.aterm | 2 +- class/c++_ast/method_003.aterm | 2 +- class/c++_ast/method_004.aterm | 2 +- class/c++_ast/method_005.aterm | 2 +- class/c++_ast/mutable_1.aterm | 1 + class/c++_src/method_001.cc | 2 +- class/c++_src/method_002.cc | 2 +- class/c++_src/method_003.cc | 4 ++-- class/c++_src/method_004.cc | 4 ++-- class/c++_src/method_005.cc | 4 ++-- class/c++_src/mutable_1.cc | 10 ++++++++++ class/scool_ast/mutable_1.aterm | 1 + function/c++_ast/call_001.aterm | 2 +- function/c++_ast/call_002.aterm | 2 +- function/c++_ast/call_003.aterm | 2 +- function/c++_ast/call_004.aterm | 2 +- function/c++_ast/call_005.aterm | 2 +- function/c++_ast/call_006.aterm | 2 +- function/c++_ast/declaration_001.aterm | 2 +- function/c++_ast/declaration_002.aterm | 2 +- function/c++_ast/declaration_003.aterm | 2 +- function/c++_ast/declaration_004.aterm | 2 +- function/c++_ast/declaration_005.aterm | 2 +- function/c++_ast/declaration_006.aterm | 2 +- function/c++_ast/declaration_007.aterm | 2 +- function/c++_ast/declaration_008.aterm | 2 +- function/c++_ast/definition_001.aterm | 2 +- function/c++_ast/definition_002.aterm | 2 +- function/c++_ast/definition_003.aterm | 2 +- function/c++_ast/definition_004.aterm | 2 +- function/c++_ast/definition_005.aterm | 2 +- function/c++_ast/definition_006.aterm | 2 +- function/c++_ast/definition_007.aterm | 2 +- function/c++_ast/parameters_arguments_001.aterm | 2 +- function/c++_ast/parameters_arguments_002.aterm | 2 +- function/c++_ast/parameters_arguments_003.aterm | 2 +- function/c++_ast/parameters_arguments_005.aterm | 2 +- misc/c++_src/empty.cc | 1 + 39 files changed, 51 insertions(+), 38 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/mutable_1.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/mutable_1.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/mutable_1.aterm (revision 120) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("foo"),[],[CxxPublic([CxxFun([],CxxType("void"),CxxId("f"),[],None,[CxxExpStm(CxxAssign(CxxId("x"),CxxInt("42")))]),CxxDecl(CxxType("int"),CxxId("x"))])])]) Index: branches/scool-ng/tests/class/c++_ast/method_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 119) +++ branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_002.aterm (revision 119) +++ branches/scool-ng/tests/class/c++_ast/method_002.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("42")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_003.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_003.aterm (revision 119) +++ branches/scool-ng/tests/class/c++_ast/method_003.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_004.aterm (revision 119) +++ branches/scool-ng/tests/class/c++_ast/method_004.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/method_005.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_005.aterm (revision 119) +++ branches/scool-ng/tests/class/c++_ast/method_005.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]),CxxPrivate([CxxFun([],CxxType("int"),CxxId("another_test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]),CxxPrivate([CxxFun([],CxxType("int"),CxxId("another_test"),[],Const,[CxxExpStm(CxxKeyword("return",CxxInt("51")))])])])]) Index: branches/scool-ng/tests/class/c++_src/method_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_001.cc (revision 119) +++ branches/scool-ng/tests/class/c++_src/method_001.cc (revision 120) @@ -2,7 +2,7 @@ class Foo { public: - int test() + int test() const { return 42; } Index: branches/scool-ng/tests/class/c++_src/method_002.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_002.cc (revision 119) +++ branches/scool-ng/tests/class/c++_src/method_002.cc (revision 120) @@ -2,7 +2,7 @@ class Foo { public: - int test() + int test() const { return 42; } Index: branches/scool-ng/tests/class/c++_src/method_003.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_003.cc (revision 119) +++ branches/scool-ng/tests/class/c++_src/method_003.cc (revision 120) @@ -2,11 +2,11 @@ class Foo { public: - int test() + int test() const { return 42; } - int another_test() + int another_test() const { return 51; } Index: branches/scool-ng/tests/class/c++_src/method_004.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_004.cc (revision 119) +++ branches/scool-ng/tests/class/c++_src/method_004.cc (revision 120) @@ -2,11 +2,11 @@ class Foo { public: - int test() + int test() const { return 42; } - int another_test() + int another_test() const { return 51; } Index: branches/scool-ng/tests/class/c++_src/method_005.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/method_005.cc (revision 119) +++ branches/scool-ng/tests/class/c++_src/method_005.cc (revision 120) @@ -2,12 +2,12 @@ class Foo { public: - int test() + int test() const { return 42; } private: - int another_test() + int another_test() const { return 51; } Index: branches/scool-ng/tests/class/c++_src/mutable_1.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/mutable_1.cc (revision 0) +++ branches/scool-ng/tests/class/c++_src/mutable_1.cc (revision 120) @@ -0,0 +1,10 @@ +template < typename Exact > +class foo +{ + public: + void f() + { + x = 42; + } + int x; +}; Index: branches/scool-ng/tests/class/scool_ast/mutable_1.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/mutable_1.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/mutable_1.aterm (revision 120) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(Some("mutable"),Identifier("f"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([ExpressionStatement(Assign(Identifier("x"),Integer("42")))])),SimpleDeclaration(Some("var"),Identifier("x"),SimpleType("int"),None)])]))]) Index: branches/scool-ng/tests/class/c++_build/mutable_1.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_ast/definition_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_001.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_001.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("answer"),[],[])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("answer"),[],None,[])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_004.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_004.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_004.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),[]),CxxFun([],CxxType("float"),CxxId("foo"),[(CxxType("int"),CxxId("arg1"))]),CxxFun([],CxxType("char"),CxxId("foo"),[(CxxConstType(CxxRefType(CxxType("toto"))),CxxId("arg1")),(CxxRefType(CxxType("double")),CxxId("arg2"))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),None,[]),CxxFun([],CxxType("float"),CxxId("foo"),None,[(CxxType("int"),CxxId("arg1"))]),CxxFun([],CxxType("char"),CxxId("foo"),None,[(CxxConstType(CxxRefType(CxxType("toto"))),CxxId("arg1")),(CxxRefType(CxxType("double")),CxxId("arg2"))])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_001.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],None,[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) Index: branches/scool-ng/tests/function/c++_ast/definition_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_002.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_002.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("answer"),[],[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("answer"),[],None,[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_005.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_005.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("foo"),[])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("foo"),None,[])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_002.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],None,[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_006.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_006.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_006.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("foo"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("foo"),None,[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))])]) Index: branches/scool-ng/tests/function/c++_ast/definition_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_003.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_003.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]) +CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],None,[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_003.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T"))],CxxType("void"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a"))],None,[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_007.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_007.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_007.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T")),(CxxType("typename"),CxxId("S"))],CxxType("void"),CxxId("foo"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a")),(CxxConstType(CxxRefType(CxxType("S"))),CxxId("b"))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T")),(CxxType("typename"),CxxId("S"))],CxxType("void"),CxxId("foo"),None,[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a")),(CxxConstType(CxxRefType(CxxType("S"))),CxxId("b"))])]) Index: branches/scool-ng/tests/function/c++_ast/definition_004.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_004.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_004.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42")),CxxExpStm(CxxKeyword("return",CxxId("i")))])]) +CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],None,[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42")),CxxExpStm(CxxKeyword("return",CxxId("i")))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_008.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_008.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("bool"),CxxId("B"))],CxxType("void"),CxxId("foo"),[])]) +CxxProgram([CxxFun([(CxxType("bool"),CxxId("B"))],CxxType("void"),CxxId("foo"),None,[])]) Index: branches/scool-ng/tests/function/c++_ast/definition_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_005.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_005.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]) +CxxProgram([CxxFun([],CxxType("int"),CxxId("answer"),[],None,[CxxExpStm(CxxKeyword("return",CxxInt("42")))])]) Index: branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/parameters_arguments_005.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([(CxxType("typename"),CxxId("T")),(CxxType("typename"),CxxId("U"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a")),(CxxConstType(CxxRefType(CxxType("U"))),CxxId("b"))],[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) +CxxProgram([CxxFun([(CxxType("typename"),CxxId("T")),(CxxType("typename"),CxxId("U"))],CxxType("T"),CxxId("f"),[(CxxConstType(CxxRefType(CxxType("T"))),CxxId("a")),(CxxConstType(CxxRefType(CxxType("U"))),CxxId("b"))],None,[CxxExpStm(CxxKeyword("return",CxxId("a")))])]) Index: branches/scool-ng/tests/function/c++_ast/definition_006.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_006.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_006.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("int"),CxxId("sum"),[(CxxType("int"),CxxId("a")),(CxxType("int"),CxxId("b"))],[CxxExpStm(CxxKeyword("return",CxxSum(CxxId("a"),CxxId("b"))))])]) +CxxProgram([CxxFun([],CxxType("int"),CxxId("sum"),[(CxxType("int"),CxxId("a")),(CxxType("int"),CxxId("b"))],None,[CxxExpStm(CxxKeyword("return",CxxSum(CxxId("a"),CxxId("b"))))])]) Index: branches/scool-ng/tests/function/c++_ast/definition_007.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/definition_007.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/definition_007.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("int"),CxxId("sum"),[(CxxType("int"),CxxId("a")),(CxxType("int"),CxxId("b"))],[CxxExpStm(CxxKeyword("return",CxxSum(CxxId("a"),CxxId("b"))))])]) +CxxProgram([CxxFun([],CxxType("int"),CxxId("sum"),[(CxxType("int"),CxxId("a")),(CxxType("int"),CxxId("b"))],None,[CxxExpStm(CxxKeyword("return",CxxSum(CxxId("a"),CxxId("b"))))])]) Index: branches/scool-ng/tests/function/c++_ast/call_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_001.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_001.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),[]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_002.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_002.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),[CxxInt("42")]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([],CxxId("foo"),[CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_003.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_003.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([],CxxId("foo"),["bar",CxxInt("42")]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([],CxxId("foo"),["bar",CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_004.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_004.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_004.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxType("int")],CxxId("foo"),[]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([CxxType("int")],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_005.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_005.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_005.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxInt("42")],CxxId("foo"),[]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([CxxInt("42")],CxxId("foo"),[]))])]) Index: branches/scool-ng/tests/function/c++_ast/call_006.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/call_006.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/call_006.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],[CxxExpStm(CxxFunCall([CxxType("int"),CxxInt("42")],CxxId("foo"),[CxxInt("42")]))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("doit"),[],None,[CxxExpStm(CxxFunCall([CxxType("int"),CxxInt("42")],CxxId("foo"),[CxxInt("42")]))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_001.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_001.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),[])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),None,[])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_002.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_002.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_002.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),[(CxxType("int"),CxxId("a"))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),None,[(CxxType("int"),CxxId("a"))])]) Index: branches/scool-ng/tests/function/c++_ast/declaration_003.aterm =================================================================== --- branches/scool-ng/tests/function/c++_ast/declaration_003.aterm (revision 119) +++ branches/scool-ng/tests/function/c++_ast/declaration_003.aterm (revision 120) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),[(CxxType("int"),CxxId("a")),(CxxConstType(CxxRefType(CxxType("bar"))),CxxId("b"))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("foo"),None,[(CxxType("int"),CxxId("a")),(CxxConstType(CxxRefType(CxxType("bar"))),CxxId("b"))])]) Index: branches/scool-ng/tests/function/c++_build/declaration_001.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/declaration_002.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/parameters_arguments_001.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_001.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/parameters_arguments_002.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/declaration_005.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/parameters_arguments_003.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_003.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/declaration_006.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_004.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/declaration_007.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/parameters_arguments_005.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_005.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/declaration_008.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_006.g++ =================================================================== Index: branches/scool-ng/tests/function/c++_build/definition_007.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_src/declaration_005.cc =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_002.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_003.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_004.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/mixed_declarations_001.g++ =================================================================== Index: branches/scool-ng/tests/misc/c++_src/empty.cc =================================================================== --- branches/scool-ng/tests/misc/c++_src/empty.cc (revision 119) +++ branches/scool-ng/tests/misc/c++_src/empty.cc (revision 120) @@ -0,0 +1 @@ + Index: branches/scool-ng/tests/misc/c++_build/empty.g++ =================================================================== -- yabo