maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow static_cfg to include entire directories

Browse source 
Via new "toml_dir" and "json_dir" directives in the macro
This commit is contained in:
Griffin Smith 2019-07-14 14:29:11 -04:00
parent 67d18b486c
commit 081146da30
6 changed files with 156 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -19,14 +19,16 @@ extern crate maplit;
#[macro_use]
extern crate downcast_rs;
extern crate backtrace;
#[macro_use]
extern crate include_dir;
#[macro_use]
mod util;
mod display;
mod game;
#[macro_use]
mod types;
mod entities;
#[macro_use]
mod util;
mod messages;
mod settings;

2
src/util/mod.rs
View file

@ -1,2 +1,2 @@
#[macro_use]
pub mod static_toml;
pub mod static_cfg;

91
src/util/static_cfg.rs Normal file
View file

@ -0,0 +1,91 @@
use include_dir::Dir;
use serde::de;
macro_rules! __static_cfg_include {
(toml_file, $filename:expr) => {
include_str!($filename)
};
(toml_dir, $filename:expr) => {
include_dir!($filename)
};
(json_file, $filename:expr) => {
include_str!($filename)
};
(json_dir, $filename:expr) => {
include_dir!($filename)
};
}
macro_rules! __static_cfg_type {
(toml_file) => (&'static str);
(json_file) => (&'static str);
(toml_dir) => (include_dir::Dir<'static>);
(json_dir) => (include_dir::Dir<'static>);
}
macro_rules! __static_cfg_parse {
(toml_file, $e:expr) => {
toml::from_str($e).unwrap()
};
(json_file, $e:expr) => {
serde_json::from_str($e).unwrap()
};
(toml_dir, $e:expr) => {
crate::util::static_cfg::parse_toml_dir($e)
};
(json_dir, $e:expr) => {
crate::util::static_cfg::parse_json_dir($e)
};
}
macro_rules! __static_cfg_inner {
($(#[$attr:meta])* ($($vis:tt)*) static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
// static RAW: &'static str = __static_cfg_include!($kind, $filename);
static RAW: __static_cfg_type!($kind) = __static_cfg_include!($kind, $filename);
lazy_static! {
$(#[$attr])* static ref $N: $T = __static_cfg_parse!($kind, RAW);
}
static_cfg!($($t)*);
}
}
#[macro_export]
macro_rules! static_cfg {
($(#[$attr:meta])* static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* () static ref $N : $T = $kind($filename); $($t)*);
};
($(#[$attr:meta])* pub static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* (pub) static ref $N : $T = $kind($filename); $($t)*);
};
($(#[$attr:meta])* pub ($($vis:tt)+) static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* (pub ($($vis)+)) static ref $N : $T = $kind($filename); $($t)*);
};
() => ()
}
pub fn parse_toml_dir<'a, T>(d: Dir<'a>) -> Vec<T>
where
T: de::Deserialize<'a>,
{
d.files()
.iter()
.map(|f| toml::from_str(f.contents_utf8().unwrap()).unwrap())
.collect()
}
pub fn parse_json_dir<'a, T>(d: Dir<'a>) -> Vec<T>
where
T: de::Deserialize<'a>,
{
d.files()
.iter()
.map(|f| serde_json::from_str(f.contents_utf8().unwrap()).unwrap())
.collect()
}

37
src/util/static_toml.rs
View file

@ -1,37 +0,0 @@
macro_rules! __static_cfg_parse {
(toml_file, $e:expr) => {
toml::from_str($e)
};
(json_file, $e:expr) => {
json::from_str($e)
};
}
macro_rules! __static_cfg_inner {
($(#[$attr:meta])* ($($vis:tt)*) static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
static RAW: &'static str = include_str!($filename);
lazy_static! {
$(#[$attr])* static ref $N: $T = __static_cfg_parse!($kind, RAW).unwrap();
}
static_cfg!($($t)*);
}
}
#[macro_export]
macro_rules! static_cfg {
($(#[$attr:meta])* static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* () static ref $N : $T = $kind($filename); $($t)*);
};
($(#[$attr:meta])* pub static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* (pub) static ref $N : $T = $kind($filename); $($t)*);
};
($(#[$attr:meta])* pub ($($vis:tt)+) static ref $N:ident : $T:ty = $kind:ident($filename:expr); $($t:tt)*) => {
__static_cfg_inner!($(#[$attr])* (pub ($($vis)+)) static ref $N : $T = $kind($filename); $($t)*);
};
() => ()
}