Changeset ecb27a7

Timestamp:

May 3, 2017, 2:37:26 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

365da371

Parents:

37466ba0

Message:

dtor operator syntax is now a void-typed expression

File:

• src/Parser/parser.yy (modified) (3 diffs)

src/Parser/parser.yy

@@ -393 +393 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+        | primary_expression '{' argument_expression_list '}' // CFA
+                {
+                        Token fn;
+                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
+                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                }
         ;
 
@@ -425 +431 @@
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
-        | postfix_expression '{' argument_expression_list '}' // CFA
+        | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
-                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                        fn.str = new string( "^?{}" );                          // location undefined
+                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) );
                 }
         ;
@@ -730 +736 @@
         | exception_statement
         | asm_statement
-        | '^' postfix_expression '{' argument_expression_list '}' ';' // CFA
-                {
-                        Token fn;
-                        fn.str = new string( "^?{}" );                          // location undefined
-                        $$ = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) ) ) );
-                }
-        ;
 
 labeled_statement: