From 5219989f2a5be1ad2ef2377dc67a1b5cb4a2dc6e Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Fri, 21 May 2010 10:01:31 -0400
Subject: [PATCH] added TokenDefinition::getClassName()

---
 Parser.cc          | 2 +-
 TokenDefinition.cc | 5 ++---
 TokenDefinition.h  | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Parser.cc b/Parser.cc
index 7deb56e..d50aa15 100644
--- a/Parser.cc
+++ b/Parser.cc
@@ -157,7 +157,7 @@ refptr<string> Parser::buildBuildToken()
             t++)
     {
         *buildToken += "case " + (*t)->getIdentifier() + ":\n";
-        *buildToken += "    token = new " + (*t)->getName() + "();\n";
+        *buildToken += "    token = new " + (*t)->getClassName() + "();\n";
         *buildToken += "    break;\n";
     }
     return buildToken;
diff --git a/TokenDefinition.cc b/TokenDefinition.cc
index fd1976a..ec45b22 100644
--- a/TokenDefinition.cc
+++ b/TokenDefinition.cc
@@ -99,8 +99,7 @@ string TokenDefinition::getCString() const
 
 string TokenDefinition::getClassDefinition() const
 {
-    string ret = "class ";
-    ret += m_name + " : public Token {\n";
+    string ret = "class "+ getClassName() + " : public Token {\n";
     ret += "public:\n";
     if (m_process)
     {
@@ -117,7 +116,7 @@ string TokenDefinition::getProcessMethod() const
     string ret;
     if (m_code != "")
     {
-        ret += "void " + m_name + "::process(Matches matches) {\n";
+        ret += "void " + getClassName() + "::process(Matches matches) {\n";
         ret += m_code + "\n";
         ret += "}\n";
     }
diff --git a/TokenDefinition.h b/TokenDefinition.h
index f16ab26..0c0b489 100644
--- a/TokenDefinition.h
+++ b/TokenDefinition.h
@@ -21,7 +21,8 @@ class TokenDefinition
         std::string getCode() const { return m_code; }
         std::string getClassDefinition() const;
         std::string getProcessMethod() const;
-        std::string getIdentifier() { return std::string("TK_") + m_name; }
+        std::string getIdentifier() const { return "TK_" + m_name; }
+        std::string getClassName() const { return "Tk" + m_name; }
 
     protected:
         std::string m_name;