Changeset 55c7577


Ignore:
Timestamp:
Mar 19, 2018, 2:13:49 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, with_gc
Children:
12db9e4
Parents:
a4d188f (diff), e6b3942 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.yy

    ra4d188f r55c7577  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Mar  9 11:37:35 2018
    13 // Update Count     : 3075
     12// Last Modified On : Fri Mar 16 17:24:44 2018
     13// Update Count     : 3081
    1414//
    1515
     
    534534        | '(' type_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
    535535                { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
     536        | '(' type_no_function ')' '@' '{' initializer_list comma_opt '}' // CFA, explicit C compound-literal
     537                { SemanticError( yylloc, "explicit C compound-literal is currently unimplemented." ); $$ = nullptr; } // FIX ME
    536538        | '^' primary_expression '{' argument_expression_list '}' // CFA
    537539                {
Note: See TracChangeset for help on using the changeset viewer.