Changeset d63eeb0 for src/Parser/TypeData.h

Timestamp:

Feb 9, 2016, 3:25:05 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

• src/Parser/TypeData.h (modified) (6 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 Jun 26 23:39:03 2015
-// Update Count     : 16
+// Last Modified On : Thu Jan 14 23:31:15 2016
+// Update Count     : 17
 //
 
@@ -29 +29 @@
         ~TypeData();
         void print( std::ostream &, int indent = 0 ) const;
-        TypeData *clone() const;
+        TypeData * clone() const;
 
-        Type *build() const;
-        FunctionType *buildFunction() const;
+        Type * build() const;
+        FunctionType * buildFunction() const;
 
-        TypeData *base;
+        TypeData * base;
         std::list< DeclarationNode::Qualifier > qualifiers;
-        DeclarationNode *forall;
+        DeclarationNode * forall;
 
         struct Basic_t {
@@ -46 +46 @@
                 DeclarationNode::Aggregate kind;
                 std::string name;
-                DeclarationNode *params;
-                ExpressionNode  *actuals;                                               // holds actual parameters later applied to AggInst
-                DeclarationNode *fields;
+                DeclarationNode * params;
+                ExpressionNode  * actuals;                                              // holds actual parameters later applied to AggInst
+                DeclarationNode * fields;
         };
 
         struct AggInst_t {
-                TypeData *aggregate;
-                ExpressionNode *params;
+                TypeData * aggregate;
+                ExpressionNode * params;
         };
 
         struct Array_t {
-                ExpressionNode *dimension;
+                ExpressionNode * dimension;
                 bool isVarLen;
                 bool isStatic;
@@ -64 +64 @@
         struct Enumeration_t {
                 std::string name;
-                DeclarationNode *constants;
+                DeclarationNode * constants;
         };
 
         struct Function_t {
-                DeclarationNode *params;
-                DeclarationNode *idList;                                                // old-style
-                DeclarationNode *oldDeclList;
-                StatementNode *body;
+                DeclarationNode * params;
+                DeclarationNode * idList;                                               // old-style
+                DeclarationNode * oldDeclList;
+                StatementNode * body;
                 bool hasBody;
                 bool newStyle;
@@ -79 +79 @@
                 std::string name;
                 bool isTypedef;                                                                 // false => TYPEGENname, true => TYPEDEFname
-                DeclarationNode *params;
-                ExpressionNode *actuals;
-                DeclarationNode *assertions;
+                DeclarationNode * params;
+                ExpressionNode * actuals;
+                DeclarationNode * assertions;
         };
 
@@ -87 +87 @@
                 DeclarationNode::TypeClass tyClass;
                 std::string name;
-                DeclarationNode *assertions;
+                DeclarationNode * assertions;
         };
 
         struct Tuple_t {
-                DeclarationNode *members;
+                DeclarationNode * members;
         };
   
         struct Typeof_t {
-                ExpressionNode *expr;
+                ExpressionNode * expr;
         };
 
         struct Attr_t {
                 std::string name;
-                ExpressionNode *expr;
-                DeclarationNode *type;
+                ExpressionNode * expr;
+                DeclarationNode * type;
         };
 
         union {
-                Basic_t *basic;
-                Aggregate_t *aggregate;
-                AggInst_t *aggInst;
-                Array_t *array;
-                Enumeration_t *enumeration;
-                Function_t *function;
-                Symbolic_t *symbolic;
-                Variable_t *variable;
-                Tuple_t *tuple;
-                Typeof_t *typeexpr;
-                Attr_t *attr;
+                Basic_t * basic;
+                Aggregate_t * aggregate;
+                AggInst_t * aggInst;
+                Array_t * array;
+                Enumeration_t * enumeration;
+                Function_t * function;
+                Symbolic_t * symbolic;
+                Variable_t * variable;
+                Tuple_t * tuple;
+                Typeof_t * typeexpr;
+                Attr_t * attr;
         };
 
-        TypeData *extractAggregate( bool toplevel = true ) const;
+        TypeData * extractAggregate( bool toplevel = true ) const;
         // helper function for DeclNodeImpl::build
-        Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer *init = 0 ) const;
+        Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer * init = 0 ) const;
         // helper functions for build()
         Type::Qualifiers buildQualifiers() const;