Changeset ba54f7d for src/SynTree

Timestamp:

Sep 13, 2017, 3:11:24 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:

c57ded70, db70fe4

Parents:

d130fe8 (diff), 982832e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• ApplicationExpr.cc (modified) (2 diffs)
• CompoundStmt.cc (modified) (2 diffs)
• Constant.cc (modified) (2 diffs)
• Declaration.h (modified) (1 diff)
• Expression.h (modified) (2 diffs)
• FunctionDecl.cc (modified) (1 diff)
• Statement.h (modified) (3 diffs)
• TupleExpr.cc (modified) (2 diffs)
• Visitor.h (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -47 +47 @@
                 } else {
                         // taking address of non-lvalue -- must be a reference, loses one layer of reference
-                        ReferenceType * refType = safe_dynamic_cast< ReferenceType * >( arg->get_result() );
+                        ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->get_result() );
                         set_result( addrType( refType->get_base() ) );
                 }

src/SynTree/ApplicationExpr.cc

@@ -14 +14 @@
 //
 
-#include <cassert>               // for safe_dynamic_cast, assert
+#include <cassert>               // for strict_dynamic_cast, assert
 #include <list>                  // for list
 #include <map>                   // for _Rb_tree_const_iterator, map, map<>:...
@@ -50 +50 @@
 
 ApplicationExpr::ApplicationExpr( Expression *funcExpr, const std::list<Expression *> & args ) : function( funcExpr ), args( args ) {
-        PointerType *pointer = safe_dynamic_cast< PointerType* >( funcExpr->get_result() );
-        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+        PointerType *pointer = strict_dynamic_cast< PointerType* >( funcExpr->get_result() );
+        FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
 
         set_result( ResolvExpr::extractResultType( function ) );

src/SynTree/CompoundStmt.cc

@@ -14 +14 @@
 //
 
-#include <cassert>                    // for assert, safe_dynamic_cast
+#include <cassert>                    // for assert, strict_dynamic_cast
 #include <list>                       // for list, _List_const_iterator, lis...
 #include <ostream>                    // for operator<<, ostream, basic_ostream
@@ -52 +52 @@
                 Statement * origStmt = *origit++;
                 if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( s ) ) {
-                        DeclStmt * origDeclStmt = safe_dynamic_cast< DeclStmt * >( origStmt );
+                        DeclStmt * origDeclStmt = strict_dynamic_cast< DeclStmt * >( origStmt );
                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * > ( declStmt->get_decl() ) ) {
-                                DeclarationWithType * origdwt = safe_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
+                                DeclarationWithType * origdwt = strict_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
                                 assert( dwt->get_name() == origdwt->get_name() );
                                 declMap[ origdwt ] = dwt;

src/SynTree/Constant.cc

@@ -14 +14 @@
 //
 
-#include <cassert>   // for safe_dynamic_cast, assertf
+#include <cassert>   // for strict_dynamic_cast, assertf
 #include <iostream>  // for operator<<, ostream, basic_ostream
 #include <string>    // for to_string, string, char_traits, operator<<
@@ -58 +58 @@
 
 unsigned long long Constant::get_ival() const {
-        assertf( safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
+        assertf( strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
         return val.ival;
 }
 
 double Constant::get_dval() const {
-        assertf( ! safe_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
+        assertf( ! strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
         return val.dval;
 }

src/SynTree/Declaration.h

@@ -157 +157 @@
         virtual ~FunctionDecl();
 
-        Type * get_type() const;
-        virtual void set_type(Type *);
+        Type * get_type() const { return type; }
+        virtual void set_type(Type * t) { type = strict_dynamic_cast< FunctionType* >( t ); }
 
         FunctionType * get_functionType() const { return type; }

src/SynTree/Expression.h

@@ -86 +86 @@
   public:
         Expression * function;
+        std::list<Expression *> args;
+        InferredParams inferParams;
 
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
@@ -100 +102 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-
-  private:
-        std::list<Expression *> args;
-        InferredParams inferParams;
 };
 

src/SynTree/FunctionDecl.cc

@@ -44 +44 @@
         delete type;
         delete statements;
-}
-
-Type * FunctionDecl::get_type() const {
-        return type;
-}
-
-void FunctionDecl::set_type( Type *t ) {
-        type = dynamic_cast< FunctionType* >( t );
-        assert( type );
 }
 

src/SynTree/Statement.h

@@ -155 +155 @@
   public:
         Expression * condition;
+        std::list<Statement *> statements;
 
         SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
@@ -170 +171 @@
         virtual SwitchStmt *clone() const { return new SwitchStmt( *this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        std::list<Statement *> statements;
+
 };
 
@@ -327 +327 @@
 class TryStmt : public Statement {
   public:
-        CompoundStmt *block;
+        CompoundStmt * block;
         std::list<CatchStmt *> handlers;
-        FinallyStmt *finallyBlock;
+        FinallyStmt * finallyBlock;
 
         TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );

src/SynTree/TupleExpr.cc

@@ -14 +14 @@
 //
 
-#include <cassert>              // for assert, safe_dynamic_cast, assertf
+#include <cassert>              // for assert, strict_dynamic_cast, assertf
 #include <iterator>             // for next
 #include <list>                 // for list, _List_iterator
@@ -64 +64 @@
 
 TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) : tuple( tuple ), index( index )  {
-        TupleType * type = safe_dynamic_cast< TupleType * >( tuple->get_result() );
+        TupleType * type = strict_dynamic_cast< TupleType * >( tuple->get_result() );
         assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
         set_result( (*std::next( type->get_types().begin(), index ))->clone() );

src/SynTree/Visitor.h

@@ -148 +148 @@
 }
 
-template< typename Container, typename VisitorType >
-void acceptAllFold( Container &container, VisitorType &visitor, VisitorType &around ) {
-        SemanticError errors;
-        for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
-                try {
-                        if ( *i ) {
-                                VisitorType *v = new VisitorType;
-                                (*i)->accept( *v );
-
-                                typename Container::iterator nxt = i; nxt++; // forward_iterator
-                                if ( nxt == container.end() )
-                                        visitor += *v;
-                                else
-                                        visitor += *v + around;
-
-                                delete v;
-                        } // if
-                } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
-                        errors.append( e );
-                } // try
-        } // for
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
-}
-
 // Local Variables: //
 // tab-width: 4 //