jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add in support for initialising auto variables from lambda expressions

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-matevz@13858 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-10-02 21:12:36 +00:00
commit 7ca8f025ad
2 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Examples/test-suite/cpp0x_lambda_functions.i
View file

@ -36,6 +36,10 @@ auto lambda8 = [] (int x, int y) throw() -> int { return x+y; };
auto lambda9 = [] (int x, int y) mutable throw() -> int { return x+y; }; auto lambda9 = [] (int x, int y) mutable throw() -> int { return x+y; };
auto lambda10 = [] (int x, int y) throw(int) { return x+y; }; auto lambda10 = [] (int x, int y) throw(int) { return x+y; };
auto lambda11 = [] (int x, int y) mutable throw(int) { return x+y; }; auto lambda11 = [] (int x, int y) mutable throw(int) { return x+y; };
auto lambda12 = [] (int a, int b) { return a + b; }(1, 2);
auto lambda13 = [] (int a, int b) mutable { return a + b; }(1, 2);
auto lambda14 = [] () throw () {};
auto lambda15 = [] () mutable throw () {};
int runLambda1() { int runLambda1() {
return lambda1(5,6); return lambda1(5,6);
@ -70,11 +74,9 @@ int runLambdaInline() {
struct LambdaStruct { struct LambdaStruct {
static constexpr auto lambda_struct1 = [=]() { return thing;}; static constexpr auto lambda_struct1 = [=]() { return thing;};
}; };
int(*lambda101notauto)(int, int) = [] (int a, int b) { return a + b; };
auto lambda100 = [] { return thing;}; auto lambda100 = [] { return thing;};
int lambda101 = [] (int a, int b) { return a + b; }(1, 2);
int lambda102 = [] (int a, int b) mutable { return a + b; }(1, 2); int lambda102 = [] (int a, int b) mutable { return a + b; }(1, 2);
auto lambda103 = [] () throw () { /* does not throw */ };
auto lambda104 = [] () mutable throw () { /* does not throw */ };
void lambda_init(int = ([=]{ return 0; })()); void lambda_init(int = ([=]{ return 0; })());
%} %}

47
Source/CParse/parser.y
View file

@ -1690,7 +1690,7 @@ static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) {
%type <node> types_directive template_directive warn_directive ; %type <node> types_directive template_directive warn_directive ;
/* C declarations */ /* C declarations */
%type <node> c_declaration c_decl c_decl_tail c_enum_key c_enum_inherit c_enum_decl c_enum_forward_decl c_constructor_decl c_lambda_decl c_lambda_decl_front ; %type <node> c_declaration c_decl c_decl_tail c_enum_key c_enum_inherit c_enum_decl c_enum_forward_decl c_constructor_decl;
%type <node> enumlist edecl; %type <node> enumlist edecl;
/* C++ declarations */ /* C++ declarations */
@ -1698,7 +1698,7 @@ static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) {
%type <node> cpp_members cpp_member; %type <node> cpp_members cpp_member;
%type <node> cpp_constructor_decl cpp_destructor_decl cpp_protection_decl cpp_conversion_operator cpp_static_assert; %type <node> cpp_constructor_decl cpp_destructor_decl cpp_protection_decl cpp_conversion_operator cpp_static_assert;
%type <node> cpp_swig_directive cpp_temp_possible cpp_nested cpp_opt_declarators ; %type <node> cpp_swig_directive cpp_temp_possible cpp_nested cpp_opt_declarators ;
%type <node> cpp_using_decl cpp_namespace_decl cpp_catch_decl ; %type <node> cpp_using_decl cpp_namespace_decl cpp_catch_decl cpp_lambda_decl;
%type <node> kwargs options; %type <node> kwargs options;
/* Misc */ /* Misc */
@ -1735,6 +1735,8 @@ static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) {
%type <ptype> type_specifier primitive_type_list ; %type <ptype> type_specifier primitive_type_list ;
%type <node> fname stringtype; %type <node> fname stringtype;
%type <node> featattr; %type <node> featattr;
%type <node> lambda_introducer lambda_body;
%type <pl> lambda_tail;
%% %%
@ -3098,7 +3100,7 @@ c_declaration : c_decl {
appendChild($$,firstChild($5)); appendChild($$,firstChild($5));
} }
} }
| c_lambda_decl { Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line,"Lambda expressions and closures are not fully supported yet.\n"); $$ = $1; } | cpp_lambda_decl { Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line,"Lambda expressions and closures are not fully supported yet.\n"); $$ = $1; }
| USING idcolon EQUAL { skip_decl(); Swig_warning(WARN_CPP11_ALIAS_DECLARATION, cparse_file, cparse_line,"The 'using' keyword in type aliasing is not fully supported yet.\n"); $$ = 0; } | USING idcolon EQUAL { skip_decl(); Swig_warning(WARN_CPP11_ALIAS_DECLARATION, cparse_file, cparse_line,"The 'using' keyword in type aliasing is not fully supported yet.\n"); $$ = 0; }
| TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL { skip_decl(); Swig_warning(WARN_CPP11_ALIAS_TEMPLATE, cparse_file, cparse_line,"The 'using' keyword in template aliasing is not fully supported yet.\n"); $$ = 0; } | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL { skip_decl(); Swig_warning(WARN_CPP11_ALIAS_TEMPLATE, cparse_file, cparse_line,"The 'using' keyword in template aliasing is not fully supported yet.\n"); $$ = 0; }
; ;
@ -3290,17 +3292,40 @@ cpp_alternate_rettype : primitive_type { $$ = $1; }
| decltype { $$ = $1; } | decltype { $$ = $1; }
; ;
/* Lambda function syntax introduced in C++0x. /*
auto myFunc = [](int x, int y) -> int { return x+y; } Lambda functions and expressions, such as:
OR auto myFunc = [](int x, int y) -> int { return x+y; };
auto myFunc = [](int x, int y) { return x+y; } auto myFunc = [](int x, int y) { return x+y; };
auto myFunc = [](int x, int y) { return x+y; }(1, 2);
*/ */
c_lambda_decl : c_lambda_decl_front LPAREN parms RPAREN cpp_const LBRACE { skip_balanced('{','}'); } SEMI { $$ = 0; } cpp_lambda_decl : storage_class AUTO idcolon EQUAL lambda_introducer LPAREN parms RPAREN cpp_const lambda_body lambda_tail {
| c_lambda_decl_front LPAREN parms RPAREN cpp_const ARROW type LBRACE { skip_balanced('{','}'); } SEMI { $$ = 0; } $$ = 0;
; }
| storage_class AUTO idcolon EQUAL lambda_introducer LPAREN parms RPAREN cpp_const ARROW type lambda_body lambda_tail {
$$ = 0;
}
;
c_lambda_decl_front : storage_class AUTO idcolon EQUAL LBRACKET { skip_balanced('[',']'); $$ = 0; } lambda_introducer : LBRACKET {
skip_balanced('[',']');
$$ = 0;
}
;
lambda_body : LBRACE {
skip_balanced('{','}');
$$ = 0;
}
lambda_tail : SEMI {
$$ = 0;
}
| LPAREN {
skip_balanced('(',')');
} SEMI {
$$ = 0;
}
;
/* ------------------------------------------------------------ /* ------------------------------------------------------------
enum enum