read_expression => PEnv::parse.

git-svn-id: http://svn.drobilla.net/resp/resp@325 ad02d1e2-f140-0410-9f75-f8b11f17cedd

1 files changed, 3 insertions, 9 deletions

diff --git a/src/resp.hpp b/src/resp.hpp
index a453b88..1fbf3cf 100644
--- a/src/resp.hpp
+++ b/src/resp.hpp
@@ -69,15 +69,6 @@ struct Error {
 
 
 /***************************************************************************
- * Lexer: Text (istream) -> S-Expressions (SExp)                           *
- ***************************************************************************/
-
-struct PEnv;
-struct AST;
-const AST* read_expression(PEnv& penv, Cursor& cur, std::istream& in);
-
-
-/***************************************************************************
  * Backend Types                                                           *
  ***************************************************************************/
 
@@ -544,6 +535,7 @@ ostream& operator<<(ostream& out, const Env<V>& env) {
 	return out;
 }
 
+
 /***************************************************************************
  * Parser: S-Expressions (SExp) -> AST Nodes (AST)                         *
  ***************************************************************************/
@@ -564,6 +556,8 @@ struct PEnv : private map<const string, const char*> {
 			return new ASymbol(str, c);
 		}
 	}
+
+	const AST* parse(Cursor& cur, std::istream& in);
 	const AST* expand(const AST* exp);
 
 	typedef std::set<std::string> Primitives;