Changeset a5a71d0 for src/CodeGen

Timestamp:

Apr 6, 2016, 5:11:32 PM (9 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:

eab39cd

Parents:

39786813 (diff), 3aba311 (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 'fix-memory-error' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Makefile.in
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/TypeData.cc
src/Parser/parser.cc
src/Parser/parser.yy
src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc
src/SynTree/Declaration.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/prelude.cf

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• CodeGenerator.h (modified) (3 diffs)
• GenType.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Mar 30 14:39:30 2016
+// Last Modified On : Mon Apr 04 17:08:06 2016
 // Update Count     : 255
 //
@@ -21 +21 @@
 #include "Parser/ParseNode.h"
 
-#include "SynTree/Type.h"
+#include "SynTree/Declaration.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Statement.h"
+#include "SynTree/Type.h"
 
 #include "Common/utility.h"
@@ -170 +171 @@
         }
 
-        void CodeGenerator::visit( ContextDecl *aggregateDecl ) {}
+        void CodeGenerator::visit( TraitDecl *aggregateDecl ) {}
 
         void CodeGenerator::visit( TypedefDecl *typeDecl ) {

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:27:14 2015
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:32:24 2016
+// Update Count     : 28
 //
 
@@ -19 +19 @@
 #include <list>
 
+#include "SynTree/Declaration.h"
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
+
 #include "SymTab/Indexer.h"
 
@@ -38 +40 @@
                 virtual void visit( UnionDecl *aggregateDecl );
                 virtual void visit( EnumDecl *aggregateDecl );
-                virtual void visit( ContextDecl *aggregateDecl );
+                virtual void visit( TraitDecl *aggregateDecl );
                 virtual void visit( TypedefDecl *typeDecl );
                 virtual void visit( TypeDecl *typeDecl );

src/CodeGen/GenType.cc

@@ -19 +19 @@
 #include "GenType.h"
 #include "CodeGenerator.h"
+
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
 #include "SynTree/Visitor.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
 
 namespace CodeGen {
@@ -194 +196 @@
         void GenType::visit( VarArgsType *varArgsType ) {
                 typeString = "__builtin_va_list " + typeString;
-                // don't handle qualifiers, var args pack shouldn't have any
+                handleQualifiers( varArgsType );
         }