Changeset f855545

Timestamp:

Nov 2, 2018, 7:46:19 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c45b304

Parents:

30ee9ef

Message:

more basetypeof changes

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (8 diffs)
• TypeData.h (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 20 14:56:54 2018
-// Update Count     : 1107
+// Last Modified On : Thu Nov  1 20:54:26 2018
+// Update Count     : 1108
 //
 
@@ -402 +402 @@
 }
 
-DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Typeof );
+DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr, bool basetypeof ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( basetypeof ? TypeData::Basetypeof : TypeData::Typeof );
         newnode->type->typeexpr = expr;
         return newnode;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  4 09:39:40 2018
-// Update Count     : 853
+// Last Modified On : Thu Nov  1 20:54:53 2018
+// Update Count     : 854
 //
 
@@ -249 +249 @@
         static DeclarationNode * newBitfield( ExpressionNode * size );
         static DeclarationNode * newTuple( DeclarationNode * members );
-        static DeclarationNode * newTypeof( ExpressionNode * expr );
+        static DeclarationNode * newTypeof( ExpressionNode * expr, bool basetypeof = false );
         static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
         static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 20 14:39:31 2018
-// Update Count     : 622
+// Last Modified On : Thu Nov  1 20:56:14 2018
+// Update Count     : 623
 //
 
@@ -96 +96 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 // typeexpr = new Typeof_t;
                 typeexpr = nullptr;
@@ -166 +167 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 // delete typeexpr->expr;
                 delete typeexpr;
@@ -245 +247 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
                 break;
@@ -419 +422 @@
                 } // if
                 break;
+          case Basetypeof:
+                os << "base-";
+                __attribute__((fallthrough));
           case Typeof:
                 os << "type-of expression ";
@@ -457 +463 @@
           case Tuple:
           case Typeof:
+          case Basetypeof:
           case Builtin:
                 assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
@@ -535 +542 @@
                 return buildTuple( td );
           case TypeData::Typeof:
+          case TypeData::Basetypeof:
                 return buildTypeof( td );
           case TypeData::Builtin:
@@ -929 +937 @@
 
 TypeofType * buildTypeof( const TypeData * td ) {
-        assert( td->kind == TypeData::Typeof );
+        assert( td->kind == TypeData::Typeof || td->kind == TypeData::Basetypeof );
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
-        return new TypeofType( buildQualifiers( td ), td->typeexpr->build() );
+        return new TypeofType( td->kind == TypeData::Basetypeof ? Type::Qualifiers{} : buildQualifiers( td ), td->typeexpr->build() );
 } // buildTypeof
 

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 20 13:56:40 2018
-// Update Count     : 195
+// Last Modified On : Thu Nov  1 20:56:46 2018
+// Update Count     : 196
 //
 
@@ -27 +27 @@
 struct TypeData {
         enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
+                                SymbolicInst, Tuple, Typeof, Basetypeof, Builtin, GlobalScope, Qualified, Unknown };
 
         struct Aggregate_t {