uri_schemes.hpp: .とか-とか記号使っちゃってる所を ROAST_LEXICAL_FIXSTR に直した

diff --git a/roast/include/roast/net/uri_schemes.hpp b/roast/include/roast/net/uri_schemes.hpp
index 3e022d4..2d0aad7 100644 (file)
--- a/roast/include/roast/net/uri_schemes.hpp
+++ b/roast/include/roast/net/uri_schemes.hpp
@@ -39,10 +39,10 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR2(info)     //      Information Assets with Identifiers in Public Namespaces        [RFC4452]
                        ROAST_LEXICAL_FIXSTR2(ipp)      //      Internet Printing Protocol      [RFC3510]
                        ROAST_LEXICAL_FIXSTR2(iris)     //      Internet Registry Information Service   [RFC3981]
-                       ROAST_LEXICAL_FIXSTR2(iris.beep)        //      iris.beep       [RFC3983]
-                       ROAST_LEXICAL_FIXSTR2(iris.xpc) //      iris.xpc        [RFC4992]
-                       ROAST_LEXICAL_FIXSTR2(iris.xpcs)        //      iris.xpcs       [RFC4992]
-                       ROAST_LEXICAL_FIXSTR2(iris.lwz) //      iris.lwz        [RFC4993]
+                       ROAST_LEXICAL_FIXSTR(iris_beep, "iris.beep")    //      iris.beep       [RFC3983]
+                       ROAST_LEXICAL_FIXSTR(iris_xpc, "iris.xpc")      //      iris.xpc        [RFC4992]
+                       ROAST_LEXICAL_FIXSTR(iris_xpcs, "iris.xpcs")    //      iris.xpcs       [RFC4992]
+                       ROAST_LEXICAL_FIXSTR(iris_lwz, "iris.lwz")      //      iris.lwz        [RFC4993]
                        ROAST_LEXICAL_FIXSTR2(ldap)     //      Lightweight Directory Access Protocol   [RFC4516]
                        ROAST_LEXICAL_FIXSTR2(mailto)   //      Electronic mail address         [RFC6068]
                        ROAST_LEXICAL_FIXSTR2(mid)      //      message identifier      [RFC2392]
@@ -64,8 +64,8 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR2(sips)     //      secure session initiation protocol      [RFC3261]
                        ROAST_LEXICAL_FIXSTR2(sms)      //      Short Message Service   [RFC5724]
                        ROAST_LEXICAL_FIXSTR2(snmp)     //      Simple Network Management Protocol      [RFC4088]
-                       ROAST_LEXICAL_FIXSTR2(soap.beep)        //      soap.beep       [RFC4227]
-                       ROAST_LEXICAL_FIXSTR2(soap.beeps)       //      soap.beeps      [RFC4227]
+                       ROAST_LEXICAL_FIXSTR(soap_beep, "soap.beep")    //      soap.beep       [RFC4227]
+                       ROAST_LEXICAL_FIXSTR(soap_beeps, "soap.beeps")  //      soap.beeps      [RFC4227]
                        ROAST_LEXICAL_FIXSTR2(tag)      //      tag     [RFC4151]
                        ROAST_LEXICAL_FIXSTR2(tel)      //      telephone       [RFC3966]
                        ROAST_LEXICAL_FIXSTR2(telnet)   //      Reference to interactive sessions       [RFC4248]
@@ -79,18 +79,18 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR2(ws)       //      WebSocket connections   [RFC6455]
                        ROAST_LEXICAL_FIXSTR2(wss)      //      Encrypted WebSocket connections         [RFC6455]
                        ROAST_LEXICAL_FIXSTR2(xcon)     //      xcon    [RFC6501]
-                       ROAST_LEXICAL_FIXSTR2(xcon-userid)      //      xcon-userid     [RFC6501]
-                       ROAST_LEXICAL_FIXSTR2(xmlrpc.beep)      //      xmlrpc.beep     [RFC3529]
-                       ROAST_LEXICAL_FIXSTR2(xmlrpc.beeps)     //      xmlrpc.beeps    [RFC3529]
+                       ROAST_LEXICAL_FIXSTR(xcon_userid, "xcon-userid")        //      xcon-userid     [RFC6501]
+                       ROAST_LEXICAL_FIXSTR(xmlrpc_beep, "xmlrpc.beep")        //      xmlrpc.beep     [RFC3529]
+                       ROAST_LEXICAL_FIXSTR(xmlrpc_beeps, "xmlrpc.beeps")      //      xmlrpc.beeps    [RFC3529]
                        ROAST_LEXICAL_FIXSTR2(xmpp)     //      Extensible Messaging and Presence Protocol      [RFC5122]
-                       ROAST_LEXICAL_FIXSTR2(z39.50r)  //      Z39.50 Retrieval        [RFC2056]
-                       ROAST_LEXICAL_FIXSTR2(z39.50s)  //      Z39.50 Session  [RFC2056]
+                       ROAST_LEXICAL_FIXSTR(z39_50r, "z39.50r")        //      Z39.50 Retrieval        [RFC2056]
+                       ROAST_LEXICAL_FIXSTR(z39_50s, "z39.50s")        //      Z39.50 Session  [RFC2056]
                        
                        //      Provisional URI Schemes         
                        ROAST_LEXICAL_FIXSTR2(afs)      //      Andrew File System global file names    [RFC1738]
-                       ROAST_LEXICAL_FIXSTR2(com-eventbrite-attendee)  //      com-eventbrite-attendee         [Van Zant]
-                       ROAST_LEXICAL_FIXSTR2(dlna-playsingle)  //      dlna-playsingle         [DLNA]
-                       ROAST_LEXICAL_FIXSTR2(dlna-playcontainer)       //      dlna-playcontainer      [DLNA]
+                       ROAST_LEXICAL_FIXSTR(com_eventbrite_attendee, "com-eventbrite-attendee")        //      com-eventbrite-attendee         [Van Zant]
+                       ROAST_LEXICAL_FIXSTR(dlna_playsingle, "dlna-playsingle")        //      dlna-playsingle         [DLNA]
+                       ROAST_LEXICAL_FIXSTR(dlna_playcontainer, "dlna-playcontainer")  //      dlna-playcontainer      [DLNA]
                        ROAST_LEXICAL_FIXSTR2(dtn)      //      DTNRG research and development  [RFC5050]
                        ROAST_LEXICAL_FIXSTR2(dvb)      //      dvb     [draft-mcroberts-uri-dvb]
                        ROAST_LEXICAL_FIXSTR2(icon)     //      icon    [draft-lafayette-icon-uri-scheme]
@@ -98,7 +98,7 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR2(jms)      //      Java Message Service    [RFC6167]
                        ROAST_LEXICAL_FIXSTR2(oid)      //      oid     [draft-larmouth-oid-iri]
                        ROAST_LEXICAL_FIXSTR2(rsync)    //      rsync   [RFC5781]
-                       ROAST_LEXICAL_FIXSTR2(view-source)      //      view-source     [Yevstifeyev]
+                       ROAST_LEXICAL_FIXSTR(view_source, "view-source")        //      view-source     [Yevstifeyev]
                        
                        //      HistoricalURISchemes            
                        ROAST_LEXICAL_FIXSTR2(fax)      //      fax     [RFC2806][RFC3966]
@@ -109,21 +109,20 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR2(snews)    //      NNTP over SSL/TLS       [RFC5538]
                        ROAST_LEXICAL_FIXSTR2(videotex) //      videotex        [draft-mavrakis-videotex-url-spec] [RFC2122] [RFC3986]
                        ROAST_LEXICAL_FIXSTR2(wais)     //      Wide Area Information Servers   [RFC4156]
-                       ROAST_LEXICAL_FIXSTR2(z39.50)   //      Z39.50 information access       [RFC1738][RFC2056]
+                       ROAST_LEXICAL_FIXSTR(z39_50, "z39.50")  //      Z39.50 information access       [RFC1738][RFC2056]
 
        
                        //      URN
-                       ietf
-                       pin
-                       issn
-                       oid
-                       newsml
-                       oasis
-                       xmlorg
-                       publicid
-                       isbn
-       /*      }
-       }*/
+                       ROAST_LEXICAL_FIXSTR2(ietf)
+                       ROAST_LEXICAL_FIXSTR2(pin)
+                       ROAST_LEXICAL_FIXSTR2(issn)
+                       ROAST_LEXICAL_FIXSTR2(newsml)
+                       ROAST_LEXICAL_FIXSTR2(oasis)
+                       ROAST_LEXICAL_FIXSTR2(xmlorg)
+                       ROAST_LEXICAL_FIXSTR2(publicid)
+                       ROAST_LEXICAL_FIXSTR2(isbn)
+       //      }
+       }
 }
 
 #endif//__SFJP_ROAST__net__uri_schemes_HPP__