Changeset 30f9072 for src/SymTab/Validate.cc

Timestamp:

Jul 12, 2017, 1:58:00 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

02d62bb

Parents:

3268a58

Message:

More cleanup on the headers

File:

• src/SymTab/Validate.cc (modified) (4 diffs)

src/SymTab/Validate.cc

@@ -38 +38 @@
 //   definition occurs later in the input.
 
-#include <algorithm>
-#include <iterator>
-#include <list>
-
-#include "CodeGen/CodeGenerator.h"
-
-#include "Common/PassVisitor.h"
-#include "Common/ScopedMap.h"
-#include "Common/UniqueName.h"
-#include "Common/utility.h"
-
-#include "Concurrency/Keywords.h"
-
-#include "GenPoly/DeclMutator.h"
-
-#include "InitTweak/InitTweak.h"
-
-#include "AddVisit.h"
-#include "Autogen.h"
-#include "FixFunction.h"
-// #include "ImplementationType.h"
-#include "Indexer.h"
-#include "MakeLibCfa.h"
-#include "TypeEquality.h"
 #include "Validate.h"
 
-#include "ResolvExpr/typeops.h"
-
-#include "SynTree/Attribute.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Mutator.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
-#include "SynTree/Visitor.h"
+#include <cstddef>                     // for size_t
+#include <algorithm>                   // for move, transform
+#include <cassert>                     // for safe_dynamic_cast, assertf
+#include <iterator>                    // for back_inserter, inserter, back_...
+#include <list>                        // for list, _List_iterator, list<>::...
+#include <map>                         // for _Rb_tree_iterator, map, map<>:...
+#include <memory>                      // for unique_ptr, allocator
+#include <string>                      // for string, operator+, operator==
+#include <tuple>                       // for get
+#include <utility>                     // for pair, make_pair
+
+#include "AddVisit.h"                  // for addVisit
+#include "Autogen.h"                   // for SizeType, autogenerateRoutines
+#include "CodeGen/CodeGenerator.h"     // for genName
+#include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
+#include "Common/ScopedMap.h"          // for ScopedMap<>::const_iterator
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "Concurrency/Keywords.h"      // for applyKeywords, implementMutexF...
+#include "FixFunction.h"               // for FixFunction
+#include "Indexer.h"                   // for Indexer
+#include "InitTweak/InitTweak.h"       // for isCtorDtor, isCtorDtorAssign
+#include "Parser/LinkageSpec.h"        // for C, Cforall
+#include "ResolvExpr/typeops.h"        // for extractResultType, typesCompat...
+#include "SynTree/Attribute.h"         // for Attribute
+#include "SynTree/Constant.h"          // for Constant
+#include "SynTree/Declaration.h"       // for EnumDecl, StructDecl, UnionDecl
+#include "SynTree/Expression.h"        // for TypeExpr, CompoundLiteralExpr
+#include "SynTree/Initializer.h"       // for ListInit, Initializer, noDesig...
+#include "SynTree/Mutator.h"           // for mutateAll, Mutator
+#include "SynTree/Statement.h"         // for CompoundStmt, DeclStmt, Return...
+#include "SynTree/Type.h"              // for Type, TypeInstType, TraitInstType
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution, applySubstit...
+#include "SynTree/Visitor.h"           // for acceptAll, Visitor
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
@@ -605 +607 @@
                 // a return statement in a void-returning function in C. The expression is treated as if it
                 // were cast to void.
-                if ( returnStmt->get_expr() == NULL && returnVals.size() != 0 ) {
+                if ( ! returnStmt->get_expr() && returnVals.size() != 0 ) {
                         throw SemanticError( "Non-void function returns no values: " , returnStmt );
                 }
@@ -836 +838 @@
         void validateGeneric( Aggr * inst ) {
                 std::list< TypeDecl * > * params = inst->get_baseParameters();
-                if ( params != NULL ) {
+                if ( params ) {
                         std::list< Expression * > & args = inst->get_parameters();
 
@@ -937 +939 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
-                        if ( at->get_dimension() != nullptr ) return;
+                        if ( at->get_dimension() ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
                                 at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );