Initial commit, working implementation.

AlphaModder · AlphaModder · commit 9ca238aec063 · 2019-03-28T23:19:30.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/target
+**/*.rs.bk
+Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,2 @@
+[workspace]
+members = ["include-lua", "include-lua-macro", "example" ]
diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "lua-include-example"
+version = "0.1.0"
+authors = ["AlphaModder"]
+edition = "2018"
+publish = false
+
+[dependencies]
+include-lua = { path = "../include-lua" }
+rlua = "0.16.2"
diff --git a/example/src/lib/alpha/init.lua b/example/src/lib/alpha/init.lua
@@ -0,0 +1 @@
+return "Hello World!"
diff --git a/example/src/lib/test.lua b/example/src/lib/test.lua
@@ -0,0 +1 @@
+return "Hello Again!"
diff --git a/example/src/main.rs b/example/src/main.rs
@@ -0,0 +1,14 @@
+use include_lua::*;
+use rlua::Lua;
+
+fn main() -> rlua::Result<()> {
+    let lua = Lua::new();
+    let modules = include_lua!("lib");
+    lua.context(|ctx| -> rlua::Result<()> {
+        ctx.add_modules(modules)?;
+        println!("{}", ctx.load("require('alpha')").eval::<String>()?);
+        println!("{}", ctx.load("require('test')").eval::<String>()?);
+        Ok(())
+    })
+    
+}
diff --git a/include-lua-macro/Cargo.toml b/include-lua-macro/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "include-lua-macro"
+version = "0.1.0"
+authors = ["AlphaModder"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "0.15"
+quote = "0.6"
+walkdir = "2.2"
+proc-macro-hack = "0.5.4"
diff --git a/include-lua-macro/src/lib.rs b/include-lua-macro/src/lib.rs
@@ -0,0 +1,77 @@
+extern crate proc_macro;
+
+use std::{env, path::{self, PathBuf}};
+use proc_macro_hack::proc_macro_hack;
+use quote::quote;
+use syn::{
+    parse_macro_input, Result, LitStr, Token,
+    parse::{Parse, ParseStream}, 
+    export::{Span, TokenStream2 as TokenStream}
+};
+use walkdir::WalkDir;
+
+
+#[proc_macro_hack]
+pub fn include_lua(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    parse_macro_input!(input as IncludeLua).expand().into()
+}
+
+struct IncludeLua(LitStr, LitStr);
+
+impl IncludeLua {
+    fn expand(self) -> TokenStream {
+        let manifest_dir: PathBuf = env::var("CARGO_MANIFEST_DIR").expect("Could not locate active Cargo.toml!").into();
+        let lua_dir = manifest_dir.join("src").join(self.0.value());
+        let modules = WalkDir::new(&lua_dir).into_iter().filter_map(|entry| {
+            match entry {
+                Ok(ref entry) if entry.file_type().is_file() => {
+                    let path = entry.path().strip_prefix(&lua_dir).expect("Reached file outside of lua directory???");
+                    if path.extension() == Some("lua".as_ref()) {
+                        let module = if path.parent().is_some() && path.file_stem().expect("Missing file name!") == &"init".as_ref() {
+                            path.parent().unwrap().to_str().map(|s| s.replace(path::MAIN_SEPARATOR, "."))
+                        } 
+                        else {
+                            // Do paths with a different separator show up? If so, fix this.
+                            let mut s = path.to_str().map(|s| s.replace(path::MAIN_SEPARATOR, "."));
+                            s.as_mut().map(|s| s.truncate(s.len() - 4));
+                            s
+                        };
+                        return module.map(|module| (module, path.to_owned()))
+                    }
+                    None
+                }
+                Err(e) => panic!("An error occured while searching for lua modules: {}", e),
+                _ => None,
+            }
+        });
+
+        let add_files = modules.map(|(module, path)| {
+            let module = LitStr::new(&module, Span::call_site());
+            let path = LitStr::new(&PathBuf::from(self.0.value()).join(path).to_string_lossy(), Span::call_site());
+            quote! { files.insert(#module.to_string(), include_str!(#path).to_string()) }
+        });
+
+        let name = &self.1;
+        quote! { {
+            #[allow(unknown_lints)]
+            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
+            #[allow(rust_2018_idioms)]
+            extern crate include_lua as _include_lua;
+
+            let mut files = ::std::collections::HashMap::<String, String>::new();
+            #(#add_files;)*
+            _include_lua::LuaModules::__new(files, #name)
+        } }
+    }
+}
+
+impl Parse for IncludeLua {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let (path_str, name) = {
+            let s1: LitStr = input.parse()?;
+            (s1.clone(), if let Err(_) = input.parse::<Token![:]>() { s1 } else { input.parse()? })
+        };
+        if !input.is_empty() { return Err(input.error("Unknown token in include_lua invocation!")) }
+        Ok(IncludeLua(path_str, name))
+    }
+}
diff --git a/include-lua/Cargo.toml b/include-lua/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "include-lua"
+version = "0.1.0"
+authors = ["AlphaModder"]
+edition = "2018"
+
+[dependencies]
+rlua = "0.16.2"
+include-lua-macro = { path = "../include-lua-macro" }
+proc-macro-hack = "0.5.4"
diff --git a/include-lua/src/lib.rs b/include-lua/src/lib.rs
@@ -0,0 +1,56 @@
+use std::collections::HashMap;
+
+use proc_macro_hack::proc_macro_hack;
+use rlua::{Result, Context, UserData, UserDataMethods, MetaMethod, Value, Table, RegistryKey};
+
+#[proc_macro_hack]
+pub use include_lua_macro::include_lua;
+
+pub struct LuaModules {
+    files: HashMap<String, String>,
+    name: String,
+}
+
+impl LuaModules {
+    #[doc(hidden)] // This is not a public API!
+    pub fn __new(files: HashMap<String, String>, name: &str) -> LuaModules {
+        LuaModules { files: files, name: name.to_string() }
+    }
+}
+
+struct Searcher(LuaModules, RegistryKey);
+
+impl UserData for Searcher {
+     fn add_methods<'lua, M: UserDataMethods<'lua, Self>>(methods: &mut M) {
+        methods.add_meta_method(MetaMethod::Call, |ctx, this, value: String| {
+            Ok(match this.0.files.get(&value) {
+                Some(source) => {
+                    Value::Function(ctx.load(source)
+                        .set_name(&this.0.name)?
+                        .set_environment(ctx.registry_value::<Table>(&this.1)?)?
+                        .into_function()?
+                    )
+                }
+                None => Value::Nil,
+            })
+        });
+    }
+}
+
+pub trait ContextExt<'a> {
+    fn add_modules(&self, modules: LuaModules) -> Result<()>;
+    fn add_modules_with_env(&self, modules: LuaModules, environment: Table<'a>) -> Result<()>;
+}
+
+impl<'a> ContextExt<'a> for Context<'a> {
+    fn add_modules(&self, modules: LuaModules) -> Result<()> {
+        self.add_modules_with_env(modules, self.globals())
+    }
+
+    fn add_modules_with_env(&self, modules: LuaModules, environment: Table<'a>) -> Result<()> {
+        let key = self.create_registry_value(environment)?;
+        let searchers: Table = self.globals().get::<_, Table>("package")?.get("searchers")?;
+        searchers.set(searchers.len()? + 1, Searcher(modules, key))?;
+        Ok(())
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/target`
	`2`	`+*/.rs.bk`
	`3`	`+Cargo.lock`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[workspace]`
	`2`	`+members = ["include-lua", "include-lua-macro", "example" ]`