Changeset ce8c12f for src/SynTree

Timestamp:

May 15, 2017, 11:30:26 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

d36c117

Parents:

65aca88

Message:

initial work on references: reference types passed through the system, very simple examples work

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• ReferenceType.cc (added)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (2 diffs)
• Visitor.cc (modified) (2 diffs)
• Visitor.h (modified) (2 diffs)
• module.mk (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -20 +20 @@
 AddressExpr::AddressExpr( Expression *arg, Expression *_aname ) : Expression( _aname ), arg( arg ) {
         if ( arg->has_result() ) {
-                set_result( new PointerType( Type::Qualifiers(), arg->get_result()->clone() ) );
+                if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( arg->get_result() ) ) {
+                        // xxx - very temporary, make &ref look like **
+                        set_result( new PointerType( Type::Qualifiers( Type::Lvalue ), refType->get_base()->clone() ) );
+                } else {
+                        set_result( new PointerType( Type::Qualifiers(), arg->get_result()->clone() ) );
+                }
         }
 }

src/SynTree/Mutator.cc

@@ -462 +462 @@
 }
 
+Type *Mutator::mutate( ReferenceType *refType ) {
+        mutateAll( refType->get_forall(), *this );
+        refType->set_base( maybeMutate( refType->get_base(), *this ) );
+        return refType;
+}
+
 Type *Mutator::mutate( FunctionType *functionType ) {
         mutateAll( functionType->get_forall(), *this );

src/SynTree/Mutator.h

@@ -91 +91 @@
         virtual Type* mutate( PointerType *pointerType );
         virtual Type* mutate( ArrayType *arrayType );
+        virtual Type* mutate( ReferenceType *refType );
         virtual Type* mutate( FunctionType *functionType );
         virtual Type* mutate( StructInstType *aggregateUseType );

src/SynTree/SynTree.h

@@ -99 +99 @@
 class PointerType;
 class ArrayType;
+class ReferenceType;
 class FunctionType;
 class ReferenceToType;

src/SynTree/Type.h

@@ -249 +249 @@
         bool is_array() const { return isStatic || isVarLen || dimension; }
 
+        virtual bool isComplete() const { return ! isVarLen; }
+
         virtual PointerType *clone() const { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }
@@ -290 +292 @@
 };
 
+class ReferenceType : public Type {
+public:
+        ReferenceType( const Type::Qualifiers & tq, Type *base, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        ReferenceType( const ReferenceType & );
+        virtual ~ReferenceType();
+
+        Type *get_base() { return base; }
+        void set_base( Type *newValue ) { base = newValue; }
+
+        virtual ReferenceType *clone() const { return new ReferenceType( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
+        Type *base;
+        unsigned int level = 0;
+};
+
 class FunctionType : public Type {
   public:

src/SynTree/Visitor.cc

@@ -354 +354 @@
 void Visitor::visit( PointerType *pointerType ) {
         acceptAll( pointerType->get_forall(), *this );
+        // xxx - should PointerType visit/mutate dimension?
         maybeAccept( pointerType->get_base(), *this );
 }
@@ -361 +362 @@
         maybeAccept( arrayType->get_dimension(), *this );
         maybeAccept( arrayType->get_base(), *this );
+}
+
+void Visitor::visit( ReferenceType *refType ) {
+        acceptAll( refType->get_forall(), *this );
+        maybeAccept( refType->get_base(), *this );
 }
 

src/SynTree/Visitor.h

@@ -94 +94 @@
         virtual void visit( PointerType *pointerType );
         virtual void visit( ArrayType *arrayType );
+        virtual void visit( ReferenceType *refType );
         virtual void visit( FunctionType *functionType );
         virtual void visit( StructInstType *aggregateUseType );
@@ -163 +164 @@
                         } // if
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );                       
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try

src/SynTree/module.mk

@@ -20 +20 @@
        SynTree/PointerType.cc \
        SynTree/ArrayType.cc \
+       SynTree/ReferenceType.cc \
        SynTree/FunctionType.cc \
        SynTree/ReferenceToType.cc \