Changeset 59db689 for src/Parser/DeclarationNode.cc

Timestamp:

Jun 6, 2015, 11:38:58 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

cd623a4

Parents:

a65d92e

Message:

constant types, first attempt

File:

• src/Parser/DeclarationNode.cc (modified) (19 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  3 11:54:32 2015
-// Update Count     : 14
+// Last Modified On : Sat Jun  6 23:29:13 2015
+// Update Count     : 23
 //
 
@@ -74 +74 @@
 
 void DeclarationNode::print( std::ostream &os, int indent ) const {
-        os << string(indent, ' ' );
+        os << string( indent, ' ' );
         if ( name == "" ) {
                 os << "unnamed: ";
@@ -93 +93 @@
 
         if ( bitfieldWidth ) {
-                os << endl << string(indent+2,  ' ') << "with bitfield width ";
+                os << endl << string( indent + 2, ' ' ) << "with bitfield width ";
                 bitfieldWidth->printOneLine( os );
         }
 
         if ( initializer != 0 ) {
-                os << endl << string(indent+2,  ' ') << "with initializer ";
+                os << endl << string( indent + 2, ' ' ) << "with initializer ";
                 initializer->printOneLine( os );
         }
@@ -161 +161 @@
 }
 
-DeclarationNode *DeclarationNode::newForall( DeclarationNode* forall ) {
+DeclarationNode *DeclarationNode::newForall( DeclarationNode *forall ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Unknown );
@@ -168 +168 @@
 }
 
-DeclarationNode *DeclarationNode::newFromTypedef( std::string* name ) {
+DeclarationNode *DeclarationNode::newFromTypedef( std::string *name ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::SymbolicInst );
@@ -177 +177 @@
 }
 
-DeclarationNode *DeclarationNode::newAggregate( TyCon kind, std::string* name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields ) {
+DeclarationNode *DeclarationNode::newAggregate( TyCon kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
@@ -203 +203 @@
 }
 
-DeclarationNode *DeclarationNode::newEnumConstant( std::string* name, ExpressionNode *constant ) {
+DeclarationNode *DeclarationNode::newEnumConstant( std::string *name, ExpressionNode *constant ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
@@ -210 +210 @@
 }
 
-DeclarationNode *DeclarationNode::newName( std::string* name ) {
+DeclarationNode *DeclarationNode::newName( std::string *name ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
@@ -216 +216 @@
 }
 
-DeclarationNode *DeclarationNode::newFromTypeGen( std::string* name, ExpressionNode *params ) {
+DeclarationNode *DeclarationNode::newFromTypeGen( std::string *name, ExpressionNode *params ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::SymbolicInst );
@@ -225 +225 @@
 }
 
-DeclarationNode *DeclarationNode::newTypeParam( TypeClass tc, std::string* name ) {
+DeclarationNode *DeclarationNode::newTypeParam( TypeClass tc, std::string *name ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
@@ -467 +467 @@
 }
 
-DeclarationNode *DeclarationNode::addAssertions( DeclarationNode* assertions ) {
+DeclarationNode *DeclarationNode::addAssertions( DeclarationNode *assertions ) {
         assert( type );
         switch ( type->kind ) {
@@ -493 +493 @@
 }
 
-DeclarationNode *DeclarationNode::addName( std::string* newname ) {
+DeclarationNode *DeclarationNode::addName( std::string *newname ) {
         name = assign_strptr( newname );
         return this;
@@ -758 +758 @@
 void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Declaration* > > out( outputList );
+        std::back_insert_iterator< std::list< Declaration *> > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -776 +776 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -783 +783 @@
 }
 
-void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType* > &outputList ) {
+void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< DeclarationWithType* > > out( outputList );
+        std::back_insert_iterator< std::list< DeclarationWithType *> > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -799 +799 @@
                         Declaration *decl = cur->build();
                         if ( decl ) {
-                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
+                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType *>( decl ) ) {
                                         *out++ = dwt;
-                                } else if ( StructDecl *agg = dynamic_cast< StructDecl* >( decl ) ) {
+                                } else if ( StructDecl *agg = dynamic_cast< StructDecl *>( decl ) ) {
                                         StructInstType *inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", Declaration::NoStorageClass, linkage, 0, inst, 0 );
                                         delete agg;
-                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl* >( decl ) ) {
+                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl *>( decl ) ) {
                                         UnionInstType *inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", Declaration::NoStorageClass, linkage, 0, inst, 0 );
@@ -813 +813 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -820 +820 @@
 }
 
-void buildTypeList( const DeclarationNode *firstNode, std::list< Type* > &outputList ) {
+void buildTypeList( const DeclarationNode *firstNode, std::list< Type *> &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Type* > > out( outputList );
+        std::back_insert_iterator< std::list< Type *> > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -830 +830 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
         } // while
         if ( ! errors.isEmpty() ) {