Changeset a5a71d0 for src/Parser/TypeData.cc

Timestamp:

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

File:

• src/Parser/TypeData.cc (modified) (10 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jan 14 10:43:42 2016
-// Update Count     : 36
+// Last Modified On : Wed Apr 06 16:57:53 2016
+// Update Count     : 49
 //
 
@@ -23 +23 @@
 #include "SynTree/Expression.h"
 #include "SynTree/Statement.h"
+#include "SynTree/Initializer.h"
 
 TypeData::TypeData( Kind k ) : kind( k ), base( 0 ), forall( 0 ) {
@@ -84 +85 @@
                 typeexpr->expr = 0;
                 break;
+          case Builtin:
+                builtin = new Builtin_t;
+                break;
           case Attr:
                 attr = new Attr_t;
@@ -149 +153 @@
                 delete typeexpr->expr;
                 delete typeexpr;
+                break;
+          case Builtin:
+                delete builtin;
                 break;
           case Attr:
@@ -221 +228 @@
                 newtype->typeexpr->expr = maybeClone( typeexpr->expr );
                 break;
+          case Builtin:
+                newtype->builtin->type = builtin->type;
+                break;
           case Attr:
                 newtype->attr->expr = maybeClone( attr->expr );
@@ -396 +406 @@
                         attr->type->print( os, indent + 2 );
                 } // if
+                break;
+          case Builtin:
+                os << "gcc builtin type";
                 break;
           default:
@@ -524 +537 @@
           case Typeof:
                 return buildTypeof();
+          case Builtin:
+                return new VarArgsType( buildQualifiers() );
           case Attr:
                 return buildAttr();
@@ -823 +838 @@
                 buildForall( aggregate->params, at->get_parameters() );
                 break;
-          case DeclarationNode::Context:
-                at = new ContextDecl( aggregate->name );
+          case DeclarationNode::Trait:
+                at = new TraitDecl( aggregate->name );
                 buildList( aggregate->params, at->get_parameters() );
                 break;
@@ -863 +878 @@
                         ret = new UnionInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
                         break;
-                  case DeclarationNode::Context:
-                        ret = new ContextInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
+                  case DeclarationNode::Trait:
+                        ret = new TraitInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
                         break;
                   default:
@@ -901 +916 @@
         EnumDecl *ret = new EnumDecl( enumeration->name );
         buildList( enumeration->constants, ret->get_members() );
+        std::list< Declaration * >::iterator members = ret->get_members().begin();
+        for ( const DeclarationNode *cur = enumeration->constants; cur != NULL; cur = dynamic_cast<DeclarationNode *>( cur->get_link() ), ++members ) {
+                if ( cur->get_enumeratorValue() != NULL ) {
+                        ObjectDecl *member = dynamic_cast<ObjectDecl *>(*members);
+                        member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
+                } // if
+        } // for
         return ret;
 }