html_tags.hpp: _baseの継承をやめ、map化してない最後

diff --git a/roast/include/roast/net/web/html_tags.hpp b/roast/include/roast/net/web/html_tags.hpp
index 100c8cb..290d23a 100644 (file)
--- a/roast/include/roast/net/web/html_tags.hpp
+++ b/roast/include/roast/net/web/html_tags.hpp
@@ -9,7 +9,7 @@
 
 namespace roast
 {
-       namespace html
+       namespace html_
        {
                namespace tag
                {
@@ -26,6 +26,9 @@ namespace roast
                        
                        struct _base : public _general_attrs
                        {
+                       public:
+                               ::std::string _tag_name;
+                               _base(const char* tag_name_in){ _tag_name = tag_name_in; }
                        };
                        
                        /// A ///////////////////////////////////////////////
@@ -38,68 +41,69 @@ namespace roast
                                ::std::string target;
                                int tabindex;
                                
-                               a(){}
-                               a(const char* href_in){ href = href_in; }
+                               a() : _base("a") {}
+                               a(const char* href_in) : _base("a") { href = href_in; }
                        };
                        
                        /// B ////////////////////////////
                        
-                       struct b : public _base
+                       struct b
                        {
                        };
                        
-                       struct big : public _base
+                       struct big
                        {
                        };
                        
                        struct body : public _base
                        {
+                               body() : _base("body") {}
                        };
                        
-                       struct br : public _base
+                       struct br
                        {
                        };
                        
-                       struct blockquote : public _base
+                       struct blockquote
                        {
                        
                        }; typedef blockquote bq;
                        
-                       struct button : public _base
+                       struct button
                        {
                        };
                        
                        /// C ////////////////////////////
                        
-                       struct center : public _base
+                       struct center
                        {
                        };
                        
                        /// D ////////////////////////////
                        
-                       struct dd : public _base
+                       struct dd
                        {
                        };
                        
-                       struct del : public _base
+                       struct del
                        {
                        };
                        
-                       struct div : public _base
+                       struct div
                        {
                        };
                        
-                       struct dl : public _base
+                       struct dl
                        {
                        };
                        
-                       struct dt : public _base
+                       struct dt
                        {
                        };
                        
                        /// E ////////////////////////////
                        
-                       struct em : public _base
+                       struct em
                        {
                        };
                        
@@ -109,199 +113,201 @@ namespace roast
                        
                        /// F ////////////////////////////
                        
-                       struct from : public _base
+                       struct from
                        {
                        };
                        
-                       struct frame : public _base
+                       struct frame
                        {
                        };
                        
-                       struct frameset : public _base
+                       struct frameset
                        {
                        };
                        
                        /// H ////////////////////////////
                        
-                       struct h : public _base
+                       struct h
                        {
                        };
                        
                        struct head : public _base
                        {
+                               head() : _base("head") {}
                        };
                        
-                       struct hr : public _base
+                       struct hr
                        {
                        };
                        
                        struct html : public _base
                        {
+                               html() : _base("html") {}
                        };
                        
                        /// I ////////////////////////////
                        
-                       struct i : public _base
+                       struct i
                        {
                        };
                        
-                       struct iframe : public _base
+                       struct iframe
                        {
                        };
                        
-                       struct img : public _base
+                       struct img
                        {
                        };
                        
-                       struct input : public _base
+                       struct input
                        {
                        };
                        
                        /// L ////////////////////////////
                        
-                       struct li : public _base
+                       struct li
                        {
                        };
                        
                        /// M ////////////////////////////
                        
-                       struct meta : public _base
+                       struct meta
                        {
                        };
                        
                        /// N ////////////////////////////
                        
-                       struct noembed : public _base
+                       struct noembed
                        {
                        };
                        
                        /// O ////////////////////////////
                        
-                       struct object : public _base
+                       struct object
                        {
                        };
                        
-                       struct ol : public _base
+                       struct ol
                        {
                        };
                        
-                       struct option : public _base
+                       struct option
                        {
                        };
                        
                        /// P ////////////////////////////
                        
-                       struct p : public _base
+                       struct p
                        {
                        };
                        
-                       struct param : public _base
+                       struct param
                        {
                        };
                        
-                       struct plaintext : public _base
+                       struct plaintext
                        {
                        };
                        
-                       struct pre : public _base
+                       struct pre
                        {
                        };
                        
                        /// R ////////////////////////////
                        
-                       struct rb : public _base
+                       struct rb
                        {
                        };
                        
-                       struct rp : public _base
+                       struct rp
                        {
                        };
                        
-                       struct rt : public _base
+                       struct rt
                        {
                        };
                        
-                       struct ruby : public _base
+                       struct ruby
                        {
                        };
                        
                        /// S ////////////////////////////
                        
-                       struct s : public _base
+                       struct s
                        {
                        };
                        
-                       struct samp : public _base
+                       struct samp
                        {
                        };
                        
-                       struct script : public _base
+                       struct script
                        {
                        };
                        
-                       struct select : public _base
+                       struct select
                        {
                        };
                        
-                       struct server : public _base
+                       struct server
                        {
                        };
                        
-                       struct small : public _base
+                       struct small
                        {
                        };
                        
-                       struct span : public _base
+                       struct span
                        {
                        };
                        
-                       struct strike : public _base
+                       struct strike
                        {
                        };
                        
-                       struct strong : public _base
+                       struct strong
                        {
                        };
                        
-                       struct style : public _base
+                       struct style
                        {
                        };
                        
                        /// T ////////////////////////////
                        
-                       struct table : public _base
+                       struct table
                        {
                        };
                        
-                       struct td : public _base
+                       struct td
                        {
                        };
                        
-                       struct textarea : public _base
+                       struct textarea
                        {
                        };
                        
-                       struct th : public _base
+                       struct th
                        {
                        };
                        
-                       struct title : public _base
+                       struct title
                        {
                        };
                        
-                       struct tr : public _base
+                       struct tr
                        {
                        };
                        
                        /// U ////////////////////////////
                        
-                       struct ul : public _base
+                       struct ul
                        {
                        };
                        
                        /// X ////////////////////////////
                        
-                       struct xmp : public _base
+                       struct xmp
                        {
                        };