Merge pull request #6 from hkoba/gh-5-perl5_38

GH-5 perl5.38

Author: hkoba

.github/workflows/rust.yml

@@ -15,15 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
     - name: Install dependencies
       run: apt-get update && apt-get install -y llvm-dev libclang-dev clang
-    - name: Install ${{ matrix.rust-version }}
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: ${{ matrix.rust-version }}-${{ matrix.target.triple }}
-          profile: minimal
-          override: true
     - name: Build
       run: cargo build --verbose
     - name: Run tests
@@ -40,10 +35,9 @@ jobs:
           - '5.30'
           - '5.32'
           - '5.34'
+          - '5.36'
+          - '5.38'
           - '5'
-        rust-version:
-          - 1.54.0 # MSRV
-          - stable
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
 

.travis.yml

@@ -45,7 +45,7 @@ fn my_test() {
 fn call_list_method(perl: &mut Perl, class_name: String, method_name: String, args: Vec<String>) -> Result<Vec<Sv>,String>
 {
 
-    let mut my_perl = perl.my_perl();
+    let my_perl = perl.my_perl();
 
     // dSP
     let mut sp = my_perl.Istack_sp;
@@ -71,7 +71,7 @@ fn call_list_method(perl: &mut Perl, class_name: String, method_name: String, ar
     my_perl.Istack_sp = sp;
 
     // call_method
-    let cnt = unsafe_perl_api!{Perl_call_method(perl.my_perl, method_name.as_ptr() as *const i8, (G_METHOD_NAMED | G_ARRAY) as i32)};
+    let cnt = unsafe_perl_api!{Perl_call_method(perl.my_perl, method_name.as_ptr() as *const i8, (G_METHOD_NAMED | G_LIST) as i32)};
 
     // SPAGAIN
     // sp = my_perl.Istack_sp;

examples/110_call_method.rs

@@ -1,4 +1,5 @@
 #![allow(non_snake_case)]
+#![allow(unused_imports)]
 
 #[cfg(perlapi_ver26)]
 use std::convert::TryFrom;

examples/eg/op1.rs

@@ -30,7 +30,7 @@ crate-type = ["rlib", "cdylib"]
 [dependencies]
 
 [build-dependencies]
-bindgen = "0.44"
+bindgen = "0.69"
 regex = "1"
 
 libperl-config = {"path" = "../libperl-config", version = "^0.2"}

libperl-sys/Cargo.toml

@@ -32,12 +32,16 @@ fn main() {
     let perl = PerlConfig::default();
     perl.emit_cargo_ldopts();
 
+    let archlib = String::from(&perl.dict["archlib"]);
+    let perl_h = Path::new(&archlib).join("CORE/perl.h");
+    let cop_h = Path::new(&archlib).join("CORE/cop.h");
+
     let ccopts = perl.read_ccopts().unwrap();
     println!("# perl ccopts = {:?}, ", ccopts);
 
     perl.emit_features(&["useithreads"]); // "usemultiplicity"
 
-    perl.emit_perlapi_vers(10, 34);
+    perl.emit_perlapi_vers(10, 38);
 
     let src_file_name = "wrapper.h";
     let src_path = cargo_topdir_file(src_file_name);
@@ -72,10 +76,9 @@ fn main() {
         // the resulting bindings.
         let bindings = bindgen::Builder::default()
 
-            .rustfmt_bindings(true)
             .derive_debug(true)
             .impl_debug(true)
-
+            .formatter(bindgen::Formatter::Prettyplease)
             .rustified_enum("OPclass|opcode|svtype")
 
         // The input header we would like to generate
@@ -87,24 +90,13 @@ fn main() {
 
             .opaque_type("timex")
 
-            .blacklist_type("max_align_t")
-
-            .blacklist_item("IPPORT_RESERVED")
-
-            .blacklist_item("FP_.*")
-        // .blacklist_item("FP_INT_UPWARD")
-        // .blacklist_item("FP_INT_DOWNWARD")
-        // .blacklist_item("FP_INT_TOWARDZERO")
-        // .blacklist_item("FP_INT_TONEARESTFROMZERO")
-        // .blacklist_item("FP_INT_TONEAREST")
-        // .blacklist_item("FP_NAN")
-        // .blacklist_item("FP_INFINITE")
-        // .blacklist_item("FP_ZERO")
-        // .blacklist_item("FP_SUBNORMAL")
-        // .blacklist_item("FP_NORMAL")
-
-            .blacklist_function("f?printf")
-            .blacklist_function("f?scanf")
+            .allowlist_file(perl_h.to_str().unwrap())
+            .allowlist_file(cop_h.to_str().unwrap())
+            .allowlist_item("opcode")
+            .allowlist_item("(Perl|perl|PL)_.*")
+            .allowlist_item("([SAHRGC]V|xpv).*")
+            .allowlist_item("OP.*")
+            .allowlist_item("G_.*")
 
         // Finish the builder and generate the bindings.
             .generate()

libperl-sys/build.rs

@@ -1,2 +1,9 @@
 #include <INTERN.h>               /* from the Perl distribution     */
+#define PERL_IN_GLOBALS_C
 #include <perl.h>                 /* from the Perl distribution     */
+
+#if    defined(G_ARRAY) && !defined(G_LIST)
+#  define G_LIST   G_ARRAY
+#elif !defined(G_ARRAY)
+#  define G_ARRAY  G_LIST
+#endif

libperl-sys/wrapper.h

@@ -232,7 +232,7 @@ impl Perl {
 
     #[cfg(perl_useithreads)]
     pub fn pushmark(&self, sp: *mut *mut SV) {
-        let mut my_perl = self.my_perl();
+        let my_perl = self.my_perl();
         unsafe {
             my_perl.Imarkstack_ptr = my_perl.Imarkstack_ptr.add(1)
         };