Changeset fc4a0fa for src/Parser/TypeData.h

Timestamp:

Sep 15, 2016, 3:45:32 PM (8 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:

12bc63a, 24bc651, 89e6ffc

Parents:

1eba452 (diff), 101e0bd (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

Conflicts:

src/Parser/parser.cc

File:

• src/Parser/TypeData.h (modified) (3 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 : Sat Sep 10 09:42:54 2016
-// Update Count     : 118
+// Last Modified On : Mon Sep 12 17:15:49 2016
+// Update Count     : 129
 //
 
@@ -25 +25 @@
         enum Kind { Unknown, Basic, Pointer, Array, Function, Aggregate, AggregateInst,
                                 Enum, EnumConstant, Symbolic, SymbolicInst, Variable, Tuple, Typeof, Builtin, Attr };
-
-        struct Basic_t {
-                std::list< DeclarationNode::BasicType > typeSpec;
-                std::list< DeclarationNode::Modifier > modifiers;
-        };
 
         struct Aggregate_t {
@@ -73 +68 @@
         };
 
-        // struct Tuple_t {
-        //      DeclarationNode * members;
-        // };
-  
-        // struct Typeof_t {
-        //      ExpressionNode * expr;
-        // };
-
-        // struct Builtin_t {
-        //      DeclarationNode::BuiltinType type;
-        // };
-
         Kind kind;
         TypeData * base;
-        typedef std::bitset< DeclarationNode::NoOfQualifier > Qualifiers;
+        DeclarationNode::BasicType basictype = DeclarationNode::NoBasicType;
+        DeclarationNode::ComplexType complextype = DeclarationNode::NoComplexType;
+        DeclarationNode::Signedness signedness = DeclarationNode::NoSignedness;
+        DeclarationNode::Length length = DeclarationNode::NoLength;
+        typedef std::bitset< DeclarationNode::NoQualifier > Qualifiers;
         Qualifiers qualifiers;
-        typedef std::bitset< DeclarationNode::NoStorageClass > StorageClasses;
-        StorageClasses storageclasses;
         DeclarationNode * forall;
 
-                Basic_t basic;
+                // Basic_t basic;
                 Aggregate_t aggregate;
                 AggInst_t aggInst;