Changeset 87b5bf0 for src/Parser/ExpressionNode.cc

Timestamp:

Jun 29, 2016, 2:30:12 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

e64365c

Parents:

7305915 (diff), 2fb2ad5 (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 plg2:software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (6 diffs)

src/Parser/ExpressionNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExpressionNode.cc -- 
-// 
+// ExpressionNode.cc --
+//
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
@@ -12 +12 @@
 // Last Modified On : Mon Jun 13 14:46:17 2016
 // Update Count     : 307
-// 
+//
 
 #include <cassert>
@@ -231 +231 @@
         // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
         value.insert( value.length() - 1, newValue->substr( 1, newValue->length() - 2 ) );
-        
+
         delete newValue;                                                                        // allocated by lexer
         return this;
@@ -347 +347 @@
 
         if ( isArrayIndex ) {
-                // need to traverse entire structure and change any instances of 0 or 1 to 
+                // need to traverse entire structure and change any instances of 0 or 1 to
                 // ConstantExpr
                 DesignatorFixer fixer;
@@ -440 +440 @@
 }
 
-CompositeExprNode::CompositeExprNode( const CompositeExprNode &other ) : ExpressionNode( other ), function( maybeClone( other.function ) ) {
+CompositeExprNode::CompositeExprNode( const CompositeExprNode &other ) : ExpressionNode( other ), function( maybeClone( other.function ) ), arguments( 0 ) {
         ParseNode *cur = other.arguments;
         while ( cur ) {
@@ -608 +608 @@
                 {
                         assert( args.size() == 2 );
-                        
+
                         if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args() ) ) {
                                 NameExpr *member = dynamic_cast<NameExpr *>( args.back() );