characters.hpp: だいぶ並び替えとか

diff --git a/roast/include/roast/lexical2/characters.hpp b/roast/include/roast/lexical2/characters.hpp
index 7f47a6c..3ee388b 100644 (file)
--- a/roast/include/roast/lexical2/characters.hpp
+++ b/roast/include/roast/lexical2/characters.hpp
@@ -10,58 +10,61 @@ namespace roast
 {
        namespace lexical
        {
-               namespace rule
+               namespace chars
                {
-                       namespace chars
-                       {
-                               ///////////////////////////////////////////////////////////////////
+                       ///////////////////////////////////////////////////////////////////
+
+                       typedef fixed_char<'~'> tilde;
+                       typedef fixed_char<'`'> grave_accent, grave, back_quote, bkquot, bkqt;
+                       typedef fixed_char<'!'> exclamation, excl;                              //      1
+                       typedef fixed_char<'@'> atmark, at;                                             //      2
+                       typedef fixed_char<'#'> sharp, hash;                                    //      3
+                       typedef fixed_char<'$'> dollar;                                                 //      4
+                       typedef fixed_char<'%'> percent;                                                //      5
+                       typedef fixed_char<'^'> circumflex, hat;                                //      6
+                       typedef fixed_char<'&'> ampersand, amp;                                 //      7
+                       typedef fixed_char<'*'> asterisk, star, aster, wildcard;//      8
+                       typedef fixed_char<'('> lparentheses, lpare;
+                       typedef fixed_char<')'> rparentheses, rpare;
+                       typedef fixed_char<'_'> underscore, understrike, underbar, underdash,
+                                                                       lowline, low_line, low_dash, lowdash;
+                       typedef fixed_char<'-'> hyphen, dash, minus;
+                       typedef fixed_char<'+'> plus, positive;
+                       typedef fixed_char<'='> equals, equal;
+                       ////
+
+                       typedef fixed_char<'{'> left_curlybracket, lcrbrk;
+                       typedef fixed_char<'}'> right_curlybracket, rcrbrk;
+                       typedef fixed_char<'['> left_squarebracket, lsqbrk;
+                       typedef fixed_char<']'> right_squarebracket, rsqbrk;
+                       typedef fixed_char<'|'> vertical, vbar, stick, polon, pipe;
+                       typedef fixed_char<'\\'> backslash, bs,
+                               reverse_solidus, slosh, hack, escape, reverse_slash, backslant, backwhack, bash, reverse_slant, reversed_virgule, backslat;
+                       ////
+
+                       typedef fixed_char<':'> colon;
+                       typedef fixed_char<';'> semicolon;
+                       typedef fixed_char<'\"'> quotation, quot, double_quote, dblquote, dblqt;
+
 
-                               typedef fixed_char<'\0'> nullchar, null, bszero, yenzero;
-                               typedef fixed_char<'/'> slash;
-                               typedef fixed_char<'='> equal;
-                               typedef fixed_char<'*'> aster, asterisk;
-                               typedef fixed_char<'+'> plus;
-                               typedef fixed_char<'-'> hyphen, minus;
-                               
-                               typedef fixed_char<'\"'> dblqut, dblquote, double_quote;
-                               typedef fixed_char<'\''> sglqut, singlequote, single_quote;
-                               typedef fixed_char<'`'> bckqut, backquote, back_quote;
-                               
-                               typedef fixed_char<'.'> dot, period;
-                               typedef fixed_char<','> comma;
-                               typedef fixed_char<':'> colon;
-                               typedef fixed_char<';'> semicolon;
-                               typedef fixed_char<'%'> percent;
-                               typedef fixed_char<'&'> ampersand, amp;
-                               typedef fixed_char<'$'> dollar;
-                               typedef fixed_char<'#'> sharp, hash;
-                               typedef fixed_char<'@'> at, atmark;
-                               typedef fixed_char<'!'> exclamation, excl;
-                               typedef fixed_char<'?'> question;
-                               typedef fixed_char<'_'> underbar, underscore;
-                               typedef fixed_char<'^'> hat, circumflex;
-                               typedef fixed_char<'~'> tilde;
-                               typedef fixed_char<'|'> pipe, verticalbar;
-                               typedef fixed_char<'|'> pipe, verticalbar;
-                               
-                               typedef fixed_char<'<'> lesser, lt, langle, lchev;
-                               typedef fixed_char<'>'> greater, gt, rangle, rchev;
-                               typedef fixed_char<'('> lparentheses, lpare;
-                               typedef fixed_char<')'> rparentheses, rpare;
-                               typedef fixed_char<'['> lsquarebrackets, lsqbrk;
-                               typedef fixed_char<']'> rsquarebrackets, rsqbrk;
-                               typedef fixed_char<'{'> lcurlybrackets, lcubrk;
-                               typedef fixed_char<'}'> rcurlybrackets, rcubrk;
-                               
-                               typedef fixed_char<' '> space;
-                               typedef fixed_char<'\t'> tab;
-                               typedef fixed_char<'\r'> cr;
-                               typedef fixed_char<'\n'> lf;
-                       }
+                       typedef fixed_char<'/'> slash;
                        
-                       ///////////////////////////////////////////////////////////////////
+                       typedef fixed_char<'\''> sglqut, singlequote, single_quote;
+                       
+                       typedef fixed_char<'.'> dot, period;
+                       typedef fixed_char<','> comma;
+                       typedef fixed_char<'?'> question;
+                       
+                       typedef fixed_char<'<'> lesser, lt, langle, lchev;
+                       typedef fixed_char<'>'> greater, gt, rangle, rchev;
+                       
+                       typedef fixed_char<' '> space;
+                       typedef fixed_char<'\t'> tab;
+                       typedef fixed_char<'\r'> cr;
+                       typedef fixed_char<'\n'> lf;
+
+                       typedef fixed_char<'\0'> nullchar, null, bszero, yenzero;
                }
-               using namespace rule::chars;
        }
 }