- Olena-patches

scool r144: Add and fix tests
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Add and fix tests. * examples/c++_ast/container_1.aterm: New. * examples/c++_build/container_1.g++: New. * examples/c++_build/sample_1.g++: New. * examples/c++_src/container_1.cc: New. * examples/scool_ast/container_1.aterm: Here. * examples/scool_ast/point1d.aterm: New. * examples/scool_src/container_1.scl: Fix. --- c++_ast/container_1.aterm | 1 + c++_src/container_1.cc | 16 ++++++++++++++++ scool_ast/container_1.aterm | 2 +- scool_ast/point1d.aterm | 1 + scool_src/container_1.scl | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) Index: branches/scool-ng/tests/examples/c++_ast/container_1.aterm =================================================================== --- branches/scool-ng/tests/examples/c++_ast/container_1.aterm (revision 0) +++ branches/scool-ng/tests/examples/c++_ast/container_1.aterm (revision 144) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact"),(CxxType("typename"),CxxId("T"))],CxxId("Container"),[],[CxxPublic([CxxTypedef(CxxType("T"),CxxId("value_type")),CxxFun([],CxxType("value_type"),CxxId("get"),[],Const,[CxxExpStm(CxxKeyword("return",CxxId("value_")))]),CxxFun([],CxxType("void"),CxxId("set"),[(CxxConstType(CxxRefType(CxxType("value_type"))),CxxId("value"))],None,[CxxExpStm(CxxAssign(CxxId("value_"),CxxId("value")))])]),CxxPrivate([CxxDecl(CxxType("value_type"),CxxId("value_"))])])]) Index: branches/scool-ng/tests/examples/c++_src/container_1.cc =================================================================== --- branches/scool-ng/tests/examples/c++_src/container_1.cc (revision 0) +++ branches/scool-ng/tests/examples/c++_src/container_1.cc (revision 144) @@ -0,0 +1,16 @@ +template < typename Exact, typename T > +class Container +{ + public: + typedef T value_type; + value_type get() const + { + return value_; + } + void set(const value_type& value) + { + value_ = value; + } + private: + value_type value_; +}; Index: branches/scool-ng/tests/examples/scool_ast/point1d.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/point1d.aterm (revision 0) +++ branches/scool-ng/tests/examples/scool_ast/point1d.aterm (revision 144) @@ -0,0 +1 @@ +Program([ClassDefinition(Identifier("point1d"),None,None,ClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("point_type"),StaticInitialiser(SimpleType("int"))),ConstructorDeclaration(None,ArgumentsDeclaration([]),FunctionBlock([ExpressionStatement(Assign(Identifier("x_"),Integer("0")))])),ConstructorDeclaration(None,ArgumentsDeclaration([TypedId(Identifier("x"),SimpleType("point_type"))]),FunctionBlock([ExpressionStatement(Assign(Identifier("x_"),Identifier("x")))])),FunctionDefinition(None,Identifier("get_x"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("point_type")),FunctionBlock([ReturnStatement(Identifier("x"))])),FunctionDefinition(Some("mutable"),Identifier("set_x"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("x"),SimpleType("point_type"))]),SimpleType("point_type")),FunctionBlock([ExpressionStatement(Assign(Identifier("x_"),Identifier("x")))]))]),AccessBlock(Private,[SimpleDeclaration(Some("var"),Identifier("x_"),SimpleType("point_type"),None)])]))]) Index: branches/scool-ng/tests/examples/scool_ast/container_1.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/container_1.aterm (revision 143) +++ branches/scool-ng/tests/examples/scool_ast/container_1.aterm (revision 144) @@ -1 +1 @@ -Program([StaticClassFunction(Identifier("Container"),ParametersDeclaration([TypedId(Identifier("T"),"type")]),None,StaticClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("value_type"),StaticInitialiser(SimpleType("T"))),FunctionDefinition(None,Identifier("get"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value_type")),FunctionBlock([ReturnStatement(Identifier("value"))])),FunctionDefinition(Some("mutable"),Identifier("set"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("value"),SimpleType("value_type"))]),SimpleType("void")),FunctionBlock([ExpressionStatement(Assign(Identifier("value_"),Identifier("value")))]))]),AccessBlock(Private,[SimpleDeclaration(Some("var"),Identifier("value_"),SimpleType("value_type"),None)])]))]) +Program([StaticClassFunction(Identifier("Container"),ParametersDeclaration([TypedId(Identifier("T"),"type")]),None,StaticClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("value_type"),StaticInitialiser(SimpleType("T"))),FunctionDefinition(None,Identifier("get"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value_type")),FunctionBlock([ReturnStatement(Identifier("value_"))])),FunctionDefinition(Some("mutable"),Identifier("set"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("value"),SimpleType("value_type"))]),SimpleType("void")),FunctionBlock([ExpressionStatement(Assign(Identifier("value_"),Identifier("value")))]))]),AccessBlock(Private,[SimpleDeclaration(Some("var"),Identifier("value_"),SimpleType("value_type"),None)])]))]) Index: branches/scool-ng/tests/examples/scool_src/container_1.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 143) +++ branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 144) @@ -4,7 +4,7 @@ { value_type : type = T; - get : () -> value_type = { -> value; } + get : () -> value_type = { -> value_; } mutable set : (value : value_type) -> void = { value_ = value; } } Index: branches/scool-ng/tests/examples/c++_build/sample_1.g++ =================================================================== Index: branches/scool-ng/tests/examples/c++_build/container_1.g++ ===================================================================

1 0

scool r143: Handle simple cases in static class body
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Handle simple cases in static class body. * scoolt/Class.str: Call ClassBodyToCxx on ClassBody. --- Class.str | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 142) +++ branches/scool-ng/src/scoolt/Class.str (revision 143) @@ -122,7 +122,7 @@ where <IdentifierToCxx> idf => cxx_idf ; <AddExactType(| cqualif)> <ParametersToCxx> params => cxx_params // FIXME: cqualif is rather a qualifier of the function than the returned class - ; ![] => cxx_body + ; <ClassBodyToCxx> body => cxx_body // FIXME: Advanced static body class won't work (Static IF) strategies

1 0

scool r142: Fix a typo in the precedent version
by Corentin Gallet 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Corentin Gallet <gallet(a)lrde.epita.fr> Fix a typo in the precedent version. * ChangeLog: The constructor's keyword is "make", not "made". --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: ChangeLog =================================================================== --- ChangeLog (revision 141) +++ ChangeLog (working copy) @@ -2,7 +2,7 @@ Constructor Declaration. * src/scl-syn/Declaration.sdf: A new declaration : the constructor. - * src/scl-syn/Lexical.sdf: A new keyword : 'made' (name of the constructors). + * src/scl-syn/Lexical.sdf: A new keyword : 'make' (name of the constructors). * tests/examples/scool_src/point1d.scl: Fix an error in one example. 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com>

1 0

scool r141: Constructor Declaration
by Corentin Gallet 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Corentin Gallet <gallet(a)lrde.epita.fr> Constructor Declaration. * src/scl-syn/Declaration.sdf: A new declaration : the constructor. * src/scl-syn/Lexical.sdf: A new keyword : 'made' (name of the constructors). * tests/examples/scool_src/point1d.scl: Fix an error in one example. --- src/scl-syn/Declaration.sdf | 4 +++- src/scl-syn/Lexical.sdf | 1 + tests/examples/scool_src/point1d.scl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) Index: branches/scool-ng/tests/examples/scool_src/point1d.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/point1d.scl (revision 140) +++ branches/scool-ng/tests/examples/scool_src/point1d.scl (revision 141) @@ -6,7 +6,7 @@ point_type: type = int; make : () = { x_ = 0; } - make(x : point_type) = { x_ = x; } + make : (x : point_type) = { x_ = x; } get_x : () -> point_type = { -> x; } mutable set_x : (x : point_type) -> point_type = { x_ = x; } Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 140) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 141) @@ -27,9 +27,11 @@ SimpleQualifier? Identifier ":" "type" StaticExpressionInitialiser ";" -> SimpleDeclaration {cons("TypeDefinition")} FunctionQualifier? Identifier ":" FunctionType ";" -> Declaration {cons("FunctionDeclaration")} - FunctionQualifier? Identifier ":" FunctionType "=" FunctionBlock -> Declaration {cons("FunctionDefinition")} + %% Constructor Declaration + "make" ":" ParametersDeclaration? ArgumentsDeclaration "=" FunctionBlock -> Declaration {cons("ConstructorDeclaration")} + Identifier ":" ParametersDeclaration "->" "type" "=" StaticBlock -> StaticFunction {cons("StaticTypeFunction")} Identifier ":" ParametersDeclaration "->" ClassQualifier? "class" "=" StaticClassBlock -> StaticFunction {cons("StaticClassFunction")} Index: branches/scool-ng/src/scl-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Lexical.sdf (revision 140) +++ branches/scool-ng/src/scl-syn/Lexical.sdf (revision 141) @@ -47,6 +47,7 @@ "protected" -> Keyword "private" -> Keyword "where" -> Keyword + "make" -> Keyword context-free syntax

1 0

scool r140: Fix Method Call
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Fix Method Call. * src/scl-syn/Expression.sdf: Add Method Call. * tests/examples/scool_ast/sample_2.aterm: New. --- src/scl-syn/Expression.sdf | 4 +++- tests/examples/scool_ast/sample_2.aterm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) Index: branches/scool-ng/tests/examples/scool_ast/sample_2.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/sample_2.aterm (revision 0) +++ branches/scool-ng/tests/examples/scool_ast/sample_2.aterm (revision 140) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("f"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([SimpleDeclaration(Some("var"),Identifier("a"),StaticFunctionCall(Identifier("array"),Parameters([SimpleType("int"),Integer("2")])),None),SimpleDeclaration(Some("var"),Identifier("i"),SimpleType("int"),Some(Initialiser(MethodCall(Identifier("a"),Identifier("at"),SimpleFunctionArguments(Integer("0"))))))]))]) Index: branches/scool-ng/src/scl-syn/Expression.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Expression.sdf (revision 139) +++ branches/scool-ng/src/scl-syn/Expression.sdf (revision 140) @@ -41,7 +41,9 @@ %%Expression "." Identifier -> Expression {cons("Field")} - %%Identifier "." Identifier SimpleFunctionArguments -> Expression {cons("MethodCall")} + Identifier "." Identifier SimpleFunctionArguments -> Expression {cons("MethodCall")} + + "(" Expression ")" -> SimpleFunctionArguments {cons("SimpleFunctionArguments")} %%"(" Expression ")" -> Expression {cons("Parenthesis")}

1 0

scool r139: Fix test sample_1
by Vincent Ordy 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Vincent Ordy <ordy(a)lrde.epita.fr> Fix test sample_1. * tests/examples/scool_src/sample_1.scl: variable i is const, cannot modify it. * tests/examples/c++_src/sample_1.cc, * tests/examples/c++_ast/sample_1.aterm, * tests/examples/scool_ast/sample_1.aterm: Adjust. --- c++_ast/sample_1.aterm | 2 +- c++_src/sample_1.cc | 1 - scool_ast/sample_1.aterm | 2 +- scool_src/sample_1.scl | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) Index: branches/scool-ng/tests/examples/c++_ast/sample_1.aterm =================================================================== --- branches/scool-ng/tests/examples/c++_ast/sample_1.aterm (revision 138) +++ branches/scool-ng/tests/examples/c++_ast/sample_1.aterm (revision 139) @@ -1 +1 @@ -CxxProgram([CxxFun([],CxxType("void"),CxxId("f"),[],None,[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("3")),CxxExpStm(CxxAssign(CxxId("i"),CxxInt("4"))),CxxDecl(CxxType("int"),CxxId("j"),CxxInt("3")),CxxExpStm(CxxAssign(CxxId("j"),CxxInt("4")))])]) +CxxProgram([CxxFun([],CxxType("void"),CxxId("f"),[],None,[CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("3")),CxxDecl(CxxType("int"),CxxId("j"),CxxInt("3")),CxxExpStm(CxxAssign(CxxId("j"),CxxInt("4")))])]) Index: branches/scool-ng/tests/examples/c++_src/sample_1.cc =================================================================== --- branches/scool-ng/tests/examples/c++_src/sample_1.cc (revision 138) +++ branches/scool-ng/tests/examples/c++_src/sample_1.cc (revision 139) @@ -1,7 +1,6 @@ void f() { const int i = 3; - i = 4; int j = 3; j = 4; } Index: branches/scool-ng/tests/examples/scool_ast/sample_1.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/sample_1.aterm (revision 138) +++ branches/scool-ng/tests/examples/scool_ast/sample_1.aterm (revision 139) @@ -1 +1 @@ -Program([FunctionDefinition(None,Identifier("f"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("3")))),ExpressionStatement(Assign(Identifier("i"),Integer("4"))),SimpleDeclaration(Some("var"),Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("3")))),ExpressionStatement(Assign(Identifier("j"),Integer("4")))]))]) +Program([FunctionDefinition(None,Identifier("f"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("void")),FunctionBlock([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("3")))),SimpleDeclaration(Some("var"),Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("3")))),ExpressionStatement(Assign(Identifier("j"),Integer("4")))]))]) Index: branches/scool-ng/tests/examples/scool_src/sample_1.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_1.scl (revision 138) +++ branches/scool-ng/tests/examples/scool_src/sample_1.scl (revision 139) @@ -2,7 +2,6 @@ f : () -> void = { i : int = 3; - i = 4; var j : int = 3; j = 4;

1 0

scool r138: Fix var name
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Fix var name. * examples/scool_src/container_2.scl: Fix typedef var name. --- container_2.scl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: branches/scool-ng/tests/examples/scool_src/container_2.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/container_2.scl (revision 137) +++ branches/scool-ng/tests/examples/scool_src/container_2.scl (revision 138) @@ -2,7 +2,7 @@ { public { - value type : type = T; + value_type : type = T; } if [ T == int ]

1 0

scool r137: Add ref files for fixed test
by Vincent Ordy 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Vincent Ordy <ordy(a)lrde.epita.fr> Add ref files for fixed test. * tests/examples/c++_ast/embeded_c++.aterm: New. * tests/examples/c++_build/embeded_c++.g++: New. * tests/examples/c++_src/embeded_c++.cc: New. * tests/examples/scool_ast/embeded_c++.aterm: New. --- c++_ast/embeded_c++.aterm | 1 + c++_src/embeded_c++.cc | 6 ++++++ scool_ast/embeded_c++.aterm | 1 + 3 files changed, 8 insertions(+) Index: branches/scool-ng/tests/examples/c++_ast/embeded_c++.aterm =================================================================== --- branches/scool-ng/tests/examples/c++_ast/embeded_c++.aterm (revision 0) +++ branches/scool-ng/tests/examples/c++_ast/embeded_c++.aterm (revision 137) @@ -0,0 +1 @@ +CxxProgram([CxxProgram("#include <iostream> "),CxxFun([],CxxType("int"),CxxId("f"),[(CxxType("int"),CxxId("arg"))],None,[CxxProgram("std::cout << arg << std::endl; "),CxxExpStm(CxxKeyword("return",CxxProgram("arg + 42 ")))])]) Index: branches/scool-ng/tests/examples/c++_src/embeded_c++.cc =================================================================== --- branches/scool-ng/tests/examples/c++_src/embeded_c++.cc (revision 0) +++ branches/scool-ng/tests/examples/c++_src/embeded_c++.cc (revision 137) @@ -0,0 +1,6 @@ +#include <iostream> +int f(int arg) +{ + std::cout << arg << std::endl; + return arg + 42 ; +} Index: branches/scool-ng/tests/examples/scool_ast/embeded_c++.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/embeded_c++.aterm (revision 0) +++ branches/scool-ng/tests/examples/scool_ast/embeded_c++.aterm (revision 137) @@ -0,0 +1 @@ +Program([CxxStatement(Cxx("#include <iostream> ")),FunctionDefinition(None,Identifier("f"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("arg"),SimpleType("int"))]),SimpleType("int")),FunctionBlock([CxxStatement(Cxx("std::cout << arg << std::endl; ")),ReturnStatement(Cxx("arg + 42 "))]))]) Index: branches/scool-ng/tests/examples/c++_build/embeded_c++.g++ ===================================================================

1 0

scool r136: Fix test embeded_c++.scl
by Vincent Ordy 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Vincent Ordy <ordy(a)lrde.epita.fr> Fix test embeded_c++.scl. * tests/examples/scool_src/embeded_c++.scl: Add missing ';'. --- embeded_c++.scl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: branches/scool-ng/tests/examples/scool_src/embeded_c++.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/embeded_c++.scl (revision 135) +++ branches/scool-ng/tests/examples/scool_src/embeded_c++.scl (revision 136) @@ -1,5 +1,5 @@ // Example found in van-noppen.09.dslwc -|[ #include <iostream> ]| +|[ #include <iostream> ]|; f : (arg: int) -> int = { |[ std::cout << arg << std::endl; ]|;

1 0

scool r135: Fix a test
by Matthieu Martin 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-02-12 Matthieu Martin <matthieu.mar(a)gmail.com> Fix a test. * examples/scool_ast/container_1.aterm: New. * examples/scool_src/container_1.scl: Add return type. --- scool_ast/container_1.aterm | 1 + scool_src/container_1.scl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Index: branches/scool-ng/tests/examples/scool_ast/container_1.aterm =================================================================== --- branches/scool-ng/tests/examples/scool_ast/container_1.aterm (revision 0) +++ branches/scool-ng/tests/examples/scool_ast/container_1.aterm (revision 135) @@ -0,0 +1 @@ +Program([StaticClassFunction(Identifier("Container"),ParametersDeclaration([TypedId(Identifier("T"),"type")]),None,StaticClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("value_type"),StaticInitialiser(SimpleType("T"))),FunctionDefinition(None,Identifier("get"),FunctionType(None,ArgumentsDeclaration([]),SimpleType("value_type")),FunctionBlock([ReturnStatement(Identifier("value"))])),FunctionDefinition(Some("mutable"),Identifier("set"),FunctionType(None,ArgumentsDeclaration([TypedId(Identifier("value"),SimpleType("value_type"))]),SimpleType("void")),FunctionBlock([ExpressionStatement(Assign(Identifier("value_"),Identifier("value")))]))]),AccessBlock(Private,[SimpleDeclaration(Some("var"),Identifier("value_"),SimpleType("value_type"),None)])]))]) Index: branches/scool-ng/tests/examples/scool_src/container_1.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 134) +++ branches/scool-ng/tests/examples/scool_src/container_1.scl (revision 135) @@ -5,7 +5,7 @@ value_type : type = T; get : () -> value_type = { -> value; } - mutable set : (value : value_type) = { value_ = value; } + mutable set : (value : value_type) -> void = { value_ = value; } } private

1 0