Changeset db70fe4

Timestamp:

Sep 15, 2017, 9:03:38 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3e3d923

Parents:

ba54f7d

Message:

move code from ExpressionNode? into parser

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (4 diffs)
• ParseNode.h (modified) (3 diffs)
• parser.yy (modified) (7 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 13 14:54:19 2017
-// Update Count     : 683
+// Last Modified On : Thu Sep 14 23:09:34 2017
+// Update Count     : 690
 //
 
@@ -363 +363 @@
 } // build_pfieldSel
 
-Expression * build_addressOf( ExpressionNode * expr_node ) {
-        return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
-} // build_addressOf
-
-Expression * build_sizeOfexpr( ExpressionNode * expr_node ) {
-        return new SizeofExpr( maybeMoveBuild< Expression >(expr_node) );
-} // build_sizeOfexpr
-
-Expression * build_sizeOftype( DeclarationNode * decl_node ) {
-        return new SizeofExpr( maybeMoveBuildType( decl_node ) );
-} // build_sizeOftype
-
-Expression * build_alignOfexpr( ExpressionNode * expr_node ) {
-        return new AlignofExpr( maybeMoveBuild< Expression >(expr_node) );
-} // build_alignOfexpr
-
-Expression * build_alignOftype( DeclarationNode * decl_node ) {
-        return new AlignofExpr( maybeMoveBuildType( decl_node) );
-} // build_alignOftype
-
 Expression * build_offsetOf( DeclarationNode * decl_node, NameExpr * member ) {
         Expression * ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
@@ -423 +403 @@
 } // build_cond
 
-Expression * build_attrexpr( NameExpr * var, ExpressionNode * expr_node ) {
-        return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) );
-} // build_attrexpr
-
-Expression * build_attrtype( NameExpr * var, DeclarationNode * decl_node ) {
-        return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
-} // build_attrtype
-
 Expression * build_tuple( ExpressionNode * expr_node ) {
         list< Expression * > exprs;
@@ -442 +414 @@
         return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr );
 } // build_func
-
-Expression * build_range( ExpressionNode * low, ExpressionNode * high ) {
-        return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) );
-} // build_range
 
 Expression * build_compoundLiteral( DeclarationNode * decl_node, InitializerNode * kids ) {

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 13 12:35:10 2017
-// Update Count     : 807
+// Last Modified On : Thu Sep 14 23:09:39 2017
+// Update Count     : 815
 //
 
@@ -175 +175 @@
 Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member );
 Expression * build_pfieldSel( ExpressionNode * expr_node, Expression * member );
-Expression * build_addressOf( ExpressionNode * expr_node );
-Expression * build_sizeOfexpr( ExpressionNode * expr_node );
-Expression * build_sizeOftype( DeclarationNode * decl_node );
-Expression * build_alignOfexpr( ExpressionNode * expr_node );
-Expression * build_alignOftype( DeclarationNode * decl_node );
 Expression * build_offsetOf( DeclarationNode * decl_node, NameExpr * member );
 Expression * build_and( ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
@@ -188 +183 @@
 Expression * build_binary_ptr( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
 Expression * build_cond( ExpressionNode * expr_node1, ExpressionNode * expr_node2, ExpressionNode * expr_node3 );
-Expression * build_attrexpr( NameExpr * var, ExpressionNode * expr_node );
-Expression * build_attrtype( NameExpr * var, DeclarationNode * decl_node );
 Expression * build_tuple( ExpressionNode * expr_node = nullptr );
 Expression * build_func( ExpressionNode * function, ExpressionNode * expr_node );
-Expression * build_range( ExpressionNode * low, ExpressionNode * high );
 Expression * build_compoundLiteral( DeclarationNode * decl_node, InitializerNode * kids );
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 13 11:01:20 2017
-// Update Count     : 2803
+// Last Modified On : Thu Sep 14 23:07:12 2017
+// Update Count     : 2815
 //
 
@@ -563 +563 @@
                         switch ( $1 ) {
                           case OperKinds::AddressOf:
-                                $$ = new ExpressionNode( build_addressOf( $2 ) );
+                                $$ = new ExpressionNode( new AddressExpr( maybeMoveBuild< Expression >( $2 ) ) );
                                 break;
                           case OperKinds::PointTo:
@@ -569 +569 @@
                                 break;
                           case OperKinds::And:
-                                $$ = new ExpressionNode( new AddressExpr( build_addressOf( $2 ) ) );
+                                $$ = new ExpressionNode( new AddressExpr( new AddressExpr( maybeMoveBuild< Expression >( $2 ) ) ) );
                                 break;
                           default:
@@ -582 +582 @@
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::Decr, $2 ) ); }
         | SIZEOF unary_expression
-                { $$ = new ExpressionNode( build_sizeOfexpr( $2 ) ); }
+                { $$ = new ExpressionNode( new SizeofExpr( maybeMoveBuild< Expression >( $2 ) ) ); }
         | SIZEOF '(' type_no_function ')'
-                { $$ = new ExpressionNode( build_sizeOftype( $3 ) ); }
+                { $$ = new ExpressionNode( new SizeofExpr( maybeMoveBuildType( $3 ) ) ); }
         | ALIGNOF unary_expression                                                      // GCC, variable alignment
-                { $$ = new ExpressionNode( build_alignOfexpr( $2 ) ); }
+                { $$ = new ExpressionNode( new AlignofExpr( maybeMoveBuild< Expression >( $2 ) ) ); }
         | ALIGNOF '(' type_no_function ')'                                      // GCC, type alignment
-                { $$ = new ExpressionNode( build_alignOftype( $3 ) ); }
+                { $$ = new ExpressionNode( new AlignofExpr( maybeMoveBuildType( $3 ) ) ); }
         | OFFSETOF '(' type_no_function ',' no_attr_identifier ')'
                 { $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) ); }
         | ATTR_IDENTIFIER
-                { $$ = new ExpressionNode( build_attrexpr( build_varref( $1 ), nullptr ) ); }
+                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ) ) ); }
         | ATTR_IDENTIFIER '(' argument_expression ')'
-                { $$ = new ExpressionNode( build_attrexpr( build_varref( $1 ), $3 ) ); }
+                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
         | ATTR_IDENTIFIER '(' type ')'
-                { $$ = new ExpressionNode( build_attrtype( build_varref( $1 ), $3 ) ); }
+                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuildType( $3 ) ) ); }
         ;
 
@@ -895 +895 @@
         constant_expression                                                     { $$ = $1; }
         | constant_expression ELLIPSIS constant_expression      // GCC, subrange
-                { $$ = new ExpressionNode( build_range( $1, $3 ) ); }
+                { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
         | subrange                                                                                      // CFA, subrange
         ;
@@ -2089 +2089 @@
                 { $$ = $3; }
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
-                { $$ = new ExpressionNode( build_range( $3, $5 ) ); }
+                { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $3 ), maybeMoveBuild< Expression >( $5 ) ) ); }
         | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
                 { $$ = $4; }
@@ -2407 +2407 @@
 subrange:
         constant_expression '~' constant_expression                     // CFA, integer subrange
-                { $$ = new ExpressionNode( build_range( $1, $3 ) ); }
+                { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
         ;