Changeset 168c007 for src/SynTree

Timestamp:

Mar 21, 2017, 12:50:27 PM (7 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:

da6d4566, f5392c1

Parents:

94a8123 (diff), e04b636 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• Type.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:34:11 2017
-// Update Count     : 118
+// Last Modified On : Fri Mar 17 16:05:08 2017
+// Update Count     : 121
 //
 
@@ -255 +255 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ), kind( kind ) {}
         StructDecl( const StructDecl &other ) : Parent( other ) {}
 
+        bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
+        bool is_monitor() { return kind == DeclarationNode::Monitor; }
+        bool is_thread() { return kind == DeclarationNode::Thread; }
+
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
   private:
+        DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
 };

src/SynTree/Type.h

@@ -117 +117 @@
                 bool operator!=( Qualifiers other ) const { return (val & Mask) != (other.val & Mask); }
                 bool operator<=( Qualifiers other ) const {
-                        return is_const <= other.is_const && is_volatile <= other.is_volatile &&
-                                is_mutex >= other.is_mutex && is_atomic == other.is_atomic;
+                        return is_const    <= other.is_const        //Any non-const converts to const without cost
+                                        && is_volatile <= other.is_volatile     //Any non-volatile converts to volatile without cost
+                                        && is_mutex    >= other.is_mutex        //Any mutex converts to non-mutex without cost
+                                        && is_atomic   == other.is_atomic;      //No conversion from atomic to non atomic is free
                 }
                 bool operator<( Qualifiers other ) const { return *this != other && *this <= other; }