Changeset dbc733e for src/SynTree

Timestamp:

Sep 1, 2017, 9:53:19 PM (8 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:

f43df73

Parents:

ba2a68b (diff), b0dfbc4 (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/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• Expression.h (modified) (2 diffs)
• Mutator.cc (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• Visitor.cc (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -70 +70 @@
 }
 
+LabelAddressExpr::LabelAddressExpr( const Label &arg ) : arg( arg ) {
+        // label address always has type void *
+        result = new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) );
+}
+LabelAddressExpr::LabelAddressExpr( const LabelAddressExpr & other ) : Expression( other ), arg( other.arg ) {}
+LabelAddressExpr::~LabelAddressExpr() {}
+
+void LabelAddressExpr::print( std::ostream & os, int indent ) const {
+        os << "Address of label:" << std::endl << std::string( indent+2, ' ' ) << arg;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Expression.h

@@ -24 +24 @@
 #include "Constant.h"             // for Constant
 #include "Initializer.h"          // for Designation (ptr only), Initializer
+#include "Label.h"                // for Label
 #include "Mutator.h"              // for Mutator
 #include "SynTree.h"              // for UniqueId
@@ -173 +174 @@
 };
 
-// xxx - this doesn't appear to actually be hooked in anywhere. We should use this instead of the "&&"" UntypedExpr hack
+// GCC &&label
+// https://gcc.gnu.org/onlinedocs/gcc-3.4.2/gcc/Labels-as-Values.html
 class LabelAddressExpr : public Expression {
   public:
-        Expression * arg;
-
-        LabelAddressExpr( Expression * arg );
+        Label arg;
+
+        LabelAddressExpr( const Label &arg );
         LabelAddressExpr( const LabelAddressExpr & other );
         virtual ~LabelAddressExpr();
-
-        Expression * get_arg() const { return arg; }
-        void set_arg(Expression * newValue ) { arg = newValue; }
 
         virtual LabelAddressExpr * clone() const { return new LabelAddressExpr( * this ); }

src/SynTree/Mutator.cc

@@ -246 +246 @@
         labelAddressExpr->set_env( maybeMutate( labelAddressExpr->get_env(), *this ) );
         labelAddressExpr->set_result( maybeMutate( labelAddressExpr->get_result(), *this ) );
-        labelAddressExpr->set_arg( maybeMutate( labelAddressExpr->get_arg(), *this ) );
         return labelAddressExpr;
 }

src/SynTree/Statement.cc

@@ -89 +89 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
+        Statement( labels ), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.empty() )
+        if ( type == BranchStmt::Goto && target.empty() ) {
                 throw SemanticError("goto without target");
+        }
 }
 
 BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
         Statement( labels ), computedTarget( computedTarget ), type( type ) {
-        if ( type != BranchStmt::Goto || computedTarget == 0 )
+        if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
                 throw SemanticError("Computed target not valid in branch statement");
+        }
 }
 
 void BranchStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
+        if ( target != "" ) os << string( indent+2, ' ' ) << "with target: " << target << endl;
+        if ( originalTarget != "" ) os << string( indent+2, ' ' ) << "with original target: " << originalTarget << endl;
+        if ( computedTarget != nullptr ) os << string( indent+2, ' ' ) << "with computed target: " << computedTarget << endl;
 }
 

src/SynTree/Visitor.cc

@@ -205 +205 @@
 void Visitor::visit( LabelAddressExpr *labAddressExpr ) {
         maybeAccept( labAddressExpr->get_result(), *this );
-        maybeAccept( labAddressExpr->get_arg(), *this );
 }