Changeset 3648d98

Timestamp:

May 15, 2019, 4:10:17 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

89c2f7c9

Parents:

69bafd2

Message:

Clean up warnings/errors from ast::Type merge

Location:

src

Files:

• AST/Node.hpp (modified) (1 diff)
• AST/Type.hpp (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)

src/AST/Node.hpp

@@ -135 +135 @@
         const node_t & operator* () const { return *node; }
         explicit operator bool() const { return node; }
-        operator const node_t * const() const { return node; }
+        operator const node_t * () const { return node; }
 
         template<typename o_node_t>

src/AST/Type.hpp

@@ -23 +23 @@
 
 #include "CVQualifiers.hpp"
+#include "Decl.hpp"
 #include "Fwd.hpp"
 #include "Node.hpp"          // for Node, ptr
@@ -141 +142 @@
 
         /// Check if this type represents an integer type
-        bool isInteger() const { return kind <= MAX_INTEGER_TYPE; }
+        bool isInteger() const { return (unsigned)kind <= (unsigned)MAX_INTEGER_TYPE; }
 
         const Type * accept( Visitor & v ) const override { return v.visit( this ); }

src/InitTweak/InitTweak.cc

@@ -515 +515 @@
         }
         const ast::Type* getPointerBase( const ast::Type* t ) {
-                if ( const ast::PointerType* p = dynamic_cast< const ast::PointerType* >( t ) ) {
-                        return p->base;
-                } else if ( const ast::ArrayType* a = dynamic_cast< const ast::ArrayType* >( t ) ) {
-                        return a->base;
-                } else if ( const ast::ReferenceType* r = dynamic_cast< const ast::ReferenceType* >( t ) ) {
-                        return r->base;
-                } else return nullptr;
+                assert(!"needs to build Type.cpp before inclusion");
+                // if ( const ast::PointerType* p = dynamic_cast< const ast::PointerType* >( t ) ) {
+                //      return p->base;
+                // } else if ( const ast::ArrayType* a = dynamic_cast< const ast::ArrayType* >( t ) ) {
+                //      return a->base;
+                // } else if ( const ast::ReferenceType* r = dynamic_cast< const ast::ReferenceType* >( t ) ) {
+                //      return r->base;
+                // } else return nullptr;
         }