From 65ab0205a6b193332867f9ce95fae5354efc99f7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 6 Mar 2009 20:21:36 +0000
Subject: AType::type() -> AType::ctype().

git-svn-id: http://svn.drobilla.net/resp/tuplr@62 ad02d1e2-f140-0410-9f75-f8b11f17cedd
---
 tuplr.hpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'tuplr.hpp')

diff --git a/tuplr.hpp b/tuplr.hpp
index a1bae51..87cc743 100644
--- a/tuplr.hpp
+++ b/tuplr.hpp
@@ -164,9 +164,9 @@ struct ASTTuple : public AST, public vector<AST*> {
 
 /// Type Expression, e.g. "Int", "(Fn (Int Int) Float)"
 struct AType : public ASTTuple {
-	AType(const ASTTuple& t) : ASTTuple(t), kind(EXPR), ctype(0) {}
-	AType(unsigned i) : kind(VAR), id(i), ctype(0) {}
-	AType(ASTSymbol* n, CType t) : kind(PRIM), ctype(t) { push_back(n); }
+	AType(const ASTTuple& t) : ASTTuple(t), kind(EXPR), _ctype(0) {}
+	AType(unsigned i) : kind(VAR), id(i), _ctype(0) {}
+	AType(ASTSymbol* n, CType t) : kind(PRIM), _ctype(t) { push_back(n); }
 	string str() const {
 		switch (kind) {
 		case VAR:  return (format("?%1%") % id).str();
@@ -203,12 +203,11 @@ struct AType : public ASTTuple {
 			}
 		return false; // never reached
 	}
-	CType type();
-	enum Kind { VAR, PRIM, EXPR };
-	Kind     kind;
-	unsigned id;
+	CType ctype();
+	enum { VAR, PRIM, EXPR } kind;
+	unsigned                 id;
 private:
-	const CType ctype;
+	const CType _ctype;
 };
 
 /// Lifted system functions (of various types) for a single Tuplr function
-- 
cgit v1.2.1