URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-24 Maxime van Noppen <yabo@lrde.epita.fr> Cleanup tests for classes * class/c++_ast/empty.aterm: New. * class/c++_ast/empty_accessblocks.aterm: New. * class/c++_ast/empty_private.aterm: New. * class/c++_ast/empty_protected.aterm: New. * class/c++_ast/empty_public.aterm: New. * class/c++_ast/member_001.aterm: New. * class/c++_ast/member_002.aterm: New. * class/c++_ast/method_001.aterm: New. * class/c++_ast/method_002.aterm: New. * class/c++_ast/method_003.aterm: New. * class/c++_ast/method_004.aterm: New. * class/c++_ast/method_005.aterm: New. * class/scool_ast/class_attributes_decl_001.aterm: Remove. * class/scool_ast/class_attributes_decl_002.aterm: Remove. * class/scool_ast/class_decl_inh.aterm: Remove. * class/scool_ast/class_decl_inh_fin.aterm: Remove. * class/scool_ast/class_empty_accessblocks_001.aterm: Remove. * class/scool_ast/class_empty_accessblocks_002.aterm: Remove. * class/scool_ast/class_empty_accessblocks_003.aterm: Remove. * class/scool_ast/class_empty_accessblocks_004.aterm: Remove. * class/scool_ast/class_empty_decl_001.aterm: Remove. * class/scool_ast/class_empty_decl_002.aterm: Remove. * class/scool_ast/class_members_1.aterm: Remove. * class/scool_ast/class_method_decl_001.aterm: Remove. * class/scool_ast/class_method_decl_002.aterm: Remove. * class/scool_ast/class_method_decl_003.aterm: Remove. * class/scool_ast/class_method_decl_004.aterm: Remove. * class/scool_ast/class_method_decl_005.aterm: Remove. * class/scool_ast/class_predecl.aterm: Remove. * class/scool_ast/class_template_1.aterm: Remove. * class/scool_ast/class_template_2.aterm: Remove. * class/scool_ast/class_template_3.aterm: Remove. * class/scool_ast/declaration_001.aterm: New. * class/scool_ast/empty.aterm: New. * class/scool_ast/empty_accessblocks.aterm: New. * class/scool_ast/empty_private.aterm: New. * class/scool_ast/empty_protected.aterm: New. * class/scool_ast/empty_public.aterm: New. * class/scool_ast/final_001.aterm: New. * class/scool_ast/inheritance_001.aterm: New. * class/scool_ast/inheritance_002.aterm: New. * class/scool_ast/member_001.aterm: New. * class/scool_ast/member_002.aterm: New. * class/scool_ast/method_001.aterm: New. * class/scool_ast/method_002.aterm: New. * class/scool_ast/method_003.aterm: New. * class/scool_ast/method_004.aterm: New. * class/scool_ast/method_005.aterm: New. * class/scool_ast/static_function_001.aterm: New. * class/scool_ast/static_function_002.aterm: New. * class/scool_ast/static_function_003.aterm: New. * class/scool_src/class_attributes_decl_001.scl: Remove. * class/scool_src/class_attributes_decl_002.scl: Remove. * class/scool_src/class_decl_inh.scl: Remove. * class/scool_src/class_decl_inh_abst.scl: Remove. * class/scool_src/class_decl_inh_fin.scl: Remove. * class/scool_src/class_empty_accessblocks_001.scl: Remove. * class/scool_src/class_empty_accessblocks_002.scl: Remove. * class/scool_src/class_empty_accessblocks_003.scl: Remove. * class/scool_src/class_empty_accessblocks_004.scl: Remove. * class/scool_src/class_empty_decl_001.scl: Remove. * class/scool_src/class_empty_decl_002.scl: Remove. * class/scool_src/class_members_1.scl: Remove. * class/scool_src/class_method_decl_001.scl: Remove. * class/scool_src/class_method_decl_002.scl: Remove. * class/scool_src/class_method_decl_003.scl: Remove. * class/scool_src/class_method_decl_004.scl: Remove. * class/scool_src/class_method_decl_005.scl: Remove. * class/scool_src/class_predecl.scl: Remove. * class/scool_src/class_predecl_inh.scl: Remove. * class/scool_src/class_template_1.scl: Remove. * class/scool_src/class_template_2.scl: Remove. * class/scool_src/class_template_3.scl: Remove. * class/scool_src/declaration_001.scl: New. * class/scool_src/declaration_002.scl: New. * class/scool_src/empty.scl: New. * class/scool_src/empty_accessblocks.scl: New. * class/scool_src/empty_private.scl: New. * class/scool_src/empty_protected.scl: New. * class/scool_src/empty_public.scl: New. * class/scool_src/final_001.scl: New. * class/scool_src/inheritance_001.scl: New. * class/scool_src/inheritance_002.scl: New. * class/scool_src/inheritance_003.scl: New. * class/scool_src/member_001.scl: New. * class/scool_src/member_002.scl: New. * class/scool_src/method_001.scl: New. * class/scool_src/method_002.scl: New. * class/scool_src/method_003.scl: New. * class/scool_src/method_004.scl: New. * class/scool_src/method_005.scl: New. * class/scool_src/static_function_001.scl: New. * class/scool_src/static_function_002.scl: New. * class/scool_src/static_function_003.scl: New. c++_ast/empty.aterm | 1 + c++_ast/empty_accessblocks.aterm | 1 + c++_ast/empty_private.aterm | 1 + c++_ast/empty_protected.aterm | 1 + c++_ast/empty_public.aterm | 1 + c++_ast/member_001.aterm | 1 + c++_ast/member_002.aterm | 1 + c++_ast/method_001.aterm | 1 + c++_ast/method_002.aterm | 1 + c++_ast/method_003.aterm | 1 + c++_ast/method_004.aterm | 1 + c++_ast/method_005.aterm | 1 + scool_ast/declaration_001.aterm | 1 + scool_ast/empty.aterm | 1 + scool_ast/empty_accessblocks.aterm | 1 + scool_ast/empty_private.aterm | 1 + scool_ast/empty_protected.aterm | 1 + scool_ast/empty_public.aterm | 1 + scool_ast/final_001.aterm | 1 + scool_ast/inheritance_001.aterm | 1 + scool_ast/inheritance_002.aterm | 1 + scool_ast/member_001.aterm | 1 + scool_ast/member_002.aterm | 1 + scool_ast/method_001.aterm | 1 + scool_ast/method_002.aterm | 1 + scool_ast/method_003.aterm | 1 + scool_ast/method_004.aterm | 1 + scool_ast/method_005.aterm | 1 + scool_ast/static_function_001.aterm | 1 + scool_ast/static_function_002.aterm | 1 + scool_ast/static_function_003.aterm | 1 + scool_src/declaration_001.scl | 1 + scool_src/declaration_002.scl | 1 + scool_src/empty.scl | 3 +++ scool_src/empty_accessblocks.scl | 12 ++++++++++++ scool_src/empty_private.scl | 6 ++++++ scool_src/empty_protected.scl | 6 ++++++ scool_src/empty_public.scl | 6 ++++++ scool_src/final_001.scl | 3 +++ scool_src/inheritance_001.scl | 9 +++++++++ scool_src/inheritance_002.scl | 14 ++++++++++++++ scool_src/inheritance_003.scl | 9 +++++++++ scool_src/member_001.scl | 7 +++++++ scool_src/member_002.scl | 8 ++++++++ scool_src/method_001.scl | 10 ++++++++++ scool_src/method_002.scl | 7 +++++++ scool_src/method_003.scl | 8 ++++++++ scool_src/method_004.scl | 15 +++++++++++++++ scool_src/method_005.scl | 17 +++++++++++++++++ scool_src/static_function_001.scl | 3 +++ scool_src/static_function_002.scl | 3 +++ scool_src/static_function_003.scl | 3 +++ 52 files changed, 182 insertions(+) Index: branches/scool-ng/tests/class/c++_ast/empty_private.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_private.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/empty_private.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPrivate([])])]) Index: branches/scool-ng/tests/class/c++_ast/member_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/member_002.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/member_002.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Point2d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x")),CxxDecl(CxxType("int"),CxxId("y"))])])]) Index: branches/scool-ng/tests/class/c++_ast/empty_public.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_public.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/empty_public.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([])])]) Index: branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/empty_accessblocks.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([]),CxxProtected([]),CxxPrivate([])])]) Index: branches/scool-ng/tests/class/c++_ast/empty.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/empty.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[])]) Index: branches/scool-ng/tests/class/c++_ast/method_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/method_001.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[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 0) +++ branches/scool-ng/tests/class/c++_ast/method_002.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[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 0) +++ branches/scool-ng/tests/class/c++_ast/method_003.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[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 0) +++ branches/scool-ng/tests/class/c++_ast/method_004.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxPublic([CxxFun([],CxxType("int"),CxxId("test"),[],[CxxExpStm(CxxKeyword("return",CxxInt("42")))]),CxxFun([],CxxType("int"),CxxId("another_test"),[],[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 0) +++ branches/scool-ng/tests/class/c++_ast/method_005.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),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")))])])])]) Index: branches/scool-ng/tests/class/c++_ast/empty_protected.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/empty_protected.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/empty_protected.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Foo"),[],[CxxProtected([])])]) Index: branches/scool-ng/tests/class/c++_ast/member_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/member_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/member_001.aterm (revision 98) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl((CxxType("typename"),"T"),CxxId("Point1d"),[],[CxxPublic([CxxDecl(CxxType("int"),CxxId("x"))])])]) Index: branches/scool-ng/tests/class/scool_ast/class_method_decl_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_method_decl_002.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_method_decl_003.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_method_decl_004.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_method_decl_005.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_template_1.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_template_2.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_accessblocks_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_attributes_decl_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_template_3.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_accessblocks_002.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_attributes_decl_002.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_accessblocks_003.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_accessblocks_004.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_decl_inh_fin.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_decl_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_decl_inh.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_empty_decl_002.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_members_1.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/class_predecl.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Bar"),None,ClassBlock([])),ClassDefinition(None,Identifier("Foo"),Some(ClassWhereClause([Inherits("Foo","Bar")])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/final_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/final_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/final_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(Some("final"),Identifier("Student"),None,ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Animal"),None,ClassBlock([])),ClassDefinition(None,Identifier("Mammal"),Some(ClassWhereClause([Inherits("Mammal","Animal")])),ClassBlock([])),ClassDefinition(Some("final"),Identifier("Monkey"),Some(ClassWhereClause([Inherits("Monkey","Mammal")])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/static_function_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/static_function_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/static_function_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([StaticClassFunction(None,Identifier("A"),ParametersDeclaration([TypedId(Identifier("T"),"type")]),StaticClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/empty_accessblocks.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/empty_accessblocks.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/empty_accessblocks.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[]),AccessBlock(Protected,[]),AccessBlock(Private,[])]))]) Index: branches/scool-ng/tests/class/scool_ast/static_function_002.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/static_function_002.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/static_function_002.aterm (revision 98) @@ -0,0 +1 @@ +Program([StaticClassFunction(None,Identifier("A"),ParametersDeclaration([TypedId(Identifier("T"),"type"),TypedId(Identifier("B"),SimpleType("bool"))]),StaticClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/static_function_003.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/static_function_003.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/static_function_003.aterm (revision 98) @@ -0,0 +1 @@ +Program([StaticClassFunction(None,Identifier("A"),ParametersDeclaration([SimpleType("int")]),StaticClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/member_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/member_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/member_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Point1d"),None,ClassBlock([AccessBlock(Public,[SimpleDeclaration(Some("var"),Identifier("x"),SimpleType("int"),None)])]))]) Index: branches/scool-ng/tests/class/scool_ast/member_002.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/member_002.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/member_002.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Point2d"),None,ClassBlock([AccessBlock(Public,[SimpleDeclaration(Some("var"),Identifier("x"),SimpleType("int"),None),SimpleDeclaration(Some("var"),Identifier("y"),SimpleType("int"),None)])]))]) Index: branches/scool-ng/tests/class/scool_ast/empty_private.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/empty_private.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/empty_private.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Private,[])]))]) Index: branches/scool-ng/tests/class/scool_ast/empty_public.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/empty_public.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/empty_public.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[])]))]) Index: branches/scool-ng/tests/class/scool_ast/empty.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/empty.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/empty.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/method_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/method_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/method_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock([ReturnStatement(Integer("42"))]))])]))]) Index: branches/scool-ng/tests/class/scool_ast/method_002.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/method_002.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/method_002.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock(Integer("42")))])]))]) Index: branches/scool-ng/tests/class/scool_ast/method_003.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/method_003.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/method_003.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock(Integer("42"))),FunctionDefinition(None,Identifier("another_test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock(Integer("51")))])]))]) Index: branches/scool-ng/tests/class/scool_ast/method_004.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/method_004.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/method_004.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock([ReturnStatement(Integer("42"))])),FunctionDefinition(None,Identifier("another_test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock([ReturnStatement(Integer("51"))]))])]))]) Index: branches/scool-ng/tests/class/scool_ast/method_005.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/method_005.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/method_005.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Public,[FunctionDefinition(None,Identifier("test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock([ReturnStatement(Integer("42"))]))]),AccessBlock(Private,[FunctionDefinition(None,Identifier("another_test"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("int")),FunctionBlock([ReturnStatement(Integer("51"))]))])]))]) Index: branches/scool-ng/tests/class/scool_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/declaration_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/declaration_001.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDeclaration(None,Identifier("Foo"))]) Index: branches/scool-ng/tests/class/scool_ast/empty_protected.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/empty_protected.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/empty_protected.aterm (revision 98) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Foo"),None,ClassBlock([AccessBlock(Protected,[])]))]) Index: branches/scool-ng/tests/class/scool_src/class_members_1.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_predecl_inh.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_decl_inh_abst.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_predecl.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_method_decl_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_method_decl_002.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_method_decl_003.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_method_decl_004.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_method_decl_005.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_template_1.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_template_2.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_accessblocks_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_attributes_decl_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_template_3.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_accessblocks_002.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_attributes_decl_002.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_accessblocks_003.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_accessblocks_004.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_decl_inh_fin.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_decl_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_decl_inh.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/class_empty_decl_002.scl (deleted) =================================================================== Index: branches/scool-ng/tests/class/scool_src/method_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/method_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/method_001.scl (revision 98) @@ -0,0 +1,10 @@ +Foo : class = +{ + public + { + test : () -> int = + { + -> 42; + } + } +} Index: branches/scool-ng/tests/class/scool_src/method_002.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/method_002.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/method_002.scl (revision 98) @@ -0,0 +1,7 @@ +Foo : class = +{ + public + { + test : () -> int = 42; + } +} Index: branches/scool-ng/tests/class/scool_src/method_003.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/method_003.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/method_003.scl (revision 98) @@ -0,0 +1,8 @@ +Foo : class = +{ + public + { + test : () -> int = 42; + another_test : () -> int = 51; + } +} Index: branches/scool-ng/tests/class/scool_src/method_004.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/method_004.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/method_004.scl (revision 98) @@ -0,0 +1,15 @@ +Foo : class = +{ + public + { + test : () -> int = + { + -> 42; + } + + another_test : () -> int = + { + -> 51; + } + } +} Index: branches/scool-ng/tests/class/scool_src/method_005.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/method_005.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/method_005.scl (revision 98) @@ -0,0 +1,17 @@ +Foo : class = +{ + public + { + test : () -> int = + { + -> 42; + } + } + private + { + another_test : () -> int = + { + -> 51; + } + } +} Index: branches/scool-ng/tests/class/scool_src/declaration_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/declaration_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/declaration_001.scl (revision 98) @@ -0,0 +1 @@ +Foo : class; Index: branches/scool-ng/tests/class/scool_src/declaration_002.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/declaration_002.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/declaration_002.scl (revision 98) @@ -0,0 +1 @@ +Foo : class where Foo -> Bar; Index: branches/scool-ng/tests/class/scool_src/empty_protected.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/empty_protected.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/empty_protected.scl (revision 98) @@ -0,0 +1,6 @@ +Foo : class = +{ + protected + { + } +} Index: branches/scool-ng/tests/class/scool_src/inheritance_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/inheritance_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/inheritance_001.scl (revision 98) @@ -0,0 +1,9 @@ +Bar: class = +{ + +} + +Foo : class where Foo -> Bar = +{ + +} Index: branches/scool-ng/tests/class/scool_src/final_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/final_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/final_001.scl (revision 98) @@ -0,0 +1,3 @@ +final Student : class = +{ +} Index: branches/scool-ng/tests/class/scool_src/inheritance_002.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/inheritance_002.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/inheritance_002.scl (revision 98) @@ -0,0 +1,14 @@ +Animal: class = +{ + +} + +Mammal : class where Mammal -> Animal = +{ + +} + +final Monkey : class where Monkey -> Mammal = +{ + +} Index: branches/scool-ng/tests/class/scool_src/inheritance_003.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/inheritance_003.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/inheritance_003.scl (revision 98) @@ -0,0 +1,9 @@ +abstract Animal: class = +{ + +} + +Mammal : class where Mamman -> Animal = +{ + +} Index: branches/scool-ng/tests/class/scool_src/static_function_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/static_function_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/static_function_001.scl (revision 98) @@ -0,0 +1,3 @@ +A : [T : type] -> class = +{ +} Index: branches/scool-ng/tests/class/scool_src/empty_accessblocks.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/empty_accessblocks.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/empty_accessblocks.scl (revision 98) @@ -0,0 +1,12 @@ +Foo : class = +{ + public + { + } + protected + { + } + private + { + } +} Index: branches/scool-ng/tests/class/scool_src/static_function_002.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/static_function_002.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/static_function_002.scl (revision 98) @@ -0,0 +1,3 @@ +A : [T : type, B : bool] -> class = +{ +} Index: branches/scool-ng/tests/class/scool_src/static_function_003.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/static_function_003.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/static_function_003.scl (revision 98) @@ -0,0 +1,3 @@ +A : [int] -> class = +{ +} Index: branches/scool-ng/tests/class/scool_src/member_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/member_001.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/member_001.scl (revision 98) @@ -0,0 +1,7 @@ +Point1d : class = +{ + public + { + var x : int; + } +} Index: branches/scool-ng/tests/class/scool_src/member_002.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/member_002.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/member_002.scl (revision 98) @@ -0,0 +1,8 @@ +Point2d : class = +{ + public + { + var x : int; + var y : int; + } +} Index: branches/scool-ng/tests/class/scool_src/empty_private.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/empty_private.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/empty_private.scl (revision 98) @@ -0,0 +1,6 @@ +Foo : class = +{ + private + { + } +} Index: branches/scool-ng/tests/class/scool_src/empty_public.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/empty_public.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/empty_public.scl (revision 98) @@ -0,0 +1,6 @@ +Foo : class = +{ + public + { + } +} Index: branches/scool-ng/tests/class/scool_src/empty.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/empty.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/empty.scl (revision 98) @@ -0,0 +1,3 @@ +Foo : class = +{ +} -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)