Changeset d191e24 for src/SynTree

Timestamp:

Oct 19, 2022, 5:29:12 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

bc899d6

Parents:

82ff4ed1 (diff), 058ece2 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• Declaration.h (modified) (1 diff)
• Expression.h (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -50 +50 @@
                                 set_result( addrType( refType->base ) );
                         } else {
+                                if(!arg->result->location.isSet()) arg->result->location = arg->location;
                                 SemanticError( arg->result, "Attempt to take address of non-lvalue expression: " );
                         } // if

src/SynTree/Declaration.h

@@ -121 +121 @@
         Initializer * init;
         Expression * bitfieldWidth;
+        bool enumInLine = false;
 
         ObjectDecl( const std::string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression * bitfieldWidth, Type * type, Initializer * init,

src/SynTree/Expression.h

@@ -168 +168 @@
         Declaration * type_decl;
         std::string name;
-        DeclarationWithType * var;
 
         QualifiedNameExpr( Declaration * decl, std::string name): Expression(), type_decl(decl), name(name) {}
-        QualifiedNameExpr( const QualifiedNameExpr & other): Expression(other), type_decl(other.type_decl), name(other.name), var(other.var) {}
-        DeclarationWithType * get_var() const { return var; }
-        void set_var( DeclarationWithType * newValue ) { var = newValue; }
+        QualifiedNameExpr( const QualifiedNameExpr & other): Expression(other), type_decl(other.type_decl), name(other.name) {}
 
         virtual ~QualifiedNameExpr() {
-                delete var;
                 delete type_decl;
         }