zig_example 0.2.0 → 0.3.1

data/ext/zigrb_100doors/build.zig

@@ -4,10 +4,6 @@ pub fn build(b: *std.Build) void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
 
-    var rubylibdir = std.os.getenv("RUBYLIBDIR") orelse "";
-    var rubyhdrdir = std.os.getenv("RUBYHDRDIR") orelse "";
-    var rubyarchhdrdir = std.os.getenv("RUBYARCHHDRDIR") orelse "";
-
     ////////////////////////////////////////////////////////////////
     // lib
 
@@ -18,10 +14,6 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    lib.addLibraryPath(rubylibdir);
-    lib.addIncludePath(rubyhdrdir);
-    lib.addIncludePath(rubyarchhdrdir);
-
     lib.linkSystemLibrary("ruby");
     lib.linkSystemLibrary("c");
 
@@ -36,10 +28,6 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    unit_tests.addLibraryPath(rubylibdir);
-    unit_tests.addIncludePath(rubyhdrdir);
-    unit_tests.addIncludePath(rubyarchhdrdir);
-
     unit_tests.linkSystemLibrary("ruby");
     unit_tests.linkSystemLibrary("c");
 

data/ext/zigrb_100doors/extconf.rb

@@ -1,20 +1,3 @@
-require 'mkmf'
+require_relative '../mkmf'
 
-$objs = ['']
-$srcs = ['']
-TARGET = 'libzigrb_100doors'
-
-create_makefile TARGET
-File.open('Makefile', 'a') do |f|
-  f.puts <<~MFILE
-
-    clean: clean-zig
-    clean-zig:
-    \t-$(Q)$(RM) -rf zig-cache zig-out
-
-    #{TARGET}.so: Makefile build.zig src/main.zig
-    \tenv -u DESTDIR RUBYLIBDIR=$(rubylibdir) RUBYHDRDIR=$(rubyhdrdir) RUBYARCHHDRDIR=$(rubyarchhdrdir) zig build test install
-    \tcp -v zig-out/lib/#{TARGET}.so .
-
-  MFILE
-end
+create_makefile 'libzigrb_100doors'

data/ext/zigrb_ackermann/build.zig

@@ -4,10 +4,6 @@ pub fn build(b: *std.Build) void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
 
-    var rubylibdir = std.os.getenv("RUBYLIBDIR") orelse "";
-    var rubyhdrdir = std.os.getenv("RUBYHDRDIR") orelse "";
-    var rubyarchhdrdir = std.os.getenv("RUBYARCHHDRDIR") orelse "";
-
     ////////////////////////////////////////////////////////////////
     // lib
 
@@ -18,10 +14,6 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    lib.addLibraryPath(rubylibdir);
-    lib.addIncludePath(rubyhdrdir);
-    lib.addIncludePath(rubyarchhdrdir);
-
     lib.linkSystemLibrary("ruby");
     lib.linkSystemLibrary("c");
 
@@ -36,10 +28,6 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    unit_tests.addLibraryPath(rubylibdir);
-    unit_tests.addIncludePath(rubyhdrdir);
-    unit_tests.addIncludePath(rubyarchhdrdir);
-
     unit_tests.linkSystemLibrary("ruby");
     unit_tests.linkSystemLibrary("c");
 

data/ext/zigrb_ackermann/extconf.rb

@@ -1,20 +1,3 @@
-require 'mkmf'
+require_relative '../mkmf'
 
-$objs = ['']
-$srcs = ['']
-TARGET = 'libzigrb_ackermann'
-
-create_makefile TARGET
-File.open('Makefile', 'a') do |f|
-  f.puts <<~MFILE
-
-    clean: clean-zig
-    clean-zig:
-    \t-$(Q)$(RM) -rf zig-cache zig-out
-
-    #{TARGET}.so: Makefile build.zig src/main.zig
-    \tenv -u DESTDIR RUBYLIBDIR=$(rubylibdir) RUBYHDRDIR=$(rubyhdrdir) RUBYARCHHDRDIR=$(rubyarchhdrdir) zig build test install
-    \tcp -v zig-out/lib/#{TARGET}.so .
-
-  MFILE
-end
+create_makefile 'libzigrb_ackermann'

data/ext/zigrb_lucas_lehmer/build.zig

@@ -0,0 +1,53 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const optimize = b.standardOptimizeOption(.{});
+    const target = b.standardTargetOptions(.{});
+
+    ////////////////////////////////////////////////////////////////
+    // lib
+
+    const clib = b.addStaticLibrary(.{
+        .name = "zigrb_lucas_lehmer",
+        .root_source_file = .{ .path = "src/lucas_lehmer.c" },
+        .target = target,
+        .optimize = optimize,
+    });
+    clib.force_pic = true;
+
+    clib.linkSystemLibrary("gmp");
+
+    const lib = b.addSharedLibrary(.{
+        .name = "zigrb_lucas_lehmer",
+        .root_source_file = .{ .path = "src/wrapper.zig" },
+        .target = target,
+        .optimize = optimize,
+    });
+
+    lib.linkSystemLibrary("ruby");
+    lib.linkSystemLibrary("c");
+
+    lib.addIncludePath("src");
+    lib.linkLibrary(clib);
+
+    b.installArtifact(lib);
+
+    ////////////////////////////////////////////////////////////////
+    // test
+
+    const unit_tests = b.addTest(.{
+        .root_source_file = .{ .path = "src/wrapper.zig" },
+        .target = target,
+        .optimize = optimize,
+    });
+
+    unit_tests.linkSystemLibrary("ruby");
+    unit_tests.linkSystemLibrary("c");
+
+    unit_tests.addIncludePath("src");
+    unit_tests.linkLibrary(clib);
+
+    const run_unit_tests = b.addRunArtifact(unit_tests);
+    const test_step = b.step("test", "Run unit tests");
+    test_step.dependOn(&run_unit_tests.step);
+}

data/ext/zigrb_lucas_lehmer/extconf.rb

@@ -0,0 +1,3 @@
+require_relative '../mkmf'
+
+create_makefile 'libzigrb_lucas_lehmer'

data/ext/zigrb_lucas_lehmer/src/lucas_lehmer.c

@@ -0,0 +1,60 @@
+#include <gmp.h>
+
+int lucas_lehmer(unsigned long p)
+{
+  mpz_t V, mp, t;
+  unsigned long k, tlim;
+  int res;
+
+  if (p == 2) return 1;
+  if (!(p&1)) return 0;
+
+  mpz_init_set_ui(t, p);
+  if (!mpz_probab_prime_p(t, 25)) /* if p is composite, 2^p-1 is not prime */
+    { mpz_clear(t); return 0; }
+
+  if (p < 23)                     /* trust the PRP test for these values */
+    { mpz_clear(t); return (p != 11); }
+
+  mpz_init(mp);
+  mpz_setbit(mp, p);
+  mpz_sub_ui(mp, mp, 1);
+
+  /* If p=3 mod 4 and p,2p+1 both prime, then 2p+1 | 2^p-1.  Cheap test. */
+  if (p > 3 && p % 4 == 3) {
+    mpz_mul_ui(t, t, 2);
+    mpz_add_ui(t, t, 1);
+    if (mpz_probab_prime_p(t,25) && mpz_divisible_p(mp, t))
+      { mpz_clear(mp); mpz_clear(t); return 0; }
+  }
+
+  /* Do a little trial division first.  Saves quite a bit of time. */
+  tlim = p/2;
+  if (tlim > (ULONG_MAX/(2*p)))
+    tlim = ULONG_MAX/(2*p);
+  for (k = 1; k < tlim; k++) {
+    unsigned long q = 2*p*k+1;
+    /* factor must be 1 or 7 mod 8 and a prime */
+    if ( (q%8==1 || q%8==7) &&
+         q % 3 && q % 5 && q % 7 &&
+         mpz_divisible_ui_p(mp, q) )
+      { mpz_clear(mp); mpz_clear(t); return 0; }
+  }
+
+  mpz_init_set_ui(V, 4);
+  for (k = 3; k <= p; k++) {
+    mpz_mul(V, V, V);
+    mpz_sub_ui(V, V, 2);
+    /* mpz_mod(V, V, mp) but more efficiently done given mod 2^p-1 */
+    if (mpz_sgn(V) < 0) mpz_add(V, V, mp);
+    /* while (n > mp) { n = (n >> p) + (n & mp) } if (n==mp) n=0 */
+    /* but in this case we can have at most one loop plus a carry */
+    mpz_tdiv_r_2exp(t, V, p);
+    mpz_tdiv_q_2exp(V, V, p);
+    mpz_add(V, V, t);
+    while (mpz_cmp(V, mp) >= 0) mpz_sub(V, V, mp);
+  }
+  res = !mpz_sgn(V);
+  mpz_clear(t); mpz_clear(mp); mpz_clear(V);
+  return res;
+}

data/ext/zigrb_lucas_lehmer/src/lucas_lehmer.h

@@ -0,0 +1 @@
+int lucas_lehmer(unsigned long p);

data/ext/zigrb_lucas_lehmer/src/wrapper.zig

@@ -0,0 +1,42 @@
+const std = @import("std");
+const testing = std.testing;
+
+const ruby = @cImport(@cInclude("ruby/ruby.h"));
+const clib = @cImport(@cInclude("lucas_lehmer.h"));
+
+fn rb_lucas_lehmer(...) callconv(.C) ruby.VALUE {
+    var ap = @cVaStart();
+    defer @cVaEnd(&ap);
+
+    // first argument is `self` in ruby; discard it
+    var self = @cVaArg(&ap, ruby.VALUE); _ = self;
+
+    // back and forth type conversions + delegation
+    var p = ruby.NUM2ULONG(@cVaArg(&ap, ruby.VALUE));
+    return if (clib.lucas_lehmer(p) == 1) ruby.Qtrue else ruby.Qfalse;
+}
+
+export fn Init_libzigrb_lucas_lehmer() void {
+    ruby.ruby_init();
+    var zig_rb_class: ruby.VALUE = ruby.rb_define_class("ZigExample", ruby.rb_cObject);
+    _ = ruby.rb_define_method(zig_rb_class, "lucas_lehmer", rb_lucas_lehmer, 1);
+}
+
+test "lucas_lehmer 1 passes" {
+    try testing.expect(clib.lucas_lehmer(1) == 0);
+}
+test "lucas_lehmer 2 passes" {
+    try testing.expect(clib.lucas_lehmer(2) == 1);
+}
+test "lucas_lehmer 3 passes" {
+    try testing.expect(clib.lucas_lehmer(3) == 1);
+}
+test "lucas_lehmer 4 passes" {
+    try testing.expect(clib.lucas_lehmer(4) == 0);
+}
+test "lucas_lehmer 5 passes" {
+    try testing.expect(clib.lucas_lehmer(5) == 1);
+}
+test "lucas_lehmer 11 passes" {
+    try testing.expect(clib.lucas_lehmer(11) == 0);
+}

data/lib/zig_example/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ZigExample
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

data/lib/zig_example.rb

@@ -3,6 +3,7 @@ require_relative 'zig_example/version'
 %w{
   zigrb_100doors
   zigrb_ackermann
+  zigrb_lucas_lehmer
 }.each do |lib|
   begin
     require "lib#{lib}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zig_example
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Frank J. Cameron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -17,14 +17,74 @@ executables: []
 extensions:
 - ext/zigrb_100doors/extconf.rb
 - ext/zigrb_ackermann/extconf.rb
+- ext/zigrb_lucas_lehmer/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/mkmf.rb
+- ext/openssl/openssl_missing.c
+- ext/openssl/openssl_missing.h
+- ext/openssl/ossl.c
+- ext/openssl/ossl.h
+- ext/openssl/ossl_asn1.c
+- ext/openssl/ossl_asn1.h
+- ext/openssl/ossl_bio.c
+- ext/openssl/ossl_bio.h
+- ext/openssl/ossl_bn.c
+- ext/openssl/ossl_bn.h
+- ext/openssl/ossl_cipher.c
+- ext/openssl/ossl_cipher.h
+- ext/openssl/ossl_config.c
+- ext/openssl/ossl_config.h
+- ext/openssl/ossl_digest.c
+- ext/openssl/ossl_digest.h
+- ext/openssl/ossl_engine.c
+- ext/openssl/ossl_engine.h
+- ext/openssl/ossl_hmac.c
+- ext/openssl/ossl_hmac.h
+- ext/openssl/ossl_kdf.c
+- ext/openssl/ossl_kdf.h
+- ext/openssl/ossl_ns_spki.c
+- ext/openssl/ossl_ns_spki.h
+- ext/openssl/ossl_ocsp.c
+- ext/openssl/ossl_ocsp.h
+- ext/openssl/ossl_pkcs12.c
+- ext/openssl/ossl_pkcs12.h
+- ext/openssl/ossl_pkcs7.c
+- ext/openssl/ossl_pkcs7.h
+- ext/openssl/ossl_pkey.c
+- ext/openssl/ossl_pkey.h
+- ext/openssl/ossl_pkey_dh.c
+- ext/openssl/ossl_pkey_dsa.c
+- ext/openssl/ossl_pkey_ec.c
+- ext/openssl/ossl_pkey_rsa.c
+- ext/openssl/ossl_rand.c
+- ext/openssl/ossl_rand.h
+- ext/openssl/ossl_ssl.c
+- ext/openssl/ossl_ssl.h
+- ext/openssl/ossl_ssl_session.c
+- ext/openssl/ossl_ts.c
+- ext/openssl/ossl_ts.h
+- ext/openssl/ossl_x509.c
+- ext/openssl/ossl_x509.h
+- ext/openssl/ossl_x509attr.c
+- ext/openssl/ossl_x509cert.c
+- ext/openssl/ossl_x509crl.c
+- ext/openssl/ossl_x509ext.c
+- ext/openssl/ossl_x509name.c
+- ext/openssl/ossl_x509req.c
+- ext/openssl/ossl_x509revoked.c
+- ext/openssl/ossl_x509store.c
 - ext/zigrb_100doors/build.zig
 - ext/zigrb_100doors/extconf.rb
 - ext/zigrb_100doors/src/main.zig
 - ext/zigrb_ackermann/build.zig
 - ext/zigrb_ackermann/extconf.rb
 - ext/zigrb_ackermann/src/main.zig
+- ext/zigrb_lucas_lehmer/build.zig
+- ext/zigrb_lucas_lehmer/extconf.rb
+- ext/zigrb_lucas_lehmer/src/lucas_lehmer.c
+- ext/zigrb_lucas_lehmer/src/lucas_lehmer.h
+- ext/zigrb_lucas_lehmer/src/wrapper.zig
 - lib/zig_example.rb
 - lib/zig_example/version.rb
 homepage: https://gitlab.com/fjc/ruby-zig_example
@@ -51,5 +111,5 @@ requirements: []
 rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
-summary: An example gem for ruby with a native zig extension.
+summary: An example gem for ruby with native zig extensions.
 test_files: []