Changeset 3a5131ed for src/Parser

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

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (5 diffs)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (4 diffs)
• TypeData.h (modified) (3 diffs)
• core (added)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 15:54:59 2017
-// Update Count     : 742
+// Last Modified On : Thu Feb 16 13:06:50 2017
+// Update Count     : 753
 //
 
@@ -913 +913 @@
         SemanticError errors;
         std::back_insert_iterator< std::list< Declaration * > > out( outputList );
-        const DeclarationNode * cur = firstNode;
-
-        while ( cur ) {
+
+        for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
@@ -936 +935 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
 
@@ -947 +945 @@
         SemanticError errors;
         std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
-        const DeclarationNode * cur = firstNode;
-        while ( cur ) {
+        
+        for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
                         Declaration * decl = cur->build();
@@ -972 +970 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
-        } // while
+        } // for
+
         if ( ! errors.isEmpty() ) {
                 throw errors;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:45:28 2017
-// Update Count     : 658
+// Last Modified On : Thu Feb 16 13:15:55 2017
+// Update Count     : 661
 //
 
@@ -437 +437 @@
 template< typename SynTreeType, typename NodeType >
 void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > &outputList ) {
-        buildList(firstNode, outputList);
+        buildList( firstNode, outputList );
         delete firstNode;
 }

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 //

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 17:02:09 2017
-// Update Count     : 146
+// Last Modified On : Thu Feb 16 14:30:05 2017
+// Update Count     : 153
 //
 
@@ -52 +52 @@
 
         struct Function_t {
-                DeclarationNode * params;
-                DeclarationNode * idList;                                               // old-style
-                DeclarationNode * oldDeclList;
+                mutable DeclarationNode * params;                               // mutables modified in buildKRFunction
+                mutable DeclarationNode * idList;                               // old-style
+                mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
                 bool hasBody;
@@ -113 +113 @@
 Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
+void buildKRFunction( const TypeData::Function_t & function );
 
 #endif // TYPEDATA_H