Changeset 777ed2b for src/Parser/TypeData.h

Timestamp:

Jul 11, 2018, 11:55:59 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

File:

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

src/Parser/TypeData.h

@@ -27 +27 @@
 struct TypeData {
         enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Typeof, Builtin, Unknown };
+                                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;
         };
 
@@ -75 +77 @@
         };
 
+        struct Qualified_t { // qualified type S.T
+                TypeData * parent;
+                TypeData * child;
+        };
+
         CodeLocation location;
 
@@ -88 +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;
@@ -103 +109 @@
         void print( std::ostream &, int indent = 0 ) const;
         TypeData * clone() const;
+
+        const std::string * leafName() const;
 };