Changeset b0d9ff7 for src/SynTree/Expression.h

Timestamp:

Sep 1, 2022, 1:27:52 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

12df6fe

Parents:

def751f

Message:

Fix up the QualifiedNameExpr?. It should now work on both old AST and new AST. There are some known bugs to fix so make all-tests will fail.

File:

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

src/SynTree/Expression.h

@@ -166 +166 @@
 class QualifiedNameExpr : public Expression {
   public:
-        Type * type; // Convert to [parent] QualifiedNameExpr
-        std::string name; // Convert from NameExpr
-
-        QualifiedNameExpr( Type * type, std::string name): 
-                Expression(), type(type), name(name) {
-                std::cout << "Making QualifiedNameExpr" << std::endl;
-                print( std::cout );
-        }
-        QualifiedNameExpr( const QualifiedNameExpr & other): Expression(other), type(other.type), name(other.name) {
-
-        }
+        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; }
+
         virtual ~QualifiedNameExpr() {
-                delete type;
+                delete var;
+                delete type_decl;
         }
 
@@ -184 +183 @@
                 return new QualifiedNameExpr( * this );
         }
-        virtual void accept( Visitor & v ) override { (void)v; }
-        virtual void accept( Visitor & v ) const override { (void)v; }
-        virtual Expression * acceptMutator( Mutator & m ) override { (void) m;return nullptr; }
+        virtual void accept( Visitor & v ) override { v.visit(this); }
+        virtual void accept( Visitor & v ) const override { v.visit(this); }
+        virtual Expression * acceptMutator( Mutator & m ) override { 
+                return m.mutate( this ); 
+        }
+        
         virtual void print( std::ostream & os, Indenter indent = {} ) const override {
-                type->print( os, indent );
-                std::cout << name << std::endl;
+                type_decl->print( os, indent );
+                os << name << std::endl;
         }
 };