more reorganization, move simple type defines to types.rs module
This commit is contained in:
parent
8324d9e648
commit
c5a4dfd7eb
|
@ -3,10 +3,11 @@ use std::hash::Hash;
|
|||
use std::string::String as StdString;
|
||||
|
||||
use error::*;
|
||||
use types::{Integer, Number, LightUserData};
|
||||
use lua::*;
|
||||
use string::String;
|
||||
use table::Table;
|
||||
use userdata::{LightUserData, UserData, AnyUserData};
|
||||
use userdata::{UserData, AnyUserData};
|
||||
|
||||
impl<'lua> ToLua<'lua> for Value<'lua> {
|
||||
fn to_lua(self, _: &'lua Lua) -> Result<Value<'lua>> {
|
||||
|
|
|
@ -46,6 +46,7 @@ pub mod ffi;
|
|||
#[macro_use]
|
||||
mod util;
|
||||
mod error;
|
||||
mod types;
|
||||
mod lua;
|
||||
mod conversion;
|
||||
mod multi;
|
||||
|
@ -57,11 +58,12 @@ mod userdata;
|
|||
mod tests;
|
||||
|
||||
pub use error::{Error, Result, ExternalError, ExternalResult};
|
||||
pub use lua::{Value, Nil, ToLua, FromLua, MultiValue, ToLuaMulti, FromLuaMulti, Integer, Number,
|
||||
Function, ThreadStatus, Thread, Lua};
|
||||
pub use types::{Integer, Number, LightUserData};
|
||||
pub use multi::Variadic;
|
||||
pub use string::String;
|
||||
pub use table::{Table, TablePairs, TableSequence};
|
||||
pub use userdata::{LightUserData, MetaMethod, UserDataMethods, UserData, AnyUserData};
|
||||
pub use userdata::{MetaMethod, UserDataMethods, UserData, AnyUserData};
|
||||
pub use lua::{Value, Nil, ToLua, FromLua, MultiValue, ToLuaMulti, FromLuaMulti, Function,
|
||||
ThreadStatus, Thread, Lua};
|
||||
|
||||
pub mod prelude;
|
||||
|
|
43
src/lua.rs
43
src/lua.rs
|
@ -1,4 +1,4 @@
|
|||
use std::{fmt, ptr, str};
|
||||
use std::{ptr, str};
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use std::iter::FromIterator;
|
||||
use std::cell::RefCell;
|
||||
|
@ -15,9 +15,10 @@ use libc;
|
|||
use ffi;
|
||||
use error::*;
|
||||
use util::*;
|
||||
use types::{Integer, Number, LightUserData, Callback, LuaRef};
|
||||
use string::String;
|
||||
use table::Table;
|
||||
use userdata::{LightUserData, UserDataMethods, MetaMethod, UserData, AnyUserData};
|
||||
use userdata::{UserDataMethods, MetaMethod, UserData, AnyUserData};
|
||||
|
||||
/// A dynamically typed Lua value.
|
||||
#[derive(Debug, Clone)]
|
||||
|
@ -145,44 +146,6 @@ pub trait FromLuaMulti<'lua>: Sized {
|
|||
fn from_lua_multi(values: MultiValue<'lua>, lua: &'lua Lua) -> Result<Self>;
|
||||
}
|
||||
|
||||
pub(crate) type Callback<'lua> = Box<
|
||||
FnMut(&'lua Lua, MultiValue<'lua>) -> Result<MultiValue<'lua>>
|
||||
+ 'lua,
|
||||
>;
|
||||
|
||||
pub(crate) struct LuaRef<'lua> {
|
||||
pub lua: &'lua Lua,
|
||||
pub registry_id: c_int,
|
||||
}
|
||||
|
||||
impl<'lua> fmt::Debug for LuaRef<'lua> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(f, "LuaRef({})", self.registry_id)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'lua> Clone for LuaRef<'lua> {
|
||||
fn clone(&self) -> Self {
|
||||
unsafe {
|
||||
self.lua.push_ref(self.lua.state, self);
|
||||
self.lua.pop_ref(self.lua.state)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'lua> Drop for LuaRef<'lua> {
|
||||
fn drop(&mut self) {
|
||||
unsafe {
|
||||
ffi::luaL_unref(self.lua.state, ffi::LUA_REGISTRYINDEX, self.registry_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Type of Lua integer numbers.
|
||||
pub type Integer = ffi::lua_Integer;
|
||||
/// Type of Lua floating point numbers.
|
||||
pub type Number = ffi::lua_Number;
|
||||
|
||||
/// Handle to an internal Lua function.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Function<'lua>(LuaRef<'lua>);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
use std::{slice, str};
|
||||
|
||||
use ffi;
|
||||
use lua::LuaRef;
|
||||
use error::{Error, Result};
|
||||
use util::{check_stack, stack_guard};
|
||||
use types::LuaRef;
|
||||
|
||||
/// Handle to an internal Lua string.
|
||||
///
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
use std::marker::PhantomData;
|
||||
|
||||
use ffi;
|
||||
use lua::{LuaRef, ToLua, FromLua, Integer};
|
||||
use util::*;
|
||||
use error::Result;
|
||||
use util::*;
|
||||
use types::{Integer, LuaRef};
|
||||
use lua::{ToLua, FromLua};
|
||||
|
||||
/// Handle to an internal Lua table.
|
||||
#[derive(Clone, Debug)]
|
||||
|
|
|
@ -0,0 +1,76 @@
|
|||
use std::fmt;
|
||||
use std::os::raw::{c_int, c_void};
|
||||
|
||||
use ffi;
|
||||
use error::Result;
|
||||
use lua::{MultiValue, Lua};
|
||||
|
||||
/// Type of Lua integer numbers.
|
||||
pub type Integer = ffi::lua_Integer;
|
||||
/// Type of Lua floating point numbers.
|
||||
pub type Number = ffi::lua_Number;
|
||||
|
||||
/// A "light" userdata value. Equivalent to an unmanaged raw pointer.
|
||||
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
|
||||
pub struct LightUserData(pub *mut c_void);
|
||||
|
||||
pub(crate) type Callback<'lua> = Box<
|
||||
FnMut(&'lua Lua, MultiValue<'lua>) -> Result<MultiValue<'lua>>
|
||||
+ 'lua,
|
||||
>;
|
||||
|
||||
pub(crate) struct LuaRef<'lua> {
|
||||
pub lua: &'lua Lua,
|
||||
pub registry_id: c_int,
|
||||
}
|
||||
|
||||
impl<'lua> fmt::Debug for LuaRef<'lua> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(f, "LuaRef({})", self.registry_id)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'lua> Clone for LuaRef<'lua> {
|
||||
fn clone(&self) -> Self {
|
||||
unsafe {
|
||||
self.lua.push_ref(self.lua.state, self);
|
||||
self.lua.pop_ref(self.lua.state)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'lua> Drop for LuaRef<'lua> {
|
||||
fn drop(&mut self) {
|
||||
unsafe {
|
||||
ffi::luaL_unref(self.lua.state, ffi::LUA_REGISTRYINDEX, self.registry_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::LightUserData;
|
||||
use lua::{Function, Lua};
|
||||
|
||||
use std::os::raw::c_void;
|
||||
|
||||
#[test]
|
||||
fn test_lightuserdata() {
|
||||
let lua = Lua::new();
|
||||
let globals = lua.globals();
|
||||
lua.exec::<()>(
|
||||
r#"
|
||||
function id(a)
|
||||
return a
|
||||
end
|
||||
"#,
|
||||
None,
|
||||
).unwrap();
|
||||
let res = globals
|
||||
.get::<_, Function>("id")
|
||||
.unwrap()
|
||||
.call::<_, LightUserData>(LightUserData(42 as *mut c_void))
|
||||
.unwrap();
|
||||
assert_eq!(res, LightUserData(42 as *mut c_void));
|
||||
}
|
||||
}
|
|
@ -1,17 +1,13 @@
|
|||
use std::cell::{RefCell, Ref, RefMut};
|
||||
use std::marker::PhantomData;
|
||||
use std::collections::HashMap;
|
||||
use std::os::raw::c_void;
|
||||
use std::string::String as StdString;
|
||||
|
||||
use ffi;
|
||||
use error::*;
|
||||
use util::*;
|
||||
use lua::{FromLua, FromLuaMulti, ToLuaMulti, Callback, LuaRef, Lua};
|
||||
|
||||
/// A "light" userdata value. Equivalent to an unmanaged raw pointer.
|
||||
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
|
||||
pub struct LightUserData(pub *mut c_void);
|
||||
use types::{Callback, LuaRef};
|
||||
use lua::{FromLua, FromLuaMulti, ToLuaMulti, Lua};
|
||||
|
||||
/// Kinds of metamethods that can be overridden.
|
||||
#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
|
||||
|
@ -400,33 +396,11 @@ impl<'lua> AnyUserData<'lua> {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{LightUserData, UserData, MetaMethod, UserDataMethods};
|
||||
use super::{UserData, MetaMethod, UserDataMethods};
|
||||
use error::ExternalError;
|
||||
use string::String;
|
||||
use lua::{Function, Lua};
|
||||
|
||||
use std::os::raw::c_void;
|
||||
|
||||
#[test]
|
||||
fn test_lightuserdata() {
|
||||
let lua = Lua::new();
|
||||
let globals = lua.globals();
|
||||
lua.exec::<()>(
|
||||
r#"
|
||||
function id(a)
|
||||
return a
|
||||
end
|
||||
"#,
|
||||
None,
|
||||
).unwrap();
|
||||
let res = globals
|
||||
.get::<_, Function>("id")
|
||||
.unwrap()
|
||||
.call::<_, LightUserData>(LightUserData(42 as *mut c_void))
|
||||
.unwrap();
|
||||
assert_eq!(res, LightUserData(42 as *mut c_void));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_user_data() {
|
||||
struct UserData1(i64);
|
||||
|
|
Loading…
Reference in New Issue