Changeset c54b0b4

Timestamp:

Mar 14, 2017, 11:09:16 AM (7 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:

64adb03

Parents:

3ad7978

Message:

Added isMutex qualifier

Location:

src

Files:

• SymTab/Autogen.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Type.h (modified) (5 diffs)
• Tuples/TupleAssignment.cc (modified) (1 diff)
• Tuples/TupleExpansion.cc (modified) (1 diff)

src/SymTab/Autogen.h

@@ -58 +58 @@
                         assert( type );
                         Type * castType = type->clone();
-                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
+                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
                         castType->set_isLvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );

src/SymTab/Validate.cc

@@ -323 +323 @@
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
                 } // for
                 Parent::visit( enumDecl );

src/SynTree/Type.h

@@ -25 +25 @@
   public:
         struct Qualifiers {
-                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ) {}
-                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ) {}
+                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isMutex( false ) {}
+                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isMutex ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isMutex( isMutex ) {}
 
                 Qualifiers &operator&=( const Qualifiers &other );
@@ -45 +45 @@
                 bool isLvalue;
                 bool isAtomic;
+                bool isMutex;
         };
 
@@ -511 +512 @@
         isLvalue &= other.isLvalue;
         isAtomic &= other.isAtomic;
+        isMutex &= other.isMutex;
         return *this;
 }
@@ -520 +522 @@
         isLvalue |= other.isLvalue;
         isAtomic |= other.isAtomic;
+        isMutex |= other.isMutex;
         return *this;
 }
@@ -528 +531 @@
         if ( other.isRestrict ) isRestrict = 0;
         if ( other.isAtomic ) isAtomic = 0;
+        if ( other.isMutex ) isMutex = 0;
         return *this;
 }

src/Tuples/TupleAssignment.cc

@@ -199 +199 @@
                                 Type * type = InitTweak::getPointerBase( castType );
                                 assert( type );
-                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
+                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
                                 type->set_isLvalue( true ); // xxx - might not need this
                                 expr = new CastExpr( expr, castType );

src/Tuples/TupleExpansion.cc

@@ -305 +305 @@
         Type * makeTupleType( const std::list< Expression * > & exprs ) {
                 // produce the TupleType which aggregates the types of the exprs
-                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true) );
+                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true, true) );
                 Type::Qualifiers &qualifiers = tupleType->get_qualifiers();
                 for ( Expression * expr : exprs ) {