From: visor Date: Sat, 4 May 2013 03:37:59 +0000 (+0900) Subject: change rMOTORVAR constant value. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=164eff5d02d7bc55925d2f4f6f7d73a54bd694d1;p=hmh%2Fhhml.git change rMOTORVAR constant value. --- diff --git a/lib/motorconst.h b/lib/motorconst.h index f9ffdde..772540f 100644 --- a/lib/motorconst.h +++ b/lib/motorconst.h @@ -1,7 +1,7 @@ #ifndef MOTORCONST_H #define MOTORCONST_H -#define rMOTORVAR "[a-zA-Z_0-9][a-zA-Z_0-9-]*" +#define rMOTORVAR "[a-zA-Z_0-9][a-zA-Z_0-9+*-]*" #define rWIKIVAR "[a-zA-Z_][a-zA-Z_0-9-]*" #define rWikiID "[a-zA-Z_][a-zA-Z_0-9-]*" #define kWORD "[a-zA-Z0-9_]" diff --git a/modules/ml-store.cc b/modules/ml-store.cc index 3e53d78..61ae1b1 100644 --- a/modules/ml-store.cc +++ b/modules/ml-store.cc @@ -73,18 +73,6 @@ ustring StoreType::src (MlEnv* mlenv, const ustring& name) { return mlenv->env->path_storage_file (name); case F_STATIC: return mlenv->env->path_static_file (name); -#if 0 - { - ustring ans; - if (! checkResourceName (name)) - throw (name + uErrorBadFile); - if (mlenv->env->path_resource (name, ans)) { - } else { - throw (name + uErrorNotFound); - } - return ans; - } -#endif default: throw (uErrorNoStore); }