Changes in src/Parser/TypeData.cc [4cc4286:4040425]

File:

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

src/Parser/TypeData.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeData.cc --
+// TypeData.cc -- 
 //
 // Author           : Rodolfo G. Esteves
 // 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 By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:26:45 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 );
@@ -397 +407 @@
                 } // if
                 break;
+          case Builtin:
+                os << "gcc builtin type";
+                break;
           default:
                 os << "internal error: TypeData::print " << kind  << endl;
@@ -436 +449 @@
         for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) {
                 if ( (*i)->get_kind() == TypeDecl::Any ) {
-                        // add assertion parameters to `type' tyvars in reverse order
-                        // add dtor:  void ^?{}(T *)
-                        FunctionType *dtorType = new FunctionType( Type::Qualifiers(), false );
-                        dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) );
-
-                        // add copy ctor:  void ?{}(T *, T)
-                        FunctionType *copyCtorType = new FunctionType( Type::Qualifiers(), false );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) );
-
-                        // add default ctor:  void ?{}(T *)
-                        FunctionType *ctorType = new FunctionType( Type::Qualifiers(), false );
-                        ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) );
-
-                        // add assignment operator:  T * ?=?(T *, T)
                         FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
                         assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
@@ -524 +519 @@
           case Typeof:
                 return buildTypeof();
+          case Builtin:
+                return new VarArgsType( buildQualifiers() );
           case Attr:
                 return buildAttr();
@@ -823 +820 @@
                 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 +860 @@
                         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 +898 @@
         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() ) ) );
+                } // if
+        } // for
         return ret;
 }