Changeset 5bd0aad for src/SynTree

Timestamp:

Jul 17, 2017, 3:54:08 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

969b3fe

Parents:

e60e0dc (diff), 59e86eb (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:

• Constant.cc (modified) (2 diffs)
• Constant.h (modified) (2 diffs)
• Declaration.h (modified) (4 diffs)

src/SynTree/Constant.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Jun 22 10:11:00 2017
-// Update Count     : 28
+// Last Modified On : Fri Jul 14 14:50:00 2017
+// Update Count     : 29
 //
 
@@ -46 +46 @@
 }
 
+Constant Constant::null( Type * ptrtype ) {
+        if ( nullptr == ptrtype ) {
+                ptrtype = new PointerType(
+                        Type::Qualifiers(),
+                        new VoidType( Type::Qualifiers() )
+                        );
+        }
+
+        return Constant( ptrtype, "0", (unsigned long long int)0 );
+}
+
 unsigned long long Constant::get_ival() const {
         assertf( safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );

src/SynTree/Constant.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Jun 22 10:13:00 2017
-// Update Count     : 15
+// Last Modified On : Fri Jul 14 13:33:00 2017
+// Update Count     : 16
 //
 
@@ -44 +44 @@
         static Constant from_double( double d );
 
+        /// generates a null pointer value for the given type. void * if omitted.
+        static Constant null( Type * ptrtype = nullptr );
+
         virtual void accept( Visitor & v ) { v.visit( this ); }
         virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jun 27 15:31:00 2017
-// Update Count     : 122
+// Last Modified On : Fri Jul 14 16:59:00 2017
+// Update Count     : 123
 //
 
@@ -266 +266 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
+        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
         StructDecl( const StructDecl &other ) : Parent( other ) {}
 
@@ -273 +274 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
+        // Tagged/Tree Structure Excetion
+        bool get_tagged() { return tagged; }
+        void set_tagged( bool newValue ) { tagged = newValue; }
+        bool has_parent() { return parent_name != ""; }
+        std::string get_parentName() { return parent_name; }
+
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -279 +286 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
+
+        bool tagged;
+        std::string parent_name;
 };