Changeset 4520b77e for src/SynTree

Timestamp:

Sep 20, 2022, 8:37:05 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

a065f1f

Parents:

d489da8 (diff), 12df6fe (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 to Master Sept 19

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• Expression.h (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -145 +145 @@
         virtual void printShort( std::ostream & os, Indenter indent = {} ) const override;
 
-        // TODO: Move to the right place
         void checkAssignedValue() const;
 };
@@ -338 +337 @@
         typedef AggregateDecl Parent;
   public:
+        bool isTyped;
+        Type * base;
+
         EnumDecl( const std::string & name,
          const std::list< Attribute * > & attributes = std::list< class Attribute * >(),
-          LinkageSpec::Spec linkage = LinkageSpec::Cforall,
-          Type * baseType = nullptr ) : Parent( name, attributes, linkage ) , base( baseType ){}
-        EnumDecl( const EnumDecl & other ) : Parent( other ), base( other.base ) {}
-
+          bool isTyped = false, LinkageSpec::Spec linkage = LinkageSpec::Cforall,
+          Type * baseType = nullptr ) 
+          : Parent( name, attributes, linkage ),isTyped(isTyped), base( baseType ) {}
+        EnumDecl( const EnumDecl & other ) 
+          : Parent( other ), isTyped( other.isTyped), base( other.base ) {}
         bool valueOf( Declaration * enumerator, long long int & value );
-
         virtual EnumDecl * clone() const override { return new EnumDecl( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
         virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
-        Type * base;
-        std::unordered_map< std::string, long long int > enumValues;
+
+        std::unordered_map< std::string, long long int > enumValues; // This attribute is unused
         virtual void print( std::ostream & os, Indenter indent = {} ) const override final;
   private:

src/SynTree/Expression.h

@@ -163 +163 @@
 };
 
+// [Qualifier].name; Qualifier is the type_name from the parser
+class QualifiedNameExpr : public Expression {
+  public:
+        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 var;
+                delete type_decl;
+        }
+
+        virtual QualifiedNameExpr * clone() const override {
+                return new QualifiedNameExpr( * this );
+        }
+        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_decl->print( os, indent );
+                os << name << std::endl;
+        }
+};
+
 /// VariableExpr represents an expression that simply refers to the value of a named variable.
 /// Does not take ownership of var.

src/SynTree/Mutator.h

@@ -98 +98 @@
         virtual Expression * mutate( DefaultArgExpr * argExpr ) = 0;
         virtual Expression * mutate( GenericExpr * genExpr ) = 0;
+        virtual Expression * mutate( QualifiedNameExpr * qualifiedNameExpr ) = 0;
 
         virtual Type * mutate( VoidType * basicType ) = 0;

src/SynTree/SynTree.h

@@ -103 +103 @@
 class DefaultArgExpr;
 class GenericExpr;
+class QualifiedNameExpr;
 
 class Type;

src/SynTree/Type.h

@@ -345 +345 @@
         Type * parent;
         Type * child;
-
         QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child );
         QualifiedType( const QualifiedType & tq );

src/SynTree/Visitor.h

@@ -101 +101 @@
         virtual void visit( NameExpr * node ) { visit( const_cast<const NameExpr *>(node) ); }
         virtual void visit( const NameExpr * nameExpr ) = 0;
+        virtual void visit( QualifiedNameExpr * node ) { visit( const_cast<const QualifiedNameExpr*>(node) );}
+        virtual void visit( const QualifiedNameExpr* qualifiednameExpr ) = 0;
         virtual void visit( CastExpr * node ) { visit( const_cast<const CastExpr *>(node) ); }
         virtual void visit( const CastExpr * castExpr ) = 0;