1 2011-03-28 Jason Merrill <jason@redhat.com>
4 * semantics.c (constexpr_fn_retval): New. Allow using-declaration
6 (register_constexpr_fundef): Call it.
8 * except.c (build_noexcept_spec): Call cxx_constant_value after
11 2011-03-25 Kai Tietz <ktietz@redhat.com>
13 * lex.c (interface_strcmp): Handle dos-paths.
14 (handle_pragma_implementation): Use filename_cmp instead of
16 (in_main_input_context): Likewise.
18 2011-03-25 Jason Merrill <jason@redhat.com>
21 * method.c (defaulted_late_check): Check for exception spec mismatch.
22 (defaultable_fn_check): Allow exception spec and virtual.
23 * class.c (check_for_override): A virtual dtor is non-trivial.
26 * pt.c (build_non_dependent_expr): Keep dereferences outside the
29 2011-03-25 Kai Tietz <ktietz@redhat.com>
31 * decl.c (decls_match): Replace target hook
32 call of comp_type_attributes by version in tree.c file.
33 * search.c (check_final_overrider): Likewise.
34 * typeck.c (structural_comptypes): Likewise.
36 2011-03-21 Kai Tietz <ktietz@redhat.com>
39 * cxx-pretty-print.c (pp_cxx_ptr_operator):
40 Display allowed attributes for function pointer types.
41 * error.c (dump_type_prefix): Likewise.
43 * tree.c (cxx_attribute_table): Adjust table.
45 2011-03-18 Jason Merrill <jason@redhat.com>
48 * semantics.c (finish_call_expr): Allow TARGET_EXPR for now.
51 * call.c (build_over_call): Don't skip ck_rvalue.
53 2011-03-17 Jason Merrill <jason@redhat.com>
56 * semantics.c (cxx_eval_constant_expression) [NOP_EXPR]: Don't let
57 the conversion set TREE_OVERFLOW.
60 * semantics.c (finish_decltype_type): Return T&& for xvalue.
61 * typeck.c (unlowered_expr_type): Preserve cv-quals.
64 * decl.c (revert_static_member_fn): Strip function-cv-quals.
66 2011-03-16 Jason Merrill <jason@redhat.com>
69 * semantics.c (potential_constant_expression_1): Don't allow *this
71 (register_constexpr_fundef): Use potential_rvalue_constant_expression.
74 * decl.c (compute_array_index_type): Don't bother trying to deal
75 with literal classes in ABI v1.
78 * decl.c (duplicate_decls): Return NULL_TREE for clashing
82 * semantics.c (cxx_eval_constant_expression) [COMPOUND_EXPR]: Don't
83 use the generic binary expression handling.
85 2011-03-16 Diego Novillo <dnovillo@google.com>
87 * Make-lang.in (CXX_PARSER_H): New.
88 (cp/parser.o): Add dependency on CXX_PARSER_H.
89 Add dependency on tree-pretty-print.h
90 (cp/cp-lang.o): Add dependency on CXX_PARSER_H.
91 * cp-lang.c: Include parser.h.
92 * parser.c: Include parser.h.
93 (struct cp_token): Add bitfield purged_p.
96 (CPP_PURGED): Remove. Update all users.
97 (struct cp_lexer): Change field buffer to be a VEC of cp_token.
98 Remove field buffer_length.
101 (struct tree_check): Move to parser.h.
102 (cp_token_position): Likewise.
103 (struct cp_token_cache): Likewise.
104 (CPP_KEYWORD): Likewise.
105 (CPP_TEMPLATE_ID): Likewise.
106 (CPP_NESTED_NAME_SPECIFIER): Likewise.
107 (N_CP_TTYPES): Likewise.
108 (enum cp_parser_status_kind): Likewise.
109 (struct cp_parser_context): Likewise.
110 (struct cp_default_arg_entry_d): Likewise.
111 (struct cp_unparsed_functions_entry_d): Likewise.
112 (struct cp_parser): Likewise.
113 (cp_lexer_dump_tokens): New.
114 (cp_lexer_debug_tokens): New.
115 (cp_lexer_finished_p): New.
116 (cp_lexer_alloc): Factor out of cp_lexer_new_main.
117 (cp_lexer_new_main): Re-write main lexing loop to push
118 tokens into the new VEC buffer.
119 (cp_lexer_print_token): Improve printing of CPP_NUMBER tokens.
120 Do not abort if the token type is not recognized, just print
122 * parser.h: New file.
123 * config-lang.in (gtfiles): Add cp/parser.h.
125 2011-03-16 Jason Merrill <jason@redhat.com>
128 * typeck.c (check_return_expr): Fix conditions for setting
129 LOOKUP_PREFER_RVALUE.
131 * call.c (build_over_call): Remove require_complete_type_sfinae call.
134 * decl.c (check_array_designated_initializer): Allow integer index.
135 (reshape_init_array_1): Set index on the elements.
137 2011-03-16 Jason Merrill <jason@redhat.com>
140 * typeck.c (convert_for_initialization): Use
141 perform_implicit_conversion_flags.
142 * call.c (standard_conversion): If LOOKUP_PREFER_RVALUE, set
143 rvaluedness_matches_p on ck_rvalue.
144 (convert_like_real) [ck_rvalue]: And restore it here.
147 * call.c (convert_arg_to_ellipsis): Handle incomplete type.
149 2011-03-16 Jason Merrill <jason@redhat.com>
151 * parser.c (cp_parser_abort_tentative_parse): Make sure we haven't
152 committed to this tentative parse.
155 * semantics.c (finish_call_expr): Preserve reference semantics
158 * call.c (convert_default_arg): Use LOOKUP_IMPLICIT.
160 2011-03-16 Jakub Jelinek <jakub@redhat.com>
162 * cp-objcp-common.c (cp_function_decl_explicit_p): Don't crash if
163 DECL_LANG_SPECIFIC is NULL.
165 2011-03-15 Jason Merrill <jason@redhat.com>
168 * pt.c (value_dependent_expression_p) [NOEXCEPT_EXPR]: Don't
169 check value_dependent_expression_p on the operand.
171 * semantics.c (push_cx_call_context): Return bool.
172 (cxx_eval_call_expression): Handle excess depth.
175 * method.c (synthesized_method_walk): Cleanups don't affect the
176 triviality of a constructor, but do affect deletion and exception
179 2011-03-15 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
181 * decl2.c (cp_check_const_attributes): New.
182 (cplus_decl_attributes): Call cp_check_const_attributes.
184 2011-03-15 Jason Merrill <jason@redhat.com>
187 * call.c (convert_default_arg): Use DECL_ORIGIN of fn. Check for
189 (push_defarg_context, pop_defarg_context): New.
190 * parser.c (cp_parser_late_parsing_default_args): Use them.
191 * cp-tree.h: Declare them.
193 2011-03-11 Dodji Seketeli <dodji@redhat.com>
195 * call.c (add_builtin_candidate)<case INDIRECT_REF>: The type of
196 the argument of the indirection operator should not be dependent.
199 2011-03-11 Jason Merrill <jason@redhat.com>
202 * pt.c (tsubst) [TYPENAME_TYPE]: Only give errors if tf_error.
205 * parser.c (cp_parser_template_type_arg): Set
206 type_definition_forbidden_message.
209 * decl.c (compute_array_index_type): Discard folding
210 if it didn't produce a constant.
212 2011-03-11 Jakub Jelinek <jakub@redhat.com>
215 * init.c (build_zero_init_1): Extracted from build_zero_init.
216 Add FIELD_SIZE argument, if non-NULL and field bit_position
217 as not smaller than that, don't add that field's initializer.
218 Pass DECL_SIZE as last argument to build_zero_init_1
219 for DECL_FIELD_IS_BASE fields.
220 (build_zero_init): Use build_zero_init_1.
222 2011-03-10 Jason Merrill <jason@redhat.com>
225 * pt.c (iterative_hash_template_arg): Remove special case for
229 * parser.c (cp_parser_single_declaration): Just return if
230 cp_parser_parse_and_diagnose_invalid_type_name complained.
232 2011-03-09 Jason Merrill <jason@redhat.com>
235 * pt.c (unify): An unresolved overload is a nondeduced context.
237 2011-03-09 Martin Jambor <mjambor@suse.cz>
239 PR tree-optimization/47714
240 * method.c (use_thunk): Clear addressable flag of thunk arguments.
242 2011-03-08 Dodji Seketeli <dodji@redhat.com>
245 * pt.c (convert_nontype_argument): Only call decay_conversion on
248 2011-03-08 Jason Merrill <jason@redhat.com>
251 * mangle.c (write_template_arg_literal) [STRING_CST]: Sorry.
254 * pt.c (convert_nontype_argument): Don't crash on non-pointer
255 argument to pointer parameter.
258 * pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
261 2011-03-08 Dodji Seketeli <dodji@redhat.com>
264 * name-lookup.c (binding_to_template_parms_of_scope_p): Only
265 consider scopes of primary template definitions. Adjust comments.
267 2011-03-07 Jason Merrill <jason@redhat.com>
270 * pt.c (convert_nontype_argument): Fix -fpermissive allowing
272 * semantics.c (potential_constant_expression_1): Check TREE_OVERFLOW.
275 * init.c (constant_value_1): Always require init to be TREE_CONSTANT.
278 * mangle.c (write_type): Strip cv-quals from FUNCTION_TYPE here.
279 (write_CV_qualifiers_for_type): Not here.
281 2011-03-06 Joseph Myers <joseph@codesourcery.com>
283 * lang-specs.h: Match -save-temps* instead of -save-temps.
285 2011-03-05 Jason Merrill <jason@redhat.com>
287 * mangle.c (write_expression): Change ABI v6 to v5.
288 (write_type): Likewise.
290 2011-03-04 Jan Hubicka <jh@suse.cz>
293 * optimize.c (maybe_clone_body): Update call of cgraph_same_body_alias
294 and cgraph_add_thunk.
295 * method.c (make_alias_for_thunk, use_thunk): Likewise.
296 * mangle.c (mangle_decl): Likewise.
298 2011-03-04 Jason Merrill <jason@redhat.com>
301 * pt.c (tsubst_copy_and_build) [PSEUDO_DTOR_EXPR]: Use tsubst for type.
302 (tsubst_copy) [default]: Just return t if !ENABLE_CHECKING.
305 * search.c (check_final_overrider): Allow pointer to same incomplete
306 class type with different cv-quals.
308 2011-03-03 Paolo Carlini <paolo.carlini@oracle.com>
311 * pt.c (tsubst_template_args): Check argument t for error_mark_node.
313 2011-03-03 Jason Merrill <jason@redhat.com>
316 * pt.c (tsubst_copy_and_build) [TARGET_EXPR]: Retain TREE_CONSTANT.
318 2011-03-02 Jason Merrill <jason@redhat.com>
321 * parser.c (cp_parser_condition): Don't fold_non_dependent_expr here.
324 * tree.c (build_vec_init_elt): Split out from...
325 (build_vec_init_expr): ...here.
326 (diagnose_non_constexpr_vec_init): New fn.
327 * semantics.c (potential_constant_expression_1): Use it.
328 * cp-tree.h: Declare it.
330 2011-03-01 Jason Merrill <jason@redhat.com>
333 * parser.c (cp_parser_primary_expression): Don't warn about a
334 failed tentative parse.
337 * semantics.c (cxx_bind_parameters_in_call): Don't call
338 adjust_temp_type on non-constant args.
341 * call.c (standard_conversion): Provide requested cv-quals on
342 class rvalue conversion.
345 * decl2.c (grokbitfield): Handle type-dependent width.
347 2011-02-28 Jason Merrill <jason@redhat.com>
350 * class.c (update_vtable_entry_for_fn): Check BINFO_LOST_PRIMARY_P
351 after checking for a non-thunk.
353 2011-02-26 Jason Merrill <jason@redhat.com>
356 * tree.c (cp_tree_equal): Compare DECL_PARM_LEVEL.
357 * pt.c (iterative_hash_template_arg): And hash it.
360 * semantics.c (non_const_var_error): Split out from...
361 (cxx_eval_constant_expression): ...here.
362 (potential_constant_expression_1) [VAR_DECL]: Use it.
363 Allow dependent variables.
365 2011-02-24 Jason Merrill <jason@redhat.com>
367 * parser.c (cp_parser_constant_expression): Set
368 non_integral_constant_expression correctly for C++0x too.
369 (cp_parser_static_assert): Allow non-constant expression.
370 (cp_parser_direct_declarator): Expect non_constant_p to be set
372 * pt.c (value_dependent_expression_p): Handle TYPEID_EXPR.
373 * semantics.c (maybe_constant_value): Check type_unknown_p too.
374 (potential_rvalue_constant_expression): New.
375 (require_potential_rvalue_constant_expression): New.
377 2011-02-23 Jason Merrill <jason@redhat.com>
379 * cp-tree.h (DECL_PARM_LEVEL): New.
380 (struct lang_decl_parm): Add level field.
381 * name-lookup.c (function_parm_depth): New fn.
382 * name-lookup.h: Declare it.
383 * parser.c (cp_parser_parameter_declaration_list): Use it.
384 * mangle.c (struct globals): Add parm_depth field.
385 (write_bare_function_type): Adjust it.
386 (write_expression): Include the level delta in PARM_DECL mangling
389 * semantics.c (finish_decltype_type): Remove shortcut for decltype
391 * mangle.c (write_type) [DECLTYPE_TYPE]: Strip it here for abi < 6.
393 2011-02-23 Nathan Froyd <froydnj@codesourcery.com>
396 * parser.c (cp_parser_class_specifier): Require a closing brace
397 to attempt error recovery.
399 2011-02-23 Jakub Jelinek <jakub@redhat.com>
402 * pt.c (struct pending_template): Add chain_next GTY option.
403 * decl.c (struct named_label_use_entry): Likewise.
405 2011-02-22 Paolo Carlini <paolo.carlini@oracle.com>
408 * semantics.c (build_lambda_object): Bail out if a field is
411 2011-02-22 Dodji Seketeli <dodji@redhat.com>
414 * class.c (dfs_declare_virt_assop_and_dtor)
415 (declare_virt_assop_and_dtor): New static functions.
416 (add_implicitly_declared_members): Use
417 declare_virt_assop_and_dtor.
419 2011-02-21 Jason Merrill <jason@redhat.com>
422 * decl2.c (decl_constant_var_p): A constexpr var needs an
423 initializer to be constant.
424 * semantics.c (cxx_eval_constant_expression): Complain about
425 constexpr var used in its own initializer.
426 * call.c (set_up_extended_ref_temp): Set
427 DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P too.
429 2011-02-20 Jason Merrill <jason@redhat.com>
432 * semantics.c (cxx_eval_call_expression): Call
433 cxx_eval_constant_expression in trivial shortcut.
436 * call.c (convert_class_to_reference): Don't try to set up a
437 second conv sequence for non-viable candidates.
440 * error.c (location_of): Handle non-tagged types.
443 * method.c (process_subob_fn): Instantiate constexpr templates.
444 * optimize.c (maybe_clone_body): Propagate DECL_DECLARED_CONSTEXPR_P.
446 2011-02-20 Dodji Seketeli <dodji@redhat.com>
449 * pt.c (tsubst_pack_expansion): do not use
450 cp_tree_equal/same_type_p to detect an expansion of a parameter
453 2011-02-19 Jason Merrill <jason@redhat.com>
456 * semantics.c (cxx_eval_call_expression): Shortcut trivial copy.
458 2011-02-18 Paolo Carlini <paolo.carlini@oracle.com>
461 * semantics.c (finish_non_static_data_member): Early return if
462 object is error_mark_node.
464 2011-02-18 Dodji Seketeli <dodji@redhat.com>
467 * pt.c (do_auto_deduction): Do not mention error_mark_node in
469 * semantics.c (finish_id_expression): Do not pass erroneous decl
470 to decl_constant_var_p.
472 2011-02-17 Jakub Jelinek <jakub@redhat.com>
475 * cvt.c (convert_from_reference): Call mark_exp_read.
477 2011-02-11 Dodji Seketeli <dodji@redhat.com>
480 * pt.c (finish_call_expr): Consider a call expression that has a
481 dependent "this" pointer as being dependent. Add comments.
482 (dependent_type_p, type_dependent_expression_p): Update comments.
484 2011-02-16 Dodji Seketeli <dodji@redhat.com>
487 * pt.c (tsubst_copy)<case SIZEOF_EXPR>: Ensure that even pack
488 expansion arguments are not evaluated.
490 2011-02-16 Jakub Jelinek <jakub@redhat.com>
493 * cp-tree.h (ENUM_FIXED_UNDERLYING_TYPE_P): Use TYPE_LANG_FLAG_5
494 instead of TYPE_LANG_FLAG_3.
495 * pt.c (lookup_template_class): Copy over
496 ENUM_FIXED_UNDERLYING_TYPE_P.
498 2011-02-15 Jason Merrill <jason@redhat.com>
501 * method.c (synthesized_method_walk): Always exit early for
502 trivial fn in C++98 mode.
504 2011-02-14 Jason Merrill <jason@redhat.com>
507 * parser.c (cp_parser_enumerator_definition): Call
508 fold_non_dependent_expr.
510 2011-02-09 Jason Merrill <jason@redhat.com>
512 * decl.c (cp_make_fname_decl): Set DECL_THIS_STATIC at toplevel.
513 * semantics.c (finish_fname): Only return the name if we're in
516 * decl.c (build_enumerator): Don't perform integral promotions on
517 non-integral constants.
519 * cvt.c (convert_to_void): Handle null op1.
521 * class.c (type_has_constexpr_default_constructor): Make sure the
522 caller stripped an enclosing array.
523 * init.c (perform_member_init): Strip arrays before calling it.
526 * semantics.c (potential_constant_expression_1): Handle TEMPLATE_DECL.
528 2011-02-03 Dodji Seketeli <dodji@redhat.com>
531 * tree.c (cp_tree_equal)<TEMPLATE_PARM_INDEX>: Take the number of
532 template parameters in account.
534 2011-02-03 Nathan Froyd <froydnj@codesourcery.com>
537 * parser.c (cp_parser_class_specifier): Fix setting of
540 2011-01-31 Jakub Jelinek <jakub@redhat.com>
543 * semantics.c (build_data_member_initialization): Handle
544 STATEMENT_LIST always instead of just for CLEANUP_BODY.
546 2011-01-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
548 * g++spec.c (lang_specific_driver) [HAVE_LD_STATIC_DYNAMIC] Use
549 LD_STATIC_OPTION, LD_DYNAMIC_OPTION.
551 2011-01-29 Dodji Seketeli <dodji@redhat.com>
554 * cp-tree.h (fixup_template_parms): Declare.
555 * pt.c (end_template_parm_list): Do not fixup template parms here.
556 (fixup_template_parms): Remove static. Fix typo in the
557 comments. Remove useless code statement.
558 (fixup_template_parm): For a template template parameter, fixup
559 its attributes before fixing up its type.
561 (cp_parser_template_declaration_after_export): After parsing
562 template parameters fixup their types.
564 2011-01-26 Jakub Jelinek <jakub@redhat.com>
567 * semantics.c (potential_constant_expression_1): Handle
570 2011-01-26 Dave Korn <dave.korn.cygwin@gmail.com>
573 * semantics.c (expand_or_defer_fn_1): Handle it.
574 * decl2.c (decl_needed_p): Likewise.
576 2011-01-21 Jason Merrill <jason@redhat.com>
579 * semantics.c (build_constexpr_constructor_member_initializers):
582 2011-01-21 Jakub Jelinek <jakub@redhat.com>
585 * semantics.c (begin_for_stmt): If -fno-for-scope, don't
586 assume init must be NULL if scope is NULL.
587 (begin_range_for_stmt): Likewise.
589 2011-01-21 Jason Merrill <jason@redhat.com>
592 * semantics.c (cxx_eval_constant_expression): Handle OFFSET_REF.
595 * semantics.c (potential_constant_expression_1): Split out from
596 potential_constant_expression. Add want_rval parm. Handle
597 template expression forms. Don't enforce restriction on address
598 of automatic variable here. Add a couple of diagnostics that
600 (require_potential_constant_expression): New entry point.
601 (build_data_member_initialization, register_constexpr_fundef): Adjust.
602 (maybe_constant_value): Check potential_constant_expression.
603 * pt.c (fold_non_dependent_expr_sfinae): Likewise.
604 * tree.c (build_vec_init_expr): Adjust.
606 2011-01-19 Jakub Jelinek <jakub@redhat.com>
609 * decl2.c (finish_anon_union): Only call mangle_decl if TREE_STATIC
612 2011-01-17 Jason Merrill <jason@redhat.com>
615 * semantics.c (base_field_constructor_elt): New fn.
616 (cxx_eval_bare_aggregate): Use it.
617 (build_data_member_initialization): Leave COMPONENT_REF for
620 2011-01-14 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
622 * parser.c (cp_parser_range_for): Remove the "unused variable" warning
625 2011-01-15 Giovanni Funchal <gafunchal@gmail.com>
626 Jonathan Wakely <jwakely.gcc@gmail.com>
629 * decl.c (grokdeclarator): Reject mutable reference members.
631 2011-01-14 Jason Merrill <jason@redhat.com>
634 * pt.c (coerce_template_parms): Fix error recovery.
637 * typeck2.c (check_narrowing): Only check arithmetic types.
640 * tree.c (build_vec_init_expr): Handle flexible array
643 2011-01-13 Kai Tietz <kai.tietz@onevision.com>
646 * cp-tree.h (CLASSTYPE_VISIBILITY): Use
647 TYPE_MAIN_DECL instead of TYPE_NAME.
648 (CLASSTYPE_VISIBILITY_SPECIFIED): Likewise.
649 * decl2.c (determine_visibility): Add check
650 of CLASS_TYPE_P for underlying_type.
652 2011-01-12 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
654 * cp-tree.h (begin_for_scope): New prototype.
655 (begin_for_stmt): Update prototype.
656 (begin_range_for_stmt): Update prototype.
657 * init.c (build_vec_init): Update call to begin_for_stmt.
658 * parser.c (cp_parser_for): New.
659 (cp_parser_c_for): Add three new parameters.
660 (cp_parser_range_for): Likewise. Most parsing code removed.
661 (cp_parser_iteration_statement): Call cp_parser_for instead of
662 cp_parser_c_for and cp_parser_range_for.
663 (cp_parser_for_init_statement): Add new parameter and return type.
664 (cp_parser_block_declaration): Update call to
665 cp_parser_simple_declaration.
666 (cp_parser_simple_declaration): Add new parameter.
667 Update call to cp_parser_init_declarator.
668 (cp_parser_init_declarator): Add new parameter.
669 * pt.c (tsubst_expr): Update call to begin_for_stmt.
670 * semantics.c (begin_for_scope): New.
671 (begin_for_stmt): Add two new parameters.
672 (begin_range_for_stmt): Likewise.
674 2011-01-12 Nicola Pero <nicola.pero@meta-innovation.com>
676 * parser.c (cp_parser_objc_at_property_declaration): Improved
679 2011-01-11 Dodji Seketeli <dodji@redhat.com>
682 * cp-lang.c (get_template_innermost_arguments_folded)
683 (get_template_argument_pack_elems_folded)
684 (template_arg_needs_folding, fold_cplus_constants): New static
686 (LANG_HOOKS_GET_INNERMOST_GENERIC_ARGS): Set this hook to
687 get_template_innermost_arguments_folded.
688 (LANG_HOOKS_GET_ARGUMENT_PACK_ELEMS): Set this hook to
689 get_template_argument_pack_elems_folded.
691 2011-01-11 Jason Merrill <jason@redhat.com>
694 * init.c (build_new_1): Handle value-init in templates differently.
697 * tree.c (maybe_dummy_object): Check current_class_ref against
698 context, not current_class_type.
700 2011-01-08 Nicola Pero <nicola.pero@meta-innovation.com>
703 * parser.c (cp_parser_objc_typename): If the type is unknown, for
704 error recovery purposes behave as if it was not specified so that
705 the default type is used.
707 2011-01-07 Jakub Jelinek <jakub@redhat.com>
710 * pt.c (tsubst_copy_and_build): Use tsubst instead of tsubst_copy
711 for the second build_x_va_arg argument.
713 2011-01-05 Tom Tromey <tromey@redhat.com>
715 * typeck.c (cp_build_addr_expr_1): Update call to lvalue_error.
716 (lvalue_or_else): Likewise.
718 2011-01-01 Kai Tietz <kai.tietz@onevision.com>
721 * tree.c (cxx_type_hash_eq):
722 Allow METHOD_TYPE, too.
725 Copyright (C) 2011 Free Software Foundation, Inc.
727 Copying and distribution of this file, with or without modification,
728 are permitted in any medium without royalty provided the copyright
729 notice and this notice are preserved.