syntax-treeの再度書き直し中。やりすぎか？

[simplecms/utakata.git] / datum_id.h

diff --git a/datum_id.h b/datum_id.h
index 3deab5d..433eece 100755 (executable)
--- a/datum_id.h
+++ b/datum_id.h
@@ -12,14 +12,7 @@ namespace utakata {
         public:
             enum private_DATUMID_ {
                 STRING,               // <string>
-                BACKQUOTE,            // `
-                QUOTE,                // '
-                UNQUOTE,              // ,
-                UNQUOTESPLICING,      // ,@
-                SYNTAX,               // #'
-                QUASISYNTAX,          // #`
-                UNSYNTAX,             // #,
-                UNSYNTAXSPLICING,     // #,@
+                ABBREVIATIONS,        // 各abbrev prefix
                 SYMBOL,               // <symbol>
                 NUMBER,               // <number>
                 CHARACTOR,            // <charactor>
@@ -49,14 +42,7 @@ namespace utakata {
             friend bool operator!=(DatumID s, DatumID t) {return !(s == t);}
 
             static const Literal<STRING>           string;
-            static const Literal<BACKQUOTE>        backquote;
-            static const Literal<QUOTE>            quote;
-            static const Literal<UNQUOTE>          unquote;
-            static const Literal<UNQUOTESPLICING>  unquoteSplicing;
-            static const Literal<SYNTAX>           syntax;
-            static const Literal<QUASISYNTAX>      quasiSyntax;
-            static const Literal<UNSYNTAX>         unsyntax;
-            static const Literal<UNSYNTAXSPLICING> unsyntaxSplicing;
+            static const Literal<ABBREVIATIONS>    abbreviations;
             static const Literal<SYMBOL>           symbol;
             static const Literal<NUMBER>           number;
             static const Literal<CHARACTOR>        charactor;