Skip to content

Commit

Permalink
Update bindings and bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thomas-vention
Thomas-vention committed Oct 4, 2023
1 parent f77241a commit 1526b83
Show file tree
Hide file tree
Showing 17 changed files with 197 additions and 67 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ ARCHITECTURE.md
playground
libjulia_module_test.so
expanded.rs

.idea
2 changes: 1 addition & 1 deletion jl_sys/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "jl-sys"
version = "0.22.0"
version = "0.23.0"
authors = ["Thomas van Doornmalen <thomas.vandoornmalen@gmail.com>"]
description = """
jl-sys contains the generated bindings for the Julia C API used by jlrs.
Expand Down
8 changes: 4 additions & 4 deletions jl_sys/generate_bindings.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function print_help() {
echo "default paths can be overridden with environment variables:"
echo ""
echo -e "\033[1m Version Default path${spacing}Override\033[0m"
echo " Linux 64-bit 1.9 $HOME/julia-1.9.2 JULIA_1_9_DIR"
echo " Linux 64-bit 1.9 $HOME/julia-1.9.3 JULIA_1_9_DIR"
echo " Linux 64-bit 1.8 $HOME/julia-1.8.5 JULIA_1_8_DIR"
echo " Linux 64-bit 1.7 $HOME/julia-1.7.3 JULIA_1_7_DIR"
echo " Linux 64-bit 1.6 $HOME/julia-1.6.7 JULIA_1_6_DIR"
Expand All @@ -80,7 +80,7 @@ function print_help() {
echo "When the beta flag is set, the following is expected:"
echo ""
echo -e "\033[1m Version Default path${spacing}Override\033[0m"
echo " Linux 64-bit 1.10 $HOME/julia-1.10.0-beta1 JULIA_1_10_DIR"
echo " Linux 64-bit 1.10 $HOME/julia-1.10.0-beta3 JULIA_1_10_DIR"
echo ""
echo ""
echo "All dependencies must have been installed before running this script. The"
Expand Down Expand Up @@ -125,7 +125,7 @@ fi

if [ "${BETA}" = "y" -o "${ALL}" = "y" ]; then
if [ -z "$JULIA_BETA_DIR" ]; then
JULIA_BETA_DIR=${HOME}/julia-1.10.0-beta1
JULIA_BETA_DIR=${HOME}/julia-1.10.0-beta3
fi
if [ ! -d "$JULIA_BETA_DIR" ]; then
echo "Error: $JULIA_BETA_DIR does not exist" >&2
Expand All @@ -151,7 +151,7 @@ if [ "${BETA}" = "y" -o "${ALL}" = "y" ]; then
fi

if [ -z "$JULIA_1_9_DIR" ]; then
JULIA_1_9_DIR=${HOME}/julia-1.9.2
JULIA_1_9_DIR=${HOME}/julia-1.9.3
fi
if [ ! -d "$JULIA_1_9_DIR" ]; then
echo "Error: $JULIA_1_9_DIR does not exist" >&2
Expand Down
8 changes: 4 additions & 4 deletions jl_sys/generate_bindings_unwind_c.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function print_help() {
echo "default paths can be overridden with environment variables:"
echo ""
echo -e "\033[1m Version Default path${spacing}Override\033[0m"
echo " Linux 64-bit 1.9 $HOME/julia-1.9.2 JULIA_1_9_DIR"
echo " Linux 64-bit 1.9 $HOME/julia-1.9.3 JULIA_1_9_DIR"
echo " Linux 64-bit 1.8 $HOME/julia-1.8.5 JULIA_1_8_DIR"
echo " Linux 64-bit 1.7 $HOME/julia-1.7.3 JULIA_1_7_DIR"
echo " Linux 64-bit 1.6 $HOME/julia-1.6.7 JULIA_1_6_DIR"
Expand All @@ -80,7 +80,7 @@ function print_help() {
echo "When the beta flag is set, the following is expected:"
echo ""
echo -e "\033[1m Version Default path${spacing}Override\033[0m"
echo " Linux 64-bit 1.10 $HOME/julia-1.10.0-beta1 JULIA_1_10_DIR"
echo " Linux 64-bit 1.10 $HOME/julia-1.10.0-beta3 JULIA_1_10_DIR"
echo ""
echo ""
echo "All dependencies must have been installed before running this script. The"
Expand Down Expand Up @@ -125,7 +125,7 @@ fi

if [ "${BETA}" = "y" -o "${ALL}" = "y" ]; then
if [ -z "$JULIA_BETA_DIR" ]; then
JULIA_BETA_DIR=${HOME}/julia-1.10.0-beta1
JULIA_BETA_DIR=${HOME}/julia-1.10.0-beta3
fi
if [ ! -d "$JULIA_BETA_DIR" ]; then
echo "Error: $JULIA_BETA_DIR does not exist" >&2
Expand All @@ -151,7 +151,7 @@ if [ "${BETA}" = "y" -o "${ALL}" = "y" ]; then
fi

if [ -z "$JULIA_1_9_DIR" ]; then
JULIA_1_9_DIR=${HOME}/julia-1.9.2
JULIA_1_9_DIR=${HOME}/julia-1.9.3
fi
if [ ! -d "$JULIA_1_9_DIR" ]; then
echo "Error: $JULIA_1_9_DIR does not exist" >&2
Expand Down
2 changes: 1 addition & 1 deletion jl_sys/src/bindings/bindings_1_10_32.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.10.0-beta1 */
/* generated from julia version 1.10.0-beta3 */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down
2 changes: 1 addition & 1 deletion jl_sys/src/bindings/bindings_1_10_64.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.10.0-beta1 */
/* generated from julia version 1.10.0-beta3 */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down
56 changes: 44 additions & 12 deletions jl_sys/src/bindings/bindings_1_11_32.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.11.0-DEV (Commit: 62605cc40f 2023-07-27 17:35 UTC) */
/* generated from julia version 1.11.0-DEV (Commit: b790cf8f0c 2023-10-03 20:35 UTC) */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down Expand Up @@ -463,6 +463,17 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
}
}
#[inline]
pub fn ipo_noub(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(7usize, 1u8) as u8) }
}
#[inline]
pub fn set_ipo_noub(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(7usize, 1u8, val as u64)
}
}
#[inline]
pub fn new_bitfield_1(
ipo_consistent: u8,
ipo_effect_free: u8,
Expand All @@ -471,6 +482,7 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
ipo_terminates_locally: u8,
ipo_notaskstate: u8,
ipo_inaccessiblememonly: u8,
ipo_noub: u8,
) -> __BindgenBitfieldUnit<[u8; 1usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 1usize]> = Default::default();
__bindgen_bitfield_unit.set(0usize, 1u8, {
Expand Down Expand Up @@ -504,6 +516,10 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
unsafe { ::std::mem::transmute(ipo_inaccessiblememonly) };
ipo_inaccessiblememonly as u64
});
__bindgen_bitfield_unit.set(7usize, 1u8, {
let ipo_noub: u8 = unsafe { ::std::mem::transmute(ipo_noub) };
ipo_noub as u64
});
__bindgen_bitfield_unit
}
}
Expand Down Expand Up @@ -1157,53 +1173,65 @@ impl _jl_binding_t {
}
}
#[inline]
pub fn imported(&self) -> u8 {
pub fn publicp(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(2usize, 1u8) as u8) }
}
#[inline]
pub fn set_imported(&mut self, val: u8) {
pub fn set_publicp(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(2usize, 1u8, val as u64)
}
}
#[inline]
pub fn usingfailed(&self) -> u8 {
pub fn imported(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(3usize, 1u8) as u8) }
}
#[inline]
pub fn set_usingfailed(&mut self, val: u8) {
pub fn set_imported(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(3usize, 1u8, val as u64)
}
}
#[inline]
pub fn usingfailed(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(4usize, 1u8) as u8) }
}
#[inline]
pub fn set_usingfailed(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(4usize, 1u8, val as u64)
}
}
#[inline]
pub fn deprecated(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(4usize, 2u8) as u8) }
unsafe { ::std::mem::transmute(self._bitfield_1.get(5usize, 2u8) as u8) }
}
#[inline]
pub fn set_deprecated(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(4usize, 2u8, val as u64)
self._bitfield_1.set(5usize, 2u8, val as u64)
}
}
#[inline]
pub fn padding(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(6usize, 2u8) as u8) }
unsafe { ::std::mem::transmute(self._bitfield_1.get(7usize, 1u8) as u8) }
}
#[inline]
pub fn set_padding(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(6usize, 2u8, val as u64)
self._bitfield_1.set(7usize, 1u8, val as u64)
}
}
#[inline]
pub fn new_bitfield_1(
constp: u8,
exportp: u8,
publicp: u8,
imported: u8,
usingfailed: u8,
deprecated: u8,
Expand All @@ -1219,18 +1247,22 @@ impl _jl_binding_t {
exportp as u64
});
__bindgen_bitfield_unit.set(2usize, 1u8, {
let publicp: u8 = unsafe { ::std::mem::transmute(publicp) };
publicp as u64
});
__bindgen_bitfield_unit.set(3usize, 1u8, {
let imported: u8 = unsafe { ::std::mem::transmute(imported) };
imported as u64
});
__bindgen_bitfield_unit.set(3usize, 1u8, {
__bindgen_bitfield_unit.set(4usize, 1u8, {
let usingfailed: u8 = unsafe { ::std::mem::transmute(usingfailed) };
usingfailed as u64
});
__bindgen_bitfield_unit.set(4usize, 2u8, {
__bindgen_bitfield_unit.set(5usize, 2u8, {
let deprecated: u8 = unsafe { ::std::mem::transmute(deprecated) };
deprecated as u64
});
__bindgen_bitfield_unit.set(6usize, 2u8, {
__bindgen_bitfield_unit.set(7usize, 1u8, {
let padding: u8 = unsafe { ::std::mem::transmute(padding) };
padding as u64
});
Expand Down
56 changes: 44 additions & 12 deletions jl_sys/src/bindings/bindings_1_11_64.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.11.0-DEV (Commit: 62605cc40f 2023-07-27 17:35 UTC) */
/* generated from julia version 1.11.0-DEV (Commit: b790cf8f0c 2023-10-03 20:35 UTC) */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down Expand Up @@ -470,6 +470,17 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
}
}
#[inline]
pub fn ipo_noub(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(7usize, 1u8) as u8) }
}
#[inline]
pub fn set_ipo_noub(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(7usize, 1u8, val as u64)
}
}
#[inline]
pub fn new_bitfield_1(
ipo_consistent: u8,
ipo_effect_free: u8,
Expand All @@ -478,6 +489,7 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
ipo_terminates_locally: u8,
ipo_notaskstate: u8,
ipo_inaccessiblememonly: u8,
ipo_noub: u8,
) -> __BindgenBitfieldUnit<[u8; 1usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 1usize]> = Default::default();
__bindgen_bitfield_unit.set(0usize, 1u8, {
Expand Down Expand Up @@ -511,6 +523,10 @@ impl __jl_purity_overrides_t__bindgen_ty_1 {
unsafe { ::std::mem::transmute(ipo_inaccessiblememonly) };
ipo_inaccessiblememonly as u64
});
__bindgen_bitfield_unit.set(7usize, 1u8, {
let ipo_noub: u8 = unsafe { ::std::mem::transmute(ipo_noub) };
ipo_noub as u64
});
__bindgen_bitfield_unit
}
}
Expand Down Expand Up @@ -1164,53 +1180,65 @@ impl _jl_binding_t {
}
}
#[inline]
pub fn imported(&self) -> u8 {
pub fn publicp(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(2usize, 1u8) as u8) }
}
#[inline]
pub fn set_imported(&mut self, val: u8) {
pub fn set_publicp(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(2usize, 1u8, val as u64)
}
}
#[inline]
pub fn usingfailed(&self) -> u8 {
pub fn imported(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(3usize, 1u8) as u8) }
}
#[inline]
pub fn set_usingfailed(&mut self, val: u8) {
pub fn set_imported(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(3usize, 1u8, val as u64)
}
}
#[inline]
pub fn usingfailed(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(4usize, 1u8) as u8) }
}
#[inline]
pub fn set_usingfailed(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(4usize, 1u8, val as u64)
}
}
#[inline]
pub fn deprecated(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(4usize, 2u8) as u8) }
unsafe { ::std::mem::transmute(self._bitfield_1.get(5usize, 2u8) as u8) }
}
#[inline]
pub fn set_deprecated(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(4usize, 2u8, val as u64)
self._bitfield_1.set(5usize, 2u8, val as u64)
}
}
#[inline]
pub fn padding(&self) -> u8 {
unsafe { ::std::mem::transmute(self._bitfield_1.get(6usize, 2u8) as u8) }
unsafe { ::std::mem::transmute(self._bitfield_1.get(7usize, 1u8) as u8) }
}
#[inline]
pub fn set_padding(&mut self, val: u8) {
unsafe {
let val: u8 = ::std::mem::transmute(val);
self._bitfield_1.set(6usize, 2u8, val as u64)
self._bitfield_1.set(7usize, 1u8, val as u64)
}
}
#[inline]
pub fn new_bitfield_1(
constp: u8,
exportp: u8,
publicp: u8,
imported: u8,
usingfailed: u8,
deprecated: u8,
Expand All @@ -1226,18 +1254,22 @@ impl _jl_binding_t {
exportp as u64
});
__bindgen_bitfield_unit.set(2usize, 1u8, {
let publicp: u8 = unsafe { ::std::mem::transmute(publicp) };
publicp as u64
});
__bindgen_bitfield_unit.set(3usize, 1u8, {
let imported: u8 = unsafe { ::std::mem::transmute(imported) };
imported as u64
});
__bindgen_bitfield_unit.set(3usize, 1u8, {
__bindgen_bitfield_unit.set(4usize, 1u8, {
let usingfailed: u8 = unsafe { ::std::mem::transmute(usingfailed) };
usingfailed as u64
});
__bindgen_bitfield_unit.set(4usize, 2u8, {
__bindgen_bitfield_unit.set(5usize, 2u8, {
let deprecated: u8 = unsafe { ::std::mem::transmute(deprecated) };
deprecated as u64
});
__bindgen_bitfield_unit.set(6usize, 2u8, {
__bindgen_bitfield_unit.set(7usize, 1u8, {
let padding: u8 = unsafe { ::std::mem::transmute(padding) };
padding as u64
});
Expand Down
2 changes: 1 addition & 1 deletion jl_sys/src/bindings/bindings_1_9_32.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.9.2 */
/* generated from julia version 1.9.3 */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down
2 changes: 1 addition & 1 deletion jl_sys/src/bindings/bindings_1_9_64.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* generated from julia version 1.9.2 */
/* generated from julia version 1.9.3 */
#[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct __BindgenBitfieldUnit<Storage> {
Expand Down
Loading

0 comments on commit 1526b83

Please sign in to comment.