Changes in src/SynTree/Expression.h [871cdb4:e612146c]

File:

• src/SynTree/Expression.h (modified) (7 diffs)

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  8 11:54:00 2017
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 19:23:46 2017
+// Update Count     : 48
 //
+
 #pragma once
 
@@ -24 +25 @@
 #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
@@ -84 +86 @@
   public:
         Expression * function;
-        std::list<Expression *> args;
-        InferredParams inferParams;
 
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
@@ -100 +100 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+
+  private:
+        std::list<Expression *> args;
+        InferredParams inferParams;
 };
 
@@ -171 +175 @@
 };
 
-// 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 ); }
@@ -538 +540 @@
   public:
         Expression * inout;
-        ConstantExpr * constraint;
+        Expression * constraint;
         Expression * operand;
 
-        AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
         AsmExpr( const AsmExpr & other );
         virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
@@ -548 +550 @@
         void set_inout( Expression * newValue ) { inout = newValue; }
 
-        ConstantExpr * get_constraint() const { return constraint; }
-        void set_constraint( ConstantExpr * newValue ) { constraint = newValue; }
+        Expression * get_constraint() const { return constraint; }
+        void set_constraint( Expression * newValue ) { constraint = newValue; }
 
         Expression * get_operand() const { return operand; }