Changeset 87b5bf0 for src/Parser

Timestamp:

Jun 29, 2016, 2:30:12 PM (9 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

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (6 diffs)
• ParseNode.h (modified) (3 diffs)
• StatementNode.cc (modified) (10 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() );

src/Parser/ParseNode.h

@@ -28 +28 @@
 //#include "SynTree/Declaration.h"
 #include "Common/UniqueName.h"
+#include "SynTree/Label.h"
 
 class ExpressionNode;
@@ -284 +285 @@
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        const std::list< std::string > &get_labels() const { return labels; };
+        const std::list< Label > &get_labels() const { return labels; };
         void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
   private:
-        std::list< std::string > labels;
+        std::list< Label > labels;
 };
 
@@ -532 +533 @@
         ExpressionNode *output, *input;
         ConstantNode *clobber;
-        std::list<std::string> gotolabels;
+        std::list< Label > gotolabels;
 };
 

src/Parser/StatementNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// StatementNode.cc -- 
+// StatementNode.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -27 +27 @@
 
 const char *StatementNode::StType[] = {
-        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru", 
-        "While", "Do",       "For", 
+        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru",
+        "While", "Do",       "For",
         "Goto",  "Continue", "Break",  "Return",  "Throw",
         "Try",   "Catch",    "Finally", "Asm",
@@ -62 +62 @@
 StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
         this->control = ( t == Default ) ? 0 : control;
-} 
+}
 
 StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {}
@@ -74 +74 @@
 
 StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) {
-        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s ); 
+        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s );
         ret->addDeclaration( d );
         ret->setCatchRest( catchRestP );
@@ -101 +101 @@
 StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
-                labels.push_front( *l ); 
+                labels.push_front( *l );
                 delete l;
         } // if
@@ -156 +156 @@
                         control->print( os, indent );
                         os << endl;
-                } else 
+                } else
                         os << string( indent, ' ' ) << "Null Statement" << endl;
                 break;
@@ -177 +177 @@
                 if ( block ) {
                         os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
-                        block->printList( os, indent + 2 * ParseNode::indent_by );  
+                        block->printList( os, indent + 2 * ParseNode::indent_by );
                 } // if
                 if ( target ) {
@@ -258 +258 @@
           case Fallthru:
                 return new FallthruStmt( labs );
-          case Case: 
+          case Case:
                 return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
@@ -394 +394 @@
                 os << string( indent + ParseNode::indent_by, ' ' ) << "Goto Labels:" << endl;
                 os << string( indent + 2 * ParseNode::indent_by, ' ' );
-                for ( std::list<std::string>::const_iterator i = gotolabels.begin();; ) {
+                for ( std::list<Label>::const_iterator i = gotolabels.begin();; ) {
                         os << *i;
                         i++;
@@ -426 +426 @@
 }
 
-Statement *NullStmtNode::build() const { 
+Statement *NullStmtNode::build() const {
         return new NullStmt;
 }