Changeset 90152a4 for src/Parser/TypeData.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/Parser/TypeData.h (modified) (9 diffs)

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 Sep  1 23:33:45 2017
-// Update Count     : 190
+// Last Modified On : Fri Jul 20 13:56:40 2018
+// Update Count     : 195
 //
 
@@ -26 +26 @@
 
 struct TypeData {
-        enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Typeof, Builtin, Unknown };
+        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
+                                SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
 
         struct Aggregate_t {
@@ -36 +36 @@
                 DeclarationNode * fields;
                 bool body;
+                bool anon;
 
                 bool tagged;
@@ -57 +58 @@
                 DeclarationNode * constants;
                 bool body;
+                bool anon;
         };
 
@@ -64 +66 @@
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
-                bool newStyle;
+                ExpressionNode * withExprs;                                             // expressions from function's with_clause
         };
 
@@ -74 +76 @@
                 DeclarationNode * assertions;
         };
+
+        struct Qualified_t {                                                            // qualified type S.T
+                TypeData * parent;
+                TypeData * child;
+        };
+
+        CodeLocation location;
 
         Kind kind;
@@ -86 +95 @@
         DeclarationNode * forall;
 
-        // Basic_t basic;
         Aggregate_t aggregate;
         AggInst_t aggInst;
         Array_t array;
         Enumeration_t enumeration;
-        // Variable_t variable;
         Function_t function;
         Symbolic_t symbolic;
+        Qualified_t qualified;
         DeclarationNode * tuple;
         ExpressionNode * typeexpr;
@@ -101 +109 @@
         void print( std::ostream &, int indent = 0 ) const;
         TypeData * clone() const;
+
+        const std::string * leafName() const;
 };
 
@@ -118 +128 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName,
+                                                 Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );