ChangeLog.concepts

   1 2013-10-25  Andrew Sutton  <andrew.n.sutton@gmail.com>
   2         * gcc/cp/parsre.c (cp_parser_requires_expression): Gracefully
   3         fail when parsing a requires expr outside a template.
   4
   5 2013-10-24  Andrew Sutton  <andrew.n.sutton@gmail.com>
   6         * gcc/cp/c-common.c (c_common_r): Remove unused keywords "assume",
   7         "axiom", and "forall".
   8         * gcc/cp/c-common.h (rid): Removed unused reserved word ids.
   9
  10 2013-10-24  Edward Smith-Rowland  <3dw4rd@verizon.net>
  11         * gcc/cp/typeck.c (cp_build_function_call_vec): Use unused variable
  12         loc.
  13
  14 2013-10-23  Andrew Sutton  <andrew.n.sutton@gmail.com>
  15         * gcc/cp/class.c (get_member_fntemplate): New.
  16         (are_constrained_member_overloads): Only get a template declaration
  17         if the member function is, in fact, a template or temploid.
  18         * gcc/cp/pt.c (check_explicit_specialization): Do not allow
  19         explicit specializations to be declared 'concept', and do not allow
  20         an explicit specialization of a concept.
  21         * gcc/cp/decl.c (grokfndecl): Propagate the concept flag to
  22         check_explicit_specialization.
  23
  24 2013-10-22  Andrew Sutton  <andrew.n.sutton@gmail.com>
  25         * gcc/c-family/c-common.c (cxx_dialect): Make the default
  26         language C++11.
  27         * gcc/cp/constraint.cc (check_constrained_friend): Don't assert
  28         on error_mark_node.
  29
  30 2013-10-16  Andrew Sutton  <andrew.n.sutton@gmail.com>
  31         * gcc/cp/logic.cc (left_requires), (decompose_left): Add
  32         decomposition rules for requires expressions.
  33         (subsumes_requires), (subsumes_prop): Add subsumption rules for
  34         requires expressions.
  35         * gcc/cp/constraint.cc (diagnose_trait): Diagnose failed conversion
  36         requirements.
  37
  38 2013-10-16  Andrew Sutton  <andrew.n.sutton@gmail.com>
  39         * gcc/cp/constraint.cc (finish_concept_name): Allow functions with
  40         the same name as concepts to resolve as call expressions in the
  41         usual way.
  42
  43 2013-10-16  Andrew Sutton  <andrew.n.sutton@gmail.com>
  44         * gcc/cp/constraint.cc (conjoin_requiremens): New.
  45         (resolve_constraint_check): Filter non-concept candidates before
  46         coercing arguments. Perform deduction in a template-decl processing
  47         context to prevent errors during diagnosis.
  48         (finish_concept_name), (finish_shorthand_requirement),
  49         (get_shorthand_requirements): New.
  50         * gcc/cp/pt.c (template_parm_to_arg): Make non-static.
  51         (process_templat_parm): Build shorthand requirements from the
  52         parameter description.
  53         (end_templat_parm_list): New.
  54         (convert_placeholder_argument): New.
  55         (convert_template_argument): Match placeholder arguments against
  56         any template parameter.
  57         (tsubst_pack_conjuction):  New.
  58         (tsubst_expr): Expand a pack as a conjunction.
  59         (type_dependent_expression_p): Placeholders are always type
  60         dependent.
  61         * gcc/cp/parser.c (cp_is_constrained_parameter),
  62         (cp_finish_template_type_parm), (cp_finish_template_template_parm)
  63         (cp_finish_non_type_template_parm), (cp_finish_constrined_parameter):
  64         New.
  65         (cp_parser_template_parameter): Handle constrained parameters.
  66         (cp_parser_nonclass_name): An identifier naming an overload set
  67         may declare a constrained parameter.
  68         (cp_parser_type_parameter), (cp_parser_template_declaration_after_exp):
  69         Get shorthand requirements from the tmeplate parameter list.
  70         * gcc/cp/cp-tree.h (TEMPLATE_PARM_CONSTRAINTS): New.
  71
  72 2013-10-07  Andrew Sutton  <andrew.n.sutton@gmail.com>
  73         * gcc/cp/cp-tree.h (check_constrained_friend): Take requirements as
  74         an argument.
  75         * gcc/cp/constraints.cc (check_constrained_friend): Do not diagnose
  76         errors in unconstrained friend declarations.
  77         * gcc/cp/parser.cc (cp_parser_member_declaration): Pass current
  78         requirements to check_constrained_friend.
  79
  80 2013-10-07  Andrew Sutton  <andrew.n.sutton@gmail.com>
  81         * gcc/cp/parser.c (cp_parser_member_declaration): Check that
  82         a constrained friend definition is valid.
  83         * gcc/cp/decl.c (grokfndecl): Disallow constrained friend template
  84         specializations.
  85         * gcc/cp/constraints.cc (check_constrained_friend): New.
  86         * gcc/cp/typeck.c (cp_build_function_call_vec): Diagnose constraints
  87         in the presence of the failure of a single candidate.
  88         * gcc/cp/cp-tree.h (check_constrained_friend): New.
  89         * gcc/cp/call.c (is_non_template_member_fn): Make inline.
  90         (is_non_template_friend), (is_constrainable_non_template_fn): New.
  91         (add_function_candidate): Predicate check on
  92         is_constrainable_non_template_fn.
  93
  94 2013-09-10  Andrew Sutton  <andrew.n.sutton@gmail.com>
  95         * gcc/cp/cp-tree.h (TEMPLATE_PARMS_CONSTRAINTS): New.
  96         * gcc/cp/parser.c (cp_parser_template_declaration_after_export),
  97         (cp_parser_type_parameter): Use TEMPLATE_PARMS_CONSTRAINTS.
  98         * gcc/cp/semantics.c (fixup_template_scope): Use
  99         TEMPLATE_PARMS_CONSTRAINTS.
 100
 101 2013-09-11  Andrew Sutton  <andrew.n.sutton@gmail.com>
 102         * gcc/cp/cxx-pretty-print.c (pp_cxx_compound_requirement),
 103         (pp_cxx_type_requirement), (pp_cxx_validtype_expr): Use
 104         pp->type_id() instead of pp_cxx_type_id().
 105
 106 2013-09-09  Andrew Sutton  <andrew.n.sutton@gmail.com>
 107         * gcc/cp/pt.c (get_class_bindings): Pass the partial specialization
 108         for constraint evaluation. Evaluate constraints, resulting in
 109         deduction failure on error.
 110         (get_specializaing_template_decl), (get_specialization_constraints),
 111         (maybe_new_partial_specialization): New.
 112         (maybe_process_partial_specialization): Allow the creation of
 113         new types for constrained partial specializations.
 114         (process_partial_specialization): Modify the canonical type
 115         of constrained partial specializations.
 116         (instantiate_class_template_1): Do not explicitly check constraints
 117         during class template instantiation.
 118         (tsubst_decl): Instantiate the constraints of template declarations.
 119         (more_specialized_class): Pass specializations to get_class_bindings().
 120         Compare specialization constraints if the types are equivalent.
 121         (most_specialized_class): Pass specialization to get_class_bndings().
 122         * gcc/cp/decl2.c (check_class_fn): Get the decl's requirements from
 123         either the current template reqs or from the template parameters.
 124         Allow overloading of constrained out-of-class member definitions.
 125         * gcc/cp/semantics.c (fixup_template_type): New. Match the template
 126         scope to a specialization with appropriate constraints.
 127         (finish_template_type): Fix template type when entering scope.
 128         * gcc/cp/parser.c (cp_parser_parse_type_parameter): Attach
 129         requirements to the current template parameter list.
 130         (cp_parser_init_declarator): Parse requires clauses for out-of-class
 131         member definitions. Be sure to restore current constraints before
 132         exiting the function.
 133         (cp_parser_member_declarator): Restore the previous requirements in
 134         an early-exit branch.
 135         (cp_parser_late_parsing_for_member): Restore constraints after
 136         maybe_end_member_template_processing().
 137         (cp_parser_template_declaration_after_exp): Attach constraints to
 138         the current template parameters.
 139         * gcc/cp/constraint.cc (reduce_template_id): Don't crash when
 140         omitting ()'s on constraint calls.
 141         (check_requirements): Don't evaluate dependent arguments.
 142         (check_constraints): Don't try to evaluate when arguments are
 143         dependent.
 144         (equivalent_constraints): Optimize the case when a and b are the
 145         same constraints.
 146
 147 2013-07-26  Andrew Sutton  <andrew.n.sutton@gmail.com>
 148         * gcc/cp/semantics.c (trait_expr_value): Evaluate __is_same_as.
 149         (finish_trait_expr): Check __is_same_as and __is_convertible_to.
 150         * gcc/cp/constraint.cc (diagnose_trait): Diagnose failures in
 151         __is_same_as.
 152         * gcc/cp/parser.c (cp_parser_primary_expression),
 153         (cp_parser_trait_expr): Parse __is_same_as.
 154         * gcc/cp/cp-tree.h (cp_trait_kind): Add CPTK_IS_SAME_AS.
 155         * gcc/cp/cxx-pretty-print.c (pp_cxx_trait_expression): Pretty print
 156         __is_same_as trait.
 157
 158 2013-07-26  Andrew Sutton  <andrew.n.sutton@gmail.com>
 159         * gcc/cp/tree.c (cp_walk_subtrees): Don't recurse through the
 160         requires expr parameter list.
 161
 162 2013-07-25  Andrew Sutton  <andrew.n.sutton@gmail.com>
 163         * gcc/cp/parser.c (cp_parser_requires_expr): Update parser using new
 164         requires expression nodes. Renamed some grammar productions to better
 165         reflect the representation of the syntax. Create a new scope for
 166         requires parameters.
 167         (cp_parser_nested_requirement): Wrap results in a NESTED_REQ node.
 168         * gcc/cp/semantics.c (xvalue_result_type): New.
 169         (trait_expr_value): Evaluate __is_convertible_to.
 170         (finish_requires_expr): Implemented, along with other functions to
 171         construct and evaluate nodes for template constraints.
 172         (potential_constant_expression_1): Handle requires expressions.
 173         (finish_template_requirements), (finish_requires_expr), etc:
 174         Move to constraint.cc.
 175         * gcc/cp/cp-tree.def: (REQUIRES_EXPR), (EXPR_REQ), (TYPE_REQ),
 176         (NESTED_REQ), (VALIDEXPR_EXPR), (VALIDTYPE_EXPR), (CONSTEXPR_EXPR):
 177         New.
 178         * gcc/cp/cp-objcp-common.c (cp_common_init_ts): Make new nodes typed.
 179         * gcc/cp/cp-tree.h (finish_expr_requirement),
 180         (finish_type_requirement), (finish_nested_requirement),
 181         (finish_validexpr_expr), (finish_validtype_expr),
 182         (finish_constexpr_expr): New.
 183         * gcc/cp/pt.c (convert_nontype_argument): Use can_convert_standard.
 184         (retrieve_local_specialization), (register_local_specialization),
 185         (extract_fnparm_pack): Make non-static.
 186         (tsubst_expr): Substitution rules for requires expressions.
 187         (instantiate_requirements): Move to constraints.cc
 188         (tsubst_constraint): Remove.
 189         * gcc/cp/call.c (can_convert): Allow user-defined conversions.
 190         (can_convert_standard): New.
 191         * gcc/cp/cvt.c (convert_to_reference): Use can_convert_standard.
 192         * gcc/cp/search.c (check_final_overrider): Use can_cnvert_standard.
 193         * gcc/cp/typeck.c (build_static_cast_1): Use can_convert_standard.
 194         * gcc/cp/error.c (dump_expr): Pretty print new nodes.
 195         * gcc/cp/cxx-pretty-print.c (pp_cxx_primary_expression): Pretty
 196         print new expr/req nodes.
 197         (pp_cxx_requires_expr): New along with related functions for
 198         pretty printing requirements.
 199         (pp_cxx_parameter_declaration_clause): Accommodate "raw" parameter
 200         lists in addition to function decls.
 201         (pp_cxx_requirement_parameter_list): Unified with parameter decl clause.
 202         * gcc/cp/cxx-pretty-print.h (pp_cxx_requires_expr): New along with
 203         related functions for pretty printing requirements.
 204         * gcc/cp/logic.cc: Move header comments to top of file.
 205         * gcc/cp/constraint.cc (reduce_requirements): Handle requires
 206         expressions.
 207         (diagnose_constraints): Rename and handle requires expressions.
 208
 209 2013-07-01  Andrew Sutton  <andrew.n.sutton@gmail.com>
 210         * gcc/cp/error.c (cp_printer): Fix unnecessary whitespace change.
 211         * gcc/cp/constraint.cc (diagnose_node): Don't fail diagnosing
 212         disjunctions.
 213
 214 2013-07-01  Andrew Sutton  <andrew.n.sutton@gmail.com>
 215         * gcc/cp/class.c (are_constrained_member_overloads): Fix doc typos.
 216
 217 2013-06-24  Andrew Sutton  <andrew.n.sutton@gmail.com>
 218         * gcc/cp/parser.c (cp_parser_init_declarator): Parse template
 219         requirements for out-of-class member definitions.
 220         * gcc/cp/decl2.c (check_classfn): Include match out-of-class
 221         definitions using constraints.
 222         * gcc/cp/constraint.cc (equivalently_constrained). Use get_constraints.
 223         (more_constrained). Use get_constraints.
 224
 225 2013-06-24  Andrew Sutton  <andrew.n.sutton@gmail.com>
 226         * gcc/cp/cp-tree.h (tree_template_info). Remove constraint from
 227         template info.
 228         (check_template_info): Removed (unused).
 229         (TI_CONSTRAINT): Removed (no longer needed) along with related macros.
 230         (DECL_CONSTRAINTS): New. Get constraints from DECL_SIZE_UNIT for
 231         template decls.
 232         (build_template_info): Removed overload taking constraints.
 233         (get_constraints): Removed (no longer needed).
 234         * gcc/cp/class.c (are_constrained_member_overlaods): Allow constrained
 235         member function templates to be differentiated as overloads.
 236         * gcc/cp/decl.c (decls_match): Only compare constraints on
 237         declarations.
 238         (grokfndecl): Don't pass constraints to build_template_info.
 239         * gcc/cp/tree.c (bind_template_template_parm): Don't pass constraints
 240         to build_template_info.
 241         * gcc/cp/pt.c (build_template_info): Removed overload taking
 242         constraints.
 243         (check_explicit_specialization): Don't build new constraints for
 244         template info.
 245         (build_template_decl): Pass constraints. Update docs.
 246         (process_partial_specialization): Stub out support for constrained
 247         partial specialiations.
 248         (push_template_decl_real): Build template decls with current template
 249         reqs. Don't pass constraints to build_template_info.
 250         (add_inherited_template_parms): Build new constraints from inherited
 251         template constructors.
 252         (redeclare_class_template): Update to new constraint interface.
 253         (is_compatible_template_arg): Update to new constraint interface.
 254         (lookup_template_class_1): Don't build new constraints or pass them to
 255         build_template_info.
 256         (instantiate_class_template_1): Update to new constraints interface.
 257         (tsubst_decl): Don't build new constraints or pass them to
 258         build_template_info. For function templates, explicitly instantiate
 259         new constraints for member functions of class templates.
 260         * gcc/cp/semantics.c: Associate constraints with template template
 261         parms directly, not through template info.
 262         * gcc/cp/constraint.cc (get_constraints): Simplified to use new constraints
 263         interface.
 264         (check_constraints): Update to use new constraints interface.
 265         (equivalently_constrained): Update to use new constraints interface.
 266         (more_constrained): Update to use new constraints interface.
 267         * gcc/cp/parser.cpp (cp_parser_late_parsing_for_member): Update to use
 268         new constraints interface.
 269         * gcc/cp/call.c (is_non_template_member_fn): New.
 270         (add_function_candidate): Only check constraints for non-template member
 271         functions.
 272
 273 2013-06-21  Andrew Sutton  <andrew.n.sutton@gmail.com>
 274         * gcc/cp/parser.c (cp_parser_requires_clause): Pulled out of
 275         cp_parser_requires_clause_opt for reuse in the requires expr parser.
 276         (cp_parser_requires_expression): New, along with a family of
 277         sub-expression parsers for the new feature.
 278         * gcc/cp/semantics.c (finish_requires_expr): Stub.
 279         (finish_syntax_requirement): Stub.
 280         (finish_type_requirement): Stub.
 281         (finish_constexpr_requirement): Stub.
 282         (finish_noexcept_requirement): Stub.
 283         (finish_requires_expr): Stub.
 284         * gcc/cp/cp-tree.h: (finish_requires_expr): New.
 285         (finish_syntax_requirement): New.
 286         (finsih_type_requirement): New.
 287         (finish_constexpr_requirement): New.
 288         (finish_noexcept_requirement): New.
 289
 290 2013-06-21  Andrew Sutton  <andrew.n.sutton@gmail.com>
 291         * gcc/cp/error.c (subst_to_string): Allow this to be called explicitly
 292         passing template parameters in the TREE_TYPE and with a null
 293         TREE_PURPOSE.
 294         * constraint.cc (check_requirements): New overload taking template
 295         arguments.
 296         (check_constraints.cc): Move instantiation and checking into the
 297         new check_requirements overload.
 298         (diagnose_requirements): New family of functions for diagnosing
 299         constraint failures.
 300
 301 2013-06-18  Andrew Sutton  <andrew.n.sutton@gmail.com>
 302         * gcc/cp/class.c (are_constrained_member_overloads): New.
 303         (add_method): Allow overloading of constrained member functions.
 304         * gcc/cp/call.c (rejection_reason_code): New rr_constraint_failure.
 305         (template_constraint_failure): New.
 306         (add_function_candidate): Check for viability as a precondition to use.
 307         (add_template_candidate_real): Integrate constraint diagnostics.
 308         Provide constraint info for new template instantiations.
 309         (print_z_candidate): Emit diagnostics for constraint failures.
 310         (template_decl_for_candidate): New.
 311         (joust): Allow non-member templates of class templates to be evaluated
 312         in more_specialized_fn if they are constrained.
 313         * gcc/cp/ptree.c (cxx_print_xnode): Dump constraint info.
 314         * gcc/cp/semantics.c (finish_template_template_parm): Build template
 315         info for template template parameters.
 316         (is_unary_trait): New.
 317         (is_binary_trait): New.
 318         (finish_trait_expr): Check for binary traits using new function.
 319         * gcc/cp/constraint.cc (join_requirements): New
 320         (conjoin_requirements): Join expressions correctly. Fixed docs.
 321         (disjoin_requirements): Removed.
 322         (is_constriant): Removed.
 323         (resolve_constraint_check): New. Replaces previous get_constraint
 324         check and related functions.
 325         (get_constraints): New, along with helper functions.
 326         (suppress_template_processing): New.
 327         (check_template_constraints): New, along with helper functions.
 328         (equivalent_constraints): New.
 329         (equivalently_constrained): New.
 330         (more_constraints): New.
 331         (more_constrianed): New.
 332         (diagnose_constraint_failure): New.
 333         * gcc/cp/decl.c (decls_match): Check for constraint equivalence if
 334         the types are the same.
 335         (check_concept_refinement): New.
 336         (are_constrained_overloads): New.
 337         (duplicate_decls): Handle constraints for ambigous declarations. Check
 338         and diagnose concept refinement.
 339         (check_concept_fn): Don't fail completely just because the concept
 340         isn't defined correctly. Allow analysis to continue as if declared
 341         constexpr. Concepts must return bool.
 342         * gcc/cp/tree.c (bind_template_template_parm): Provide empty
 343         constraints for bound template template parameters.
 344         * gcc/cp/logic.cc: Rewrite of proof state and related structures and
 345         decomposition logic. Removed right-decomposition logic, but retained
 346         right-logical rules.
 347         (match_terms): Renamed from entails.
 348         (subsumes_prop): Cleanup, added specific handlers for and/or cases.
 349         (subsumes_constraints): Update from interface change.
 350         * gcc/cp/cp-tree.h (check_constraint_info): Renamed and applied
 351         interface change.
 352         (check_template_info): Renamed and applied interface change.
 353         (cp_unevaluated): New
 354         (local_specialization_stack): New.
 355         (coerce_template_parms): New.
 356         (is_unary_trait): New.
 357         (is_binary_trait): New.
 358         (get_constraints): New.
 359         (check_constraints): New.
 360         (check_template_constraints): New.
 361         (subst_template_constraints): New.
 362         (equivalent_constraints): New.
 363         (equivalently_constrained): New.
 364         (more_constraints): New.
 365         (more_constrained): New.
 366         (diagnose_constraints_failure): New.
 367         * gcc/cp/cxx-pretty-print.c (pp_cxx_template_declaration): Print the
 368         template requirements.
 369         * gcc/cp/pt.c (local_specialization_stack): New.
 370         (build_template_info): Refactor into 3-argument version and
 371         incorporate template requirements.
 372         (check_explicit_specialization): Instantiate requirements for
 373         template info.
 374         (push_template_decl_real): Include constraints in template info.
 375         (redeclare_class_template): Diagnose redeclaration with different
 376         constraints.
 377         (is_compatible_template_arg): New.
 378         (convert_template_argument): Check constraints on template template
 379         arguments and diagnose errors.
 380         (lookup_template_class_1): Check constraints on alias templates.
 381         Keep constraints with instantiated types.
 382         (instantiate_class_template_1): Check constraints on class templates.
 383         (tsubst_decl): Instantiate and keep constraints with template info.
 384         Also, allow dependent pack arguments to produce neww parameter
 385         packs when instantiated.
 386         (coerce_template_parms): New overload.
 387         (tsubst_copy): Handle REAL_TYPE and BOOLEAN_TYPE.
 388         (tsubst_copy_and_build): PARM_DECLs can be instantiated as pack
 389         expansions (used with requires expression).
 390         (fn_type_unification): Check constraints for function templates.
 391         (more_specialized_fn): Determine which candidate is more constrained.
 392         (substitute_template_parameters): Removed.
 393         (tsubst_constraint): New.
 394         (substitute_requirements): New.
 395         * gcc/cp/parser.c: (cp_parser_optional) Removed along with helper
 396         functions, etc.
 397         (cp_unevaluated): New.
 398         (cp_parser_type_parameter): Check for requires kw explicitly, and
 399         save/clear template requirements before parsing the requires clause.
 400         (cp_parser_requires_clause): Removed.
 401         (cp_parser_template_declaration_after_exp): Check for requires kw
 402         explicitly.
 403         * gcc/system.h (cstdlib): Removed include.
 404         * gcc/c-family/c-common.h (D_CXX_CONCEPTS): New flag for disabling
 405         concept keywords.
 406         * gcc/c-family/c.opt (flag_concepts): Remove redundant declaration.
 407         * gcc/c-family/c-common.c (c_common_r): Concept-specific keywords
 408         are only enabled when concepts are enabled.
 409
 410 2013-06-01  Andrew Sutton  <andrew.n.sutton@gmail.com>
 411         * gcc/system.h (cstdlib): Include <cstdlib> to avoid poisoned
 412         declaration errors.
 413         * gcc/c-family/common.c (c_common_r): Added __is_same_as intrinsic,
 414         removed previous, unused intrinsics.
 415         * gcc/c-family/common.h (rid): Added RID_IS_SAME_AS.
 416         * gcc/cp/parser.c (take): New.
 417         (cp_requires_clause): New.
 418         (cp_requires_clause_opt): New.
 419         (cp_rule): New.
 420         (cp_parser_optional_if_token): New.
 421         (cp_parser_optional_if_not_token): New.
 422         (cp_parser_optional_if_keyword): New.
 423         (cp_parser_decl_specifier_seq): Parse 'concept' as a declspec.
 424         (cp_parser_type_parameter): Parse constrained template template parms.
 425         (cp_parser_member_specification_opt): Parse member constraints after
 426         the declaration, not before.
 427         (cp_parser_template_declaration_after_exp): Rewrote parsing for
 428         template requirements
 429         (cp_parser_late_parsing_for_member): Re-push the current template
 430         requirements when late-parsing member definitions.
 431         * gcc/cp/decl.c (check_concept_fn): New.
 432         (grokfndecl): Semantics for concept declspec.
 433         (grokdeclarator): Semantics for concept declspec.
 434         (xref_tag_1): Update to new interface.
 435         * gcc/cp/constraint.cc (make_constraints): New.
 436         * gcc/cp/cp-objcp-common.c (cp_tree_size): Add case for constraint_info.
 437         * gcc/cp/cp-tree.h (require): New.
 438         (tree_template_info): Add a field for constraint info.
 439         (tree_constraint_info): New.
 440         (constraint_info_p): New.
 441         (template_info_p): New.
 442         (CI_SPELLING): New.
 443         (CI_REQUIREMENTS): New.
 444         (CI_ASSUMPTIONS): New.
 445         (TI_CONSTRAINT): New.
 446         (TI_SPELLING): New.
 447         (TI_REQUIREMENTS): New.
 448         (TI_ASSUMPTIONS): New.
 449         (DECL_TEMPLATE_CONSTRAINT): New.
 450         (CLASSTYPE_TEMPLATE_CONSTRAINT): New.
 451         (ENUM_TEMPLATE_CONSTRAINT): New.
 452         (TEMPLATE_TEMPLATE_PARM_TEMPLATE_CONSTRAINT): New.
 453         (TYPE_TEMPLATE_CONSTRAINT): New.
 454         (cp_tree_node_structure_enum): Added entry for constraint info.
 455         (lang_tree_node): Added entry for constraint info.
 456         (lang_decl_base): Added bit for concept declarations.
 457         (DECL_DECLARED_CONCEPT_P): New.
 458         (cp_decl_spec): Added ds_concept declaration specifier.
 459         * gcc/cp/Make-lang.in (logic.o): New target.
 460         * gcc/cp/semantics.c (finish_template_requirements): Rewrite.
 461         * gcc/cp/logic.cc: New
 462         * gcc/cp-tree.def (CONSTRAINT_INFO): New node.
 463         * gcc/cp/pt.c (current_template_args): Make non-static.
 464         (redeclare_class_template): Take constraints as a 3rd argument
 465
 466 2013-04-01  Andrew Sutton  <andrew.n.sutton@gmail.com>
 467
 468         * gcc/cp/Make-lang.in: Add constraints.o target.
 469         * gcc/cp/cp-tree.h (substitute_template_parameters): Declare.
 470         (instantiate_requirements): Declare.
 471         (conjoin_requirements): Declare.
 472         (disjoin_requirements): Declare.
 473         (reduce_requirements): Declare.
 474         * gcc/cp/pt.c (substitute_template_parameters): Define.
 475         (instantiate_requirements): Define.
 476         * gcc/cp/pt.c (finish_template_requirements): Call
 477         reduce_requirements to get constraints.
 478         * gcc/cp/parser.c (cp_parser_type_parameter): Restore saved
 479         constraints after parsing template template parameter decl.
 480         * gcc/cp/constraints.cc: New.
 481
 482 2013-03-11  Andrew Sutton  <andrew.n.sutton@gmail.com>
 483         * gcc/cp/Make-lang.in: Add constraint.c
 484         * gcc/cp/constraint.c: New
 485         (conjoin_requirements): New
 486         (disjoin_requirements): New
 487         (requirement_reduction): New class
 488         (reduce_requirements): New
 489         * gcc/cp/cp-tree.h (reduce_requrements): New
 490         (conjoin_requirements): New
 491         (disjoin_requirements): New
 492         * gcc/cp/cp-tree.h (finish_template_template_parm) Comments.
 493         * gcc/cp/semantics.c (finish_template_requirements) Start
 494         working with requirements.
 495
 496
 497 2013-03-01  Andrew Sutton  <andrew.n.sutton@gmail.com>
 498
 499         * gcc/cp/cp-tree.h (saved_scope): Add template requirements.
 500         (finish_template_requirements): Declare
 501         * gcc/cp/parser.c (cp_parser_template_requirement_opt): Declare.
 502         (cp_parser_template_declaration): Document grammar extensions.
 503         (cp_parser_type_parameter): Parse requirements for template
 504         template parameters.
 505         (cp_parser_member_declaration): Parse requirements for
 506         members of class templates.
 507         (cp_parser_template_requirement_opt): Define.
 508         (cp_parser_template_declaration_after_exp): Parse requirements
 509         for template declarations.
 510         * gcc/cp/semantics.c (finish_template_requirements): Define.
 511         * gcc/cp/lex.c (cxx_init): Enable concepts by default.
 512
 513 2013-03-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 514
 515         * lex.c (flag_concepts): Revert left over declaration.
 516
 517 2013-03-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 518
 519         * gcc/c-family/c-common.c (cxx_dialect): Set C++11 as default.
 520         * gcc/c-family/c.opt(flag_concepts): Add.
 521         * gcc/cp/lex.c (flag_concepts): New.  Enabled concept support by
 522         default.
 523
 524 2013-02-28  Andrew Sutton  <andrew.n.sutton@gmail.com>
 525
 526         * gcc/c-family/c-common.h (rid): New resreserved words for concepts.
 527         * gcc/c-family/c-common.c (c_common_reswords): Definitions thereof.
 528         * gcc/doc/extend.texi (write_symbol): Initial concept docs.