diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2009-09-29 23:01:30 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-09-29 23:01:30 -0400 |
| commit | d5f4edddeb609ad93c7a69ad4575b082de8dc707 (patch) | |
| tree | a0717adf99d475ef98d9002044972a7ab9c3e5d6 /include | |
| parent | 300ea2831b894fc143539fe0319f39062b6e4daf (diff) | |
| download | gcc-d5f4edddeb609ad93c7a69ad4575b082de8dc707.tar.gz | |
merge in cxx0x-lambdas-branch@152308
From-SVN: r152318
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog.lambda | 6 | ||||
| -rw-r--r-- | include/demangle.h | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/ChangeLog.lambda b/include/ChangeLog.lambda new file mode 100644 index 00000000000..6195e348486 --- /dev/null +++ b/include/ChangeLog.lambda @@ -0,0 +1,6 @@ +2009-09-29 Jason Merrill <jason@redhat.com> + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_LAMBDA, DEMANGLE_COMPONENT_DEFAULT_ARG, + DEMANGLE_COMPONENT_UNNAMED_TYPE. + (struct demangle_component): Add s_unary_num. diff --git a/include/demangle.h b/include/demangle.h index 4b3565bfbb8..76fab0a4582 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -381,6 +381,12 @@ enum demangle_component_type DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS, /* Global destructors keyed to name. */ DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS, + /* A lambda closure type. */ + DEMANGLE_COMPONENT_LAMBDA, + /* A default argument scope. */ + DEMANGLE_COMPONENT_DEFAULT_ARG, + /* An unnamed type. */ + DEMANGLE_COMPONENT_UNNAMED_TYPE, /* A pack expansion. */ DEMANGLE_COMPONENT_PACK_EXPANSION }; @@ -494,6 +500,14 @@ struct demangle_component struct demangle_component *right; } s_binary; + struct + { + /* subtree, same place as d_left. */ + struct demangle_component *sub; + /* integer. */ + int num; + } s_unary_num; + } u; }; |