Changeset 843054c2 for src/Parser

Timestamp:

May 21, 2015, 9:44:51 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

aaron-thesis, arm-eh, 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, resolv-new, string, with_gc

Children:

76f2e97f

Parents:

a08ba92

Message:

licencing: seventh groups of files

Location:

src/Parser

Files:

• DeclarationNode.cc (moved) (moved from translator/Parser/DeclarationNode.cc) (7 diffs)
• ExpressionNode.cc (moved) (moved from translator/Parser/ExpressionNode.cc)
• InitializerNode.cc (moved) (moved from translator/Parser/InitializerNode.cc)
• LinkageSpec.cc (moved) (moved from translator/Parser/LinkageSpec.cc)
• LinkageSpec.h (moved) (moved from translator/Parser/LinkageSpec.h)
• ParseNode.cc (moved) (moved from translator/Parser/ParseNode.cc)
• ParseNode.h (moved) (moved from translator/Parser/ParseNode.h)
• Parser.cc (moved) (moved from translator/Parser/Parser.cc)
• Parser.h (moved) (moved from translator/Parser/Parser.h)
• StatementNode.cc (moved) (moved from translator/Parser/StatementNode.cc)
• TypeData.cc (moved) (moved from translator/Parser/TypeData.cc)
• TypeData.h (moved) (moved from translator/Parser/TypeData.h)
• TypedefTable.cc (moved) (moved from translator/Parser/TypedefTable.cc)
• TypedefTable.h (moved) (moved from translator/Parser/TypedefTable.h)
• cfa.y (moved) (moved from translator/Parser/cfa.y)
• lex.h (moved) (moved from translator/Parser/lex.h)
• lex.l (moved) (moved from translator/Parser/lex.l)
• module.mk (moved) (moved from translator/Parser/module.mk) (1 diff)
• parseutility.cc (moved) (moved from translator/Parser/parseutility.cc)
• parseutility.h (moved) (moved from translator/Parser/parseutility.h)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 12:38:20 2015
-// Update Count     : 4
+// Last Modified On : Thu May 21 09:28:54 2015
+// Update Count     : 13
 //
 
@@ -751 +751 @@
                         newnode->type = ret;
                         return newnode;
-                } else {
-                        return 0;
-                }
-        } else {
-                return 0;
-        }
+                } // if
+        } // if
+        return 0;
 }
 
@@ -770 +767 @@
                                 if ( decl ) {
                                         *out++ = decl;
-                                }
-                        }
+                                } // if
+                        } // if
                         Declaration *decl = cur->build();
                         if ( decl ) {
                                 *out++ = decl;
-                        }
+                        } // if
                 } catch( SemanticError &e ) {
                         errors.append( e );
-                }
+                } // try
                 cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
-        }
+        } // while
         if ( ! errors.isEmpty() ) {
                 throw errors;
-        }
+        } // if
 }
 
@@ -811 +808 @@
                                         UnionInstType *inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", Declaration::NoStorageClass, linkage, 0, inst, 0 );
-                                }
-                        }
+                                } // if
+                        } // if
                 } catch( SemanticError &e ) {
                         errors.append( e );
-                }
+                } // try
                 cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
-        }
+        } // while
         if ( ! errors.isEmpty() ) {
                 throw errors;
-        }
+        } // if
 }
 
@@ -832 +829 @@
                 } catch( SemanticError &e ) {
                         errors.append( e );
-                }
+                } // try
                 cur = dynamic_cast< DeclarationNode* >( cur->get_link() );
-        }
+        } // while
         if ( ! errors.isEmpty() ) {
                 throw errors;
-        }
+        } // if
 }
 
 Declaration *DeclarationNode::build() const {
-
-        if ( ! type ) {
-                if ( buildInline() ) {
-                        throw SemanticError( "invalid inline specification in declaration of ", this );
-                } else {
-                        return new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) );
-                }
-        } else {
+        if ( type ) {
                 Declaration *newDecl = type->buildDecl( name, buildStorageClass(), maybeBuild< Expression >( bitfieldWidth ), buildInline(), linkage, maybeBuild< Initializer >(initializer) );
                 return newDecl;
-        }
-        // we should never get here
-        assert( false );
-        return 0;
+        } // if
+        if ( ! buildInline() ) {
+                return new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) );
+        } // if
+        throw SemanticError( "invalid inline specification in declaration of ", this );
 }
 
@@ -904 +895 @@
         for ( std::list< StorageClass >::const_iterator i = storageClasses.begin(); i != storageClasses.end(); ++i ) {
                 assert( unsigned( *i ) < sizeof( scMap ) / sizeof( scMap[0] ) );
-                if ( *i == Inline ) continue;
-                if ( ret == Declaration::NoStorageClass ) {
-                        ret = scMap[ *i ];
-                } else {
+          if ( *i == Inline ) continue;
+          if ( ret != Declaration::NoStorageClass ) {
                         throw SemanticError( "invalid combination of storage classes in declaration of ", this );
                 }
+                ret = scMap[ *i ];
         }
         return ret;
@@ -916 +906 @@
 bool DeclarationNode::buildInline() const {
         std::list< StorageClass >::const_iterator first = std::find( storageClasses.begin(), storageClasses.end(), Inline );
-        if ( first == storageClasses.end() ) {
-                return false;
-        } else {
-                std::list< StorageClass >::const_iterator next = std::find( ++first, storageClasses.end(), Inline );
-                if ( next == storageClasses.end() ) {
-                        return true;
-                } else {
-                        throw SemanticError( "duplicate inline specification in declaration of ", this );
-                }
-        }
-        // we should never get here
-        return false;
+  if ( first == storageClasses.end() ) return false;
+        std::list< StorageClass >::const_iterator next = std::find( ++first, storageClasses.end(), Inline );
+  if ( next == storageClasses.end() ) return true;
+        throw SemanticError( "duplicate inline specification in declaration of ", this );
 }
 

src/Parser/module.mk

@@ -8 +8 @@
 ## module.mk -- 
 ##
-## Author           : Peter A. Buhr
+## Author           : Richard C. Bilson
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat May 16 15:29:50 2015
-## Update Count     : 1
+## Last Modified On : Thu May 21 21:17:07 2015
+## Update Count     : 2
 ###############################################################################