Changeset 3a5131ed for src/Parser/TypeData.cc

Timestamp:

Feb 16, 2017, 3:36:45 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

317450e

Parents:

c3d9adc

Message:

handle KR function declarations

File:

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

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 27 15:28:56 2017
-// Update Count     : 428
+// Last Modified On : Thu Feb 16 15:06:59 2017
+// Update Count     : 455
 //
 
@@ -724 +724 @@
 Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
+                if ( td->function.idList ) {
+                        buildKRFunction( td->function );
+                } // if
+
                 FunctionDecl * decl;
                 if ( td->function.hasBody ) {
@@ -738 +742 @@
                         decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), nullptr, isInline, isNoreturn, attributes );
                 } // if
-                for ( DeclarationNode * cur = td->function.idList; cur != nullptr; cur = dynamic_cast< DeclarationNode* >( cur->get_next() ) ) {
-                        if ( cur->name ) {
-                                decl->get_oldIdents().insert( decl->get_oldIdents().end(), *cur->name );
-                        } // if
-                } // for
-                buildList( td->function.oldDeclList, decl->get_oldDecls() );
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
@@ -778 +776 @@
 } // buildFunction
 
+void buildKRFunction( const TypeData::Function_t & function ) {
+        assert( ! function.params );
+        for ( DeclarationNode * decl = function.oldDeclList; decl != nullptr; decl = dynamic_cast< DeclarationNode* >( decl->get_next() ) ) {
+                for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode* >( param->get_next() ) ) {
+                        if ( *decl->name == *param->name ) {
+                                if ( param->type ) throw SemanticError( string( "duplicate declaration name " ) + *param->name );
+                                if ( ! decl->type ) throw SemanticError( string( "duplicate parameter name " ) + *param->name );
+                                param->type = decl->type;
+                                decl->type = nullptr;
+                                param->attributes.splice( param->attributes.end(), decl->attributes );
+                        } // if
+                } // for
+                if ( decl->type ) throw SemanticError( string( "missing name in parameter list " ) + *decl->name );
+        } // for
+        for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode* >( param->get_next() ) ) {
+                if ( ! param->type ) {
+                        param->type = new TypeData( TypeData::Basic );
+                        param->type->basictype = DeclarationNode::Int;
+                } // if
+        } // for
+
+        function.params = function.idList;
+        function.idList = nullptr;
+        delete function.oldDeclList;
+        function.oldDeclList = nullptr;
+} // buildKRFunction
+
 // Local Variables: //
 // tab-width: 4 //