Changes in / [f6ed7fd:4b5857f]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• ControlStruct/LabelFixer.cc (modified) (5 diffs)
• ControlStruct/LabelFixer.h (modified) (3 diffs)
• ControlStruct/LabelGenerator.cc (modified) (2 diffs)
• ControlStruct/MLEMutator.h (modified) (4 diffs)
• GenPoly/Specialize.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/StatementNode.cc (modified) (10 diffs)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Autogen.h (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -806 +806 @@
 
                 for ( std::list< Label >::iterator i = l.begin(); i != l.end(); i++ )
-                        str += *i + ": ";
+                        str += (*i).get_name() + ": ";
 
                 return str;

src/ControlStruct/LabelFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc -- 
+// LabelFixer.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -86 +86 @@
 
 
-        // sets the definition of the labelTable entry to be the provided 
+        // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -101 +101 @@
                         } else if ( labelTable[ *i ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + *i );
+                                throw SemanticError( "Duplicate definition of label: " + (*i).get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
@@ -109 +109 @@
                 } // for
 
-                // produce one of the labels attached to this statement to be 
+                // produce one of the labels attached to this statement to be
                 // temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
@@ -130 +130 @@
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( "Use of undefined label: " + i->first );
+                                throw SemanticError( "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();

src/ControlStruct/LabelFixer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.h -- 
+// LabelFixer.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -20 +20 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
+#include "SynTree/Label.h"
 #include "LabelGenerator.h"
-
 #include <map>
 
@@ -74 +74 @@
 
                   private:
-                        Label label;  
+                        Label label;
                         Statement *definition;
                 };
-                  
+
                 std::map < Label, Entry *> labelTable;
                 LabelGenerator *generator;

src/ControlStruct/LabelGenerator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelGenerator.cc -- 
+// LabelGenerator.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -18 +18 @@
 
 #include "LabelGenerator.h"
+#include "SynTree/Label.h"
 
 namespace ControlStruct {

src/ControlStruct/MLEMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.h -- 
+// MLEMutator.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -23 +23 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Label.h"
 
 #include "LabelGenerator.h"
@@ -38 +39 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
-                Statement *mutate( CaseStmt *caseStmt ); 
+                Statement *mutate( CaseStmt *caseStmt );
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -79 +80 @@
                 Statement *handleLoopStmt( LoopClass *loopStmt );
 
-                template< typename SwitchClass > 
+                template< typename SwitchClass >
                 Statement *handleSwitchStmt( SwitchClass *switchStmt );
 

src/GenPoly/Specialize.cc

@@ -99 +99 @@
                 } // if
                 // create new thunk with same signature as formal type (C linkage, empty body)
-                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( std::list< std::string >() ), false, false );
+                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( noLabels ), false, false );
                 thunkFunc->fixUniqueId();
 

src/InitTweak/FixInit.cc

@@ -281 +281 @@
                 PRINT( std::cerr << "Coming out the back..." << impCpCtorExpr << std::endl; )
 
-                // xxx - some of these aren't necessary, and can be removed once this is stable
+                // detach fields from wrapper node so that it can be deleted without deleting too much
                 dtors.clear();
                 tempDecls.clear();

src/InitTweak/InitTweak.cc

@@ -115 +115 @@
 
         namespace {
-                template<typename CallExpr>
-                std::string funcName( CallExpr * expr ) {
-                        Expression * func = expr->get_function();
+                std::string funcName( Expression * func ) {
                         if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( func ) ) {
                                 return nameExpr->get_name();
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( func ) ) {
                                 return varExpr->get_var()->get_name();
+                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( func ) ) {
+                                return funcName( castExpr->get_arg() );
                         } else {
                                 assert( false && "Unexpected expression type being called as a function in call expression" );
@@ -130 +130 @@
         std::string getFunctionName( Expression * expr ) {
                 if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
-                        return funcName( appExpr );
+                        return funcName( appExpr->get_function() );
                 } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * > ( expr ) ) {
-                        return funcName( untypedExpr );
+                        return funcName( untypedExpr->get_function() );
                 } else {
+                        std::cerr << expr << std::endl;
                         assert( false && "Unexpected expression type passed to getFunctionName" );
                 }

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;
 };
 
@@ -524 +525 @@
         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;
 }

src/SymTab/Autogen.cc

@@ -482 +482 @@
                 ObjectDecl *dst = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), typeInst->clone() ), 0 );
                 if ( typeDecl->get_base() ) {
+                        // xxx - generate ctor/dtors for typedecls, e.g.
+                        // otype T = int *;
                         stmts = new CompoundStmt( std::list< Label >() );
                         UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );

src/SymTab/Autogen.h

@@ -24 +24 @@
 
 namespace SymTab {
-  static const std::list< std::string > noLabels;
-
   /// Generates assignment operators, constructors, and destructor for aggregate types as required
   void autogenerateRoutines( std::list< Declaration * > &translationUnit );

src/SynTree/Statement.cc

@@ -87 +87 @@
         Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.size() == 0 )
+        if ( type == BranchStmt::Goto && target.empty() )
                 throw SemanticError("goto without target");
 }

src/SynTree/Statement.h

@@ -22 +22 @@
 #include "Common/SemanticError.h"
 #include "Type.h"
+#include "Label.h"
 
 class Statement {

src/SynTree/SynTree.h

@@ -113 +113 @@
 class Constant;
 
-typedef std::string Label;
+// typedef std::string Label;
+class Label;
 typedef unsigned int UniqueId;