Changeset 974906e2 for src/Parser

Timestamp:

Jan 11, 2016, 2:48:05 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

a56767c

Parents:

1e9d87b

Message:

propagate maybeConstructed flag through system, begin create constructor/destructor statements for further processing by Resolver

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (7 diffs)
• InitializerNode.cc (modified) (5 diffs)
• ParseNode.h (modified) (7 diffs)
• parser.cc (modified) (1 diff)
• parser.yy (modified) (3 diffs)

src/Parser/DeclarationNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// DeclarationNode.cc -- 
+// DeclarationNode.cc --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 14 14:46:32 2015
-// Update Count     : 126
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jan 07 13:18:02 2016
+// Update Count     : 130
 //
 
@@ -96 +96 @@
                 os << endl << string( indent + 2, ' ' ) << "with initializer ";
                 initializer->printOneLine( os );
+                os << " maybe constructed? " << initializer->get_maybeConstructed();
+
         } // if
 
@@ -357 +359 @@
         } // if
 }
-          
+
 DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) {
         if ( q ) {
@@ -508 +510 @@
                 assert( false );
         } // switch
-        
+
         return this;
 }
@@ -619 +621 @@
                 assert( a->type->kind == TypeData::Array );
                 TypeData *lastArray = findLast( a->type );
-                if ( type ) {  
+                if ( type ) {
                         switch ( type->kind ) {
                           case TypeData::Aggregate:
@@ -663 +665 @@
         } // if
 }
-        
+
 DeclarationNode *DeclarationNode::addIdList( DeclarationNode *ids ) {
         type = addIdListToType( type, ids );
@@ -868 +870 @@
 Type *DeclarationNode::buildType() const {
         assert( type );
-  
+
         switch ( type->kind ) {
           case TypeData::Enum:

src/Parser/InitializerNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InitializerNode.cc -- 
-// 
+// InitializerNode.cc --
+//
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:20:24 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct  8 17:18:55 2015
-// Update Count     : 4
-// 
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jan 07 13:32:57 2016
+// Update Count     : 13
+//
 
 #include <cassert>
@@ -23 +23 @@
 
 InitializerNode::InitializerNode( ExpressionNode *_expr, bool aggrp, ExpressionNode *des )
-        : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ) {
+        : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( aggrp )
                 kids = dynamic_cast< InitializerNode *>( get_link() );
@@ -32 +32 @@
 
 InitializerNode::InitializerNode( InitializerNode *init, bool aggrp, ExpressionNode *des )
-        : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ) {
+        : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( init != 0 )
                 set_link(init);
@@ -91 +91 @@
                 } // if
 
-                return new ListInit( initlist, designlist );
+                return new ListInit( initlist, designlist, maybeConstructed );
         } else {
                 std::list< Expression *> designators;
@@ -99 +99 @@
 
                 if ( get_expression() != 0)
-                        return new SingleInit( get_expression()->build(), designators );
+                        return new SingleInit( get_expression()->build(), designators, maybeConstructed );
         } // if
 

src/Parser/ParseNode.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ParseNode.h -- 
+// ParseNode.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:59:27 2015
-// Update Count     : 174
+// Last Modified On : Thu Jan 07 13:17:46 2016
+// Update Count     : 177
 //
 
@@ -175 +175 @@
   public:
         enum Type { TupleC, Comma, TupleFieldSel,
-                                Cond, NCond, 
-                                SizeOf, AlignOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, 
-                                BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, 
-                                Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, 
+                                Cond, NCond,
+                                SizeOf, AlignOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And,
+                                BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
+                                Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn,
                                 ERAssn, OrAssn, Index, FieldSel, PFieldSel, Range,
                                 UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress,
@@ -307 +307 @@
         ValofExprNode( const ValofExprNode &other );
         ~ValofExprNode();
-  
+
         virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
 
@@ -330 +330 @@
         enum TypeClass { Type, Dtype, Ftype };
 
-        static const char *storageName[];  
+        static const char *storageName[];
         static const char *qualifierName[];
         static const char *basicTypeName[];
@@ -420 +420 @@
 class StatementNode : public ParseNode {
   public:
-        enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru, 
+        enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru,
                                 While, Do,        For,
                                 Goto,  Continue,  Break,   Return,  Throw,
@@ -518 +518 @@
         ExpressionNode *get_designators() const { return designator; }
 
+        InitializerNode *set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
+        bool get_maybeConstructed() const { return maybeConstructed; }
+
         InitializerNode *next_init() const { return kids; }
 
@@ -529 +532 @@
         ExpressionNode *designator; // may be list
         InitializerNode *kids;
+        bool maybeConstructed;
 };
 

src/Parser/parser.cc

@@ -7291 +7291 @@
 /* Line 1806 of yacc.c  */
 #line 1684 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
 

src/Parser/parser.yy

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// cfa.y -- 
-// 
+// cfa.y --
+//
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
@@ -12 +12 @@
 // Last Modified On : Thu Oct  8 17:17:54 2015
 // Update Count     : 1473
-// 
+//
 
 // This grammar is based on the ANSI99/11 C grammar, specifically parts of EXPRESSION and STATEMENTS, and on the C
@@ -1682 +1682 @@
                 { $$ = $2; }
         | ATassign initializer
-                { $$ = $2; }
+                { $$ = $2->set_maybeConstructed( false ); }
         ;