halton 0.2.1 → 0.2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 393f4cb4ab8e899f4c8db51c402096022d3adaf2094f201a450029ca0aec9bfa
-  data.tar.gz: dea785edce51a7a2249f209ff744748fc77ea426f34de9aa318d4acee5b3a814
+  metadata.gz: 367da6d10b20e537ed6a0bb6153bc95ab3c09313b9edd71736315708d60eafbe
+  data.tar.gz: ca90d4c261f13077f2294e23d14de023074649a4e0e39faa56ca550e6eeb0210
 SHA512:
-  metadata.gz: 9174a270ab128d1bb8c1b67b2859155155c8e7f3bd26f15b58b6d92d2b3ccd5c68d15cc788b4118cbf9526ba711e96cce844eb38f82274826756bfb6eaada0df
-  data.tar.gz: 62665649ae6e0c70da6bcbbe70a9cde2257a4df7006815cc1d3382025758dd3c809b09042ecb8e72a451916fcacff341fa31f198909398fd2e1df35475f80838
+  metadata.gz: f936ff151b3964e44220d8a1036e0ed710eaf7821e633e361ef36b21307569c4be6bee16ee79cecc6c8492f6f69755745e91d953fd75e79308a0468a8fe63e0c
+  data.tar.gz: fa78a84ab664803a29762e9c968c5dd048f9655525f47134622a687fa7e9dfb9d86f169ab2ccb2fb7a2c8a279c2683c09d489344d5767e9cc689c1325bdd4445

data/ext/halton/Cargo.lock

@@ -0,0 +1,445 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.59.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "clap",
+ "env_logger",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim 0.8.0",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "darling"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
+[[package]]
+name = "halton"
+version = "0.1.0"
+dependencies = [
+ "halton 0.2.1",
+ "magnus",
+]
+
+[[package]]
+name = "halton"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be629448e3d85a1be12868f190df524655fea8ec3f143e14d803e298f618acae"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
+
+[[package]]
+name = "libloading"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "magnus"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e772e3622600833393ebd9c89a5f963a9c9699528cb60764e7f178e0cc96344a"
+dependencies = [
+ "bindgen",
+ "magnus-macros",
+]
+
+[[package]]
+name = "magnus-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27968fcabe2ef7e35b8331d71a62882282996f6222c133c0255cf7f33b8d9b48"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "memchr"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+ "version_check",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "which"
+version = "4.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
+dependencies = [
+ "either",
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

data/ext/halton/Cargo.toml

@@ -9,5 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 halton = "0.2.1"
-lazy_static = "1"
-rutie = "0.8"
+magnus = "0.3.1"

data/ext/halton/Rakefile

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require "shellwords"
+
 class RakeCargoHelper
   attr_reader :gemname
 
-  def initialize(gemname)
+  def initialize(gemname=File.basename(__dir__))
     @gemname = gemname
   end
 
@@ -36,13 +38,63 @@ class RakeCargoHelper
     @cargo_target_dir = dir || "target"
   end
 
+  def self.flags
+    cc_flags = Shellwords.split(RbConfig.expand(RbConfig::MAKEFILE_CONFIG["CC"].dup))
+
+    ["-C", "linker=#{cc_flags.shift}",
+      *cc_flags.flat_map {|a| ["-C", "link-arg=#{a}"] },
+      "-L", "native=#{RbConfig::CONFIG["libdir"]}",
+      *dld_flags,
+      *platform_flags]
+  end
+
+  def self.dld_flags
+    Shellwords.split(RbConfig::CONFIG["DLDFLAGS"]).flat_map do |arg|
+      arg = arg.gsub(/\$\((\w+)\)/) do
+        $1 == "DEFFILE" ? nil : RbConfig::CONFIG[name]
+      end.strip
+      next [] if arg.empty?
+
+      transform_flag(arg)
+    end
+  end
+
+  def self.platform_flags
+    return unless RbConfig::CONFIG["target_os"] =~ /mingw/i
+
+    [*Shellwords.split(RbConfig::CONFIG["LIBRUBYARG"]).flat_map {|arg| transform_flag(arg)},
+      "-C", "link-arg=-Wl,--dynamicbase",
+      "-C", "link-arg=-Wl,--disable-auto-image-base",
+      "-C", "link-arg=-static-libgcc"]
+  end
+
+  def self.transform_flag(arg)
+    k, v = arg.split(/(?<=..)/, 2)
+    case k
+    when "-L"
+      [k, "native=#{v}"]
+    when "-l"
+      [k, v]
+    when "-F"
+      ["-l", "framework=#{v}"]
+    else
+      ["-C", "link_arg=#{k}#{v}"]
+    end
+  end
+
   def install_dir
     File.expand_path(File.join("..", "..", "lib", gemname), __dir__)
   end
 
   def rust_name
     prefix = "lib" unless Gem.win_platform?
-    suffix = RbConfig::CONFIG["target_os"] =~ /darwin/i ? ".dylib" : ".so"
+    suffix = if RbConfig::CONFIG["target_os"] =~ /darwin/i
+      ".dylib"
+    elsif Gem.win_platform?
+      ".dll"
+    else
+      ".so"
+    end
     "#{prefix}#{gemname}#{suffix}"
   end
 
@@ -61,22 +113,23 @@ end
 
 desc "build gem native extension and copy to lib"
 task install: [:cd, :build] do
-  helper = RakeCargoHelper.new("halton")
+  helper = RakeCargoHelper.new
   profile_dir = @dev ? "debug" : "release"
   source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
   dest = File.join(helper.install_dir, helper.ruby_name)
   mkdir_p(helper.install_dir)
+  rm(dest) if File.exist?(dest)
   cp(source, dest)
 end
 
 desc "build gem native extension"
 task build: [:cargo, :cd] do
-  sh "cargo", "build", *("--release" unless @dev)
+  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.flags
 end
 
 desc "clean up release build artifacts"
 task clean: [:cargo, :cd] do
-  # sh "cargo clean --release"
+  sh "cargo clean --release"
 end
 
 desc "clean up build artifacts"

data/ext/halton/src/lib.rs

@@ -1,88 +1,121 @@
-use lazy_static::lazy_static;
-use rutie::{
-    class, methods, module, wrappable_struct, AnyObject, Class, Float, Integer, Module, NilClass,
-    Object, VM,
+use std::cell::RefCell;
+
+use magnus::{
+    block::{block_given, Yield, YieldSplat, YieldValues},
+    define_module, exception, function, method,
+    prelude::*,
+    Error, RArray, Value,
 };
 
-macro_rules! unwrap_raise {
-    ($val:expr) => {
-        #[allow(clippy::redundant_closure)]
-        $val.map_err(|e| VM::raise_ex(e))
-            .expect("exception should have been raised")
-    };
-}
+#[magnus::wrap(class = "Halton::Sequence", free_immediatly, size)]
+struct Sequence(RefCell<halton::Sequence>);
 
-macro_rules! raise {
-    ($class:ty, $($arg:tt)*) => {{
-        VM::raise(Class::from_existing(stringify!($class)), &format!($($arg)*));
-        unreachable!()
-    }};
-}
+impl Sequence {
+    fn new(base: u8) -> Self {
+        Self(RefCell::new(halton::Sequence::new(base)))
+    }
 
-fn any_object_or_nil<T>(obj: Option<T>) -> AnyObject
-where
-    T: Into<AnyObject>,
-{
-    obj.map(Into::into)
-        .unwrap_or_else(|| NilClass::new().into())
-}
+    fn next(&self) -> Result<f64, Error> {
+        match self.0.try_borrow_mut().unwrap().next() {
+            Some(f) => Ok(f),
+            None => Err(Error::new(
+                exception::stop_iteration(),
+                "iteration reached an end",
+            )),
+        }
+    }
 
-module!(Halton);
+    fn skip(&self, n: usize) {
+        self.0.try_borrow_mut().unwrap().nth(n);
+    }
+
+    fn remaining(&self) -> Option<usize> {
+        self.0.try_borrow().unwrap().size_hint().1
+    }
+}
 
-methods!(
-    Halton,
-    rtself,
-    fn halton_number(base: Integer, index: Integer) -> Float {
-        Float::new(halton::number(
-            unwrap_raise!(base).to_u64() as u8,
-            unwrap_raise!(index).to_u64() as usize,
-        ))
+fn each_one(rb_self: Value, base: u8) -> Yield<impl Iterator<Item = f64>> {
+    if !block_given() {
+        return Yield::Enumerator(rb_self.enumeratorize("each_one", (base,)));
     }
-);
+    Yield::Iter(halton::Sequence::new(base))
+}
 
-wrappable_struct!(halton::Sequence, SequenceWrapper, SEQUENCE_WRAPPER);
+fn each_pair(
+    rb_self: Value,
+    x_base: u8,
+    y_base: u8,
+) -> YieldValues<impl Iterator<Item = (f64, f64)>> {
+    if !block_given() {
+        return YieldValues::Enumerator(rb_self.enumeratorize("each_pair", (x_base, y_base)));
+    }
+    let seq_x = halton::Sequence::new(x_base);
+    let seq_y = halton::Sequence::new(y_base);
+    YieldValues::Iter(seq_x.zip(seq_y))
+}
 
-class!(Sequence);
+fn each_triple(
+    rb_self: Value,
+    x_base: u8,
+    y_base: u8,
+    z_base: u8,
+) -> YieldValues<impl Iterator<Item = (f64, f64, f64)>> {
+    if !block_given() {
+        return YieldValues::Enumerator(
+            rb_self.enumeratorize("each_triple", (x_base, y_base, z_base)),
+        );
+    }
+    let seq_x = halton::Sequence::new(x_base);
+    let seq_y = halton::Sequence::new(y_base);
+    let seq_z = halton::Sequence::new(z_base);
+    YieldValues::Iter(seq_x.zip(seq_y).zip(seq_z).map(|((x, y), z)| (x, y, z)))
+}
 
-methods!(
-    Sequence,
-    rtself,
-    fn halton_sequence_new(base: Integer) -> AnyObject {
-        let seq = halton::Sequence::new(unwrap_raise!(base).to_u64() as u8);
-        Module::from_existing("Halton")
-            .get_nested_class("Sequence")
-            .wrap_data(seq, &*SEQUENCE_WRAPPER)
-    },
-    fn halton_sequence_next() -> Float {
-        let seq = rtself.get_data_mut(&*SEQUENCE_WRAPPER);
-        match seq.next() {
-            Some(f) => Float::new(f),
-            None => raise!(StopIteration, "iteration reached an end"),
-        }
-    },
-    fn halton_sequence_skip(n: Integer) -> NilClass {
-        let seq = rtself.get_data_mut(&*SEQUENCE_WRAPPER);
-        seq.nth(unwrap_raise!(n).to_u64() as usize);
-        NilClass::new()
-    },
-    fn halton_sequence_remaining() -> AnyObject {
-        let seq = rtself.get_data(&*SEQUENCE_WRAPPER);
-        any_object_or_nil(seq.size_hint().1.map(|i| Integer::new(i as i64)))
+fn each_many(
+    rb_self: Value,
+    bases: &[Value],
+) -> Result<YieldSplat<impl Iterator<Item = RArray>>, Error> {
+    if bases.is_empty() {
+        return Err(Error::new(
+            exception::arg_error(),
+            "wrong number of arguments (given 0, expected 1+)",
+        ));
+    }
+    if !block_given() {
+        return Ok(YieldSplat::Enumerator(
+            rb_self.enumeratorize("each_many", bases),
+        ));
     }
-);
+    let mut seqs = bases
+        .iter()
+        .map(|v| v.try_convert().map(halton::Sequence::new))
+        .collect::<Result<Vec<_>, _>>()?;
+    let mut buffer = Vec::<Value>::with_capacity(seqs.len());
+    Ok(YieldSplat::Iter(std::iter::from_fn(move || {
+        buffer.clear();
+        for seq in &mut seqs {
+            if let Some(v) = seq.next() {
+                buffer.push(v.into());
+            } else {
+                return None;
+            }
+        }
+        Some(RArray::from_slice(&buffer))
+    })))
+}
 
-#[allow(non_snake_case)]
-#[no_mangle]
-pub extern "C" fn Init_halton() {
-    Module::new("Halton").define(|module| {
-        module.def_self("number", halton_number);
-        module
-            .define_nested_class("Sequence", None)
-            .define(|class| {
-                class.def_self("new", halton_sequence_new);
-                class.def("next", halton_sequence_next);
-                class.def("skip", halton_sequence_skip);
-                class.def("remaining", halton_sequence_remaining);
-            });
-    });
+#[magnus::init]
+fn init() -> Result<(), Error> {
+    let module = define_module("Halton")?;
+    module.define_singleton_method("number", function!(halton::number, 2))?;
+    module.define_singleton_method("each_one", method!(each_one, 1))?;
+    module.define_singleton_method("each_pair", method!(each_pair, 2))?;
+    module.define_singleton_method("each_triple", method!(each_triple, 3))?;
+    module.define_singleton_method("each_many", method!(each_many, -1))?;
+    let class = module.define_class("Sequence", Default::default())?;
+    class.define_singleton_method("new", function!(Sequence::new, 1))?;
+    class.define_method("next", method!(Sequence::next, 0))?;
+    class.define_method("skip", method!(Sequence::skip, 1))?;
+    class.define_method("remaining", method!(Sequence::remaining, 0))?;
+    Ok(())
 }

data/lib/halton.rb

@@ -68,33 +68,17 @@ module Halton
   #
   # The numbers yielded will be in the range > 0 and < 1.
   #
-  def self.each(base, *bases)
-    return to_enum(__method__, base, *bases) unless block_given?
-
-    if bases.empty?
-      seq = Sequence.new(base)
-      loop {yield seq.next}
-      return nil
-    end
-
-    if bases.length == 1
-      x = Sequence.new(base)
-      y = Sequence.new(bases.first)
-      loop {yield x.next, y.next}
-      return nil
+  def self.each(base, *bases, &block)
+    case bases.length
+    when 0
+      each_one(base, &block)
+    when 1
+      each_pair(base, bases.first, &block)
+    when 2
+      each_triple(base, bases.first, bases.last, &block)
+    else
+      each_many(*bases.unshift(base), &block)
     end
-
-    if bases.length == 2
-      x = Sequence.new(base)
-      y = Sequence.new(bases.first)
-      z = Sequence.new(bases.last)
-      loop {yield x.next, y.next, z.next}
-      return nil
-    end
-
-    seqs = bases.unshift(base).map {|b| Sequence.new(b)}
-    loop {yield(*seqs.map(&:next))}
-    nil
   end
 
   # Halton::Sequence implements the fast generation of Halton sequences.
@@ -129,7 +113,6 @@ module Halton
     #
     # Can be used to efficiently skip large sections of the sequence. For small
     # values of +n+ simply advances the sequence +n+ times.
-    #
 
     ##
     # :method: remaining

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halton
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.1.3
 platform: ruby
 authors:
 - Mat Sadler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,6 +36,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
+- ext/halton/Cargo.lock
 - ext/halton/Cargo.toml
 - ext/halton/Rakefile
 - ext/halton/src/lib.rs
@@ -51,7 +52,7 @@ rdoc_options:
 - "--charset"
 - utf-8
 - "--exclude"
-- ext/**
+- ext/
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Rust >= 1.51.0
-rubygems_version: 3.2.3
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A module for generating Halton sequences