Merge pull request #4 from hkoba/tkt-2-gh-actions

Switch to Github Action

Author: hkoba

.github/workflows/rust.yml

@@ -0,0 +1,53 @@
+name: Rust
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - 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
+      run: cargo test --all --examples
+      
+    strategy:
+      matrix:
+        threaded:
+          - ''
+          - '-threaded'
+        perl-version:
+          - '5.26'
+          - '5.28'
+          - '5.30'
+          - '5.32'
+          - '5.34'
+          - '5'
+        rust-version:
+          - 1.54.0 # MSRV
+          - stable
+        target:
+          - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
+
+    container:
+      image: perl:${{ matrix.perl-version }}${{ matrix.threaded }}
+
+      

examples/eg/op0.rs

@@ -1,4 +1,8 @@
 #![allow(non_snake_case)]
+
+#[cfg(perlapi_ver26)]
+use std::convert::TryFrom;
+
 pub use libperl_sys::op;
 
 use libperl_sys::*;
@@ -36,10 +40,7 @@ pub enum Name {
 #[cfg(perlapi_ver26)]
 pub fn op_extract(perl: &Perl, cv: *const cv, o: *const op) -> Op {
     let cls = perl.op_class(o);
-    let oc = unsafe {
-        let ty = (*o).op_type();
-        *(&ty as *const u16 as *const opcode)
-    };
+    let oc = opcode::try_from(o).unwrap();
     match cls {
         OPclass::OPclass_NULL => Op::NULL,
         OPclass::OPclass_BASEOP => {
@@ -148,7 +149,7 @@ impl Iterator for OpSiblingIter {
 pub fn op_sibling(op: *const unop) -> *const op {
     // PERL_OP_PARENT is on since 5.26
     if let Some(op) = unsafe {op.as_ref()} {
-        if op.op_moresib() == 1 as u16 {
+        if u32::try_from(op.op_moresib()).unwrap() == 1 as u32 {
             op.op_sibparent
         } else {
             std::ptr::null()

examples/eg/op1.rs

@@ -1,4 +1,8 @@
 #![allow(non_snake_case)]
+
+#[cfg(perlapi_ver26)]
+use std::convert::TryFrom;
+
 pub use libperl_sys::op;
 
 use if_chain::if_chain;
@@ -166,11 +170,7 @@ impl<'a> OpExtractor<'a> {
             return self.ops.alloc(Op::NULL)
         }
         let cls = self.perl.op_class(o);
-        let oc = unsafe {
-            let ty = (*o).op_type();
-            *(&ty as *const u16 as *const opcode)
-        };
-
+        let oc = opcode::try_from(o).unwrap();
         let eo = match cls {
             OPclass::OPclass_NULL => Op::NULL,
             OPclass::OPclass_BASEOP => {

libperl-sys/build.rs

@@ -37,7 +37,7 @@ fn main() {
 
     perl.emit_features(&["useithreads"]); // "usemultiplicity"
 
-    perl.emit_perlapi_vers(10, 30);
+    perl.emit_perlapi_vers(10, 34);
 
     let src_file_name = "wrapper.h";
     let src_path = cargo_topdir_file(src_file_name);

libperl-sys/src/conv_opcode.rs

@@ -0,0 +1,42 @@
+use std::convert::TryFrom;
+
+use crate::perl_core::{op, opcode};
+
+impl TryFrom<*const op> for opcode {
+    type Error = &'static str;
+
+    fn try_from(op: *const op) -> Result<Self, Self::Error> {
+        if op.is_null() {
+            return Err("Null OP*")
+        }
+        opcode::try_from(unsafe {
+            (*op).op_type()
+        })
+    }
+}
+
+impl TryFrom<u32> for opcode {
+    type Error = &'static str;
+
+    fn try_from(oc: u32) -> Result<Self, Self::Error> {
+        if oc <= opcode::OP_max as u32 {
+            let e = unsafe {std::mem::transmute(oc)};
+            Ok(e)
+        } else {
+            Err("Invalid opcode")
+        }
+    }
+}
+
+impl TryFrom<u16> for opcode {
+    type Error = &'static str;
+
+    fn try_from(oc: u16) -> Result<Self, Self::Error> {
+        if oc <= opcode::OP_max as u16 {
+            let e = unsafe {std::mem::transmute(oc as u32)};
+            Ok(e)
+        } else {
+            Err("Invalid opcode")
+        }
+    }
+}

libperl-sys/src/lib.rs

@@ -1,6 +1,8 @@
 pub mod perl_core;
 pub use perl_core::*;
 
+pub mod conv_opcode;
+
 use std::ffi::CStr;
 
 // use std::os::raw::{c_char, c_int /*, c_void, c_schar*/};