aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-06-20 21:29:19 +0000
committerDavid Robillard <d@drobilla.net>2009-06-20 21:29:19 +0000
commitbd935db56f35d035c5c73514941c47e0e66f2fc9 (patch)
tree1d6ac83ba9075161ddcdd14567e4c271c4b2caff
parent29e8db3d7c260d43d3721faea145cec1fbbf4144 (diff)
downloadresp-bd935db56f35d035c5c73514941c47e0e66f2fc9.tar.gz
resp-bd935db56f35d035c5c73514941c47e0e66f2fc9.tar.bz2
resp-bd935db56f35d035c5c73514941c47e0e66f2fc9.zip
Tidy.
git-svn-id: http://svn.drobilla.net/resp/tuplr@143 ad02d1e2-f140-0410-9f75-f8b11f17cedd
-rw-r--r--tuplr.hpp7
-rw-r--r--typing.cpp2
2 files changed, 3 insertions, 6 deletions
diff --git a/tuplr.hpp b/tuplr.hpp
index 268d0b1..acf1cec 100644
--- a/tuplr.hpp
+++ b/tuplr.hpp
@@ -131,7 +131,6 @@ SExp readExpression(Cursor& cur, std::istream& in);
typedef void* CValue; ///< Compiled value (opaque)
typedef void* CFunction; ///< Compiled function (opaque)
-typedef void* CEngine; ///< Compiler engine (opaque)
/***************************************************************************
@@ -562,8 +561,8 @@ struct Engine {
const vector<string> argNames=vector<string>()) = 0;
virtual void finishFunction(CEnv& cenv, CFunction f, CValue ret) = 0;
- virtual void eraseFunction(CEnv& cenv, CFunction f) = 0;
- virtual void writeModule(CEnv& cenv, std::ostream& os) = 0;
+ virtual void eraseFunction(CEnv& cenv, CFunction f) = 0;
+ virtual void writeModule(CEnv& cenv, std::ostream& os) = 0;
virtual const string call(CEnv& cenv, CFunction f, AType* retT) = 0;
};
@@ -625,8 +624,6 @@ private:
void pprint(std::ostream& out, const AST* ast);
void initLang(PEnv& penv, TEnv& tenv);
-CEnv* newCenv(PEnv& penv, TEnv& tenv);
-void freeCenv(CEnv* cenv);
int eval(CEnv& cenv, const string& name, istream& is);
int repl(CEnv& cenv);
diff --git a/typing.cpp b/typing.cpp
index 189ddf4..c9eeb6d 100644
--- a/typing.cpp
+++ b/typing.cpp
@@ -25,6 +25,7 @@ Constraints::constrain(TEnv& tenv, const AST* o, AType* t)
push_back(Constraint(tenv.var(o), t, o->loc));
}
+
/***************************************************************************
* AST Type Constraints *
***************************************************************************/
@@ -244,7 +245,6 @@ substitute(ATuple* tup, const AST* from, AST* to)
substitute(tup->at(i)->to<ATuple*>(), from, to);
}
-
Subst
Subst::compose(const Subst& delta, const Subst& gamma) // TAPL 22.1.1
{