-lexeme_idを、private inherit Enum idiomで書き直した。なんかよくわからないエラーが出るけど気にしない。

[simplecms/utakata.git] / lexeme_impl.h

diff --git a/lexeme_impl.h b/lexeme_impl.h
index bbab412..79843c6 100755 (executable)
--- a/lexeme_impl.h
+++ b/lexeme_impl.h
@@ -4,6 +4,7 @@
 #include "lexeme.h"
 #include "smart_ptr.h"
 #include "utf8_string.h"
+#include "lexeme_id.h"
 
 // lexemeの様々な実装を定義する。
 namespace utakata {
@@ -50,7 +51,7 @@ namespace utakata {
             OpenParen(){}
             virtual ~OpenParen() {}
 
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -60,7 +61,7 @@ namespace utakata {
             EOS(){}
             virtual ~EOS() {}
 
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -69,7 +70,7 @@ namespace utakata {
         public:
             CloseParen(){}
             virtual ~CloseParen() {}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -79,7 +80,7 @@ namespace utakata {
         public:
             BackQuote(){}
             virtual ~BackQuote(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -88,7 +89,7 @@ namespace utakata {
         public:
             Quote(){}
             virtual ~Quote(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -98,7 +99,7 @@ namespace utakata {
         public:
             Dot(){}
             virtual ~Dot(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -107,7 +108,7 @@ namespace utakata {
         public:
             UnquoteSplicing(){}
             virtual ~UnquoteSplicing(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -117,7 +118,7 @@ namespace utakata {
         public:
             Unquote(){}
             virtual ~Unquote(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -126,7 +127,7 @@ namespace utakata {
         public:
             Syntax() {}
             virtual ~Syntax() {}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
         };
 
@@ -135,7 +136,7 @@ namespace utakata {
         public:
             QuasiSyntax(){}
             virtual ~QuasiSyntax(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -146,7 +147,7 @@ namespace utakata {
             UnsyntaxSplicing(){}
             virtual ~UnsyntaxSplicing(){}
 
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -156,7 +157,7 @@ namespace utakata {
         public:
             Unsyntax(){}
             virtual ~Unsyntax(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -170,7 +171,7 @@ namespace utakata {
         public:
             Vector(){}
             virtual ~Vector(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -184,7 +185,7 @@ namespace utakata {
         public:
             ByteVector(){}
             virtual ~ByteVector(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         };
@@ -196,7 +197,7 @@ namespace utakata {
             
             String(const utakata::utf8_string::UTF8String& ident);
             virtual ~String(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         private:
@@ -210,7 +211,7 @@ namespace utakata {
             
             Identifier(const utakata::utf8_string::UTF8String& ident);
             virtual ~Identifier(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         private:
@@ -224,7 +225,7 @@ namespace utakata {
             Number(const utf8_string::UTF8String& real, const utf8_string::UTF8String& imagin,
                    bool exact, int radix);
             virtual ~Number(){}
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         private:
@@ -241,7 +242,7 @@ namespace utakata {
             Charactor(const utf8_string::UTF8String& ch);
             virtual ~Charactor(){}
 
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         private:
@@ -255,7 +256,7 @@ namespace utakata {
             Boolean(const smart_ptr<utf8_string::UTF8Char>& ch);
             virtual ~Boolean(){}
 
-            const LexemeID getID() const;
+            const lexeme::LexemeID getID() const;
             smart_ptr<utakata::utf8_string::UTF8String> toString() const;
 
         private: