Changes in / [b3f252a:416cc86]

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/Expression.h (modified) (2 diffs)
• SynTree/FunctionDecl.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (3 diffs)

src/Common/utility.h

@@ -277 +277 @@
         ~ValueGuardPtr() { if( ref ) *ref = old; }
 };
-
-template< typename aT >
-struct FuncGuard {
-        aT m_after;
-
-        template< typename bT >
-        FuncGuard( bT before, aT after ) : m_after( after ) {
-                before();
-        }
-
-        ~FuncGuard() {
-                m_after();
-        }
-};
-
-template< typename bT, typename aT >
-FuncGuard<aT> makeFuncGuard( bT && before, aT && after ) {
-        return FuncGuard<aT>( std::forward<bT>(before), std::forward<aT>(after) );
-}
 
 template< typename T >

src/SynTree/Declaration.h

@@ -155 +155 @@
         virtual ~FunctionDecl();
 
-        Type * get_type() const { return type; }
-        virtual void set_type(Type * t) { type = safe_dynamic_cast< FunctionType* >( t ); }
+        Type * get_type() const;
+        virtual void set_type(Type *);
 
         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 * >() );
@@ -102 +100 @@
         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 );
@@ -171 +170 @@
         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 );