rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace custom modular_bitfields fork with update upstream

Browse Source 
part of #2468
This commit is contained in:
Skgland
2026-02-20 22:37:49 +01:00
committed by Bennet Bleßmann
parent 453a88f03e
commit 5ef5a3f30a
11 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Cargo.lock generated
View File

@@ -1792,6 +1792,27 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "modular-bitfield"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2956e537fc68236d2aa048f55704f231cc93f1c4de42fe1ecb5bd7938061fc4a"
dependencies = [
"modular-bitfield-impl",
"static_assertions",
]
[[package]]
name = "modular-bitfield-impl"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.101",
]
[[package]] [[package]]
name = "multer" name = "multer"
version = "2.1.0" version = "2.1.0"
@@ -2686,27 +2707,6 @@ dependencies = [
"tendril", "tendril",
] ]
[[package]]
name = "scryer-modular-bitfield"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1f26c70c56d2c94a02545d86384b91994532c2be928c974784b603c2b1f76ac"
dependencies = [
"scryer-modular-bitfield-impl",
"static_assertions",
]
[[package]]
name = "scryer-modular-bitfield-impl"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "212164841808ccfccf1b0471d91f8cfe675eeb60dbb96e4ca7a1f37b22570a29"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "scryer-prolog" name = "scryer-prolog"
version = "0.10.0" version = "0.10.0"
@@ -2744,6 +2744,7 @@ dependencies = [
"libffi", "libffi",
"libloading", "libloading",
"maplit", "maplit",
"modular-bitfield",
"native-tls", "native-tls",
"num-order", "num-order",
"ordered-float", "ordered-float",
@@ -2762,7 +2763,6 @@ dependencies = [
"rustyline", "rustyline",
"ryu", "ryu",
"scraper", "scraper",
"scryer-modular-bitfield",
"serde", "serde",
"serde-wasm-bindgen", "serde-wasm-bindgen",
"serde_json", "serde_json",
@@ -3177,7 +3177,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote",
"unicode-ident", "unicode-ident",
] ]

2
Cargo.toml
View File

@@ -65,7 +65,7 @@ lazy_static = "1.5.0"
lexical = "7.0.4" lexical = "7.0.4"
libc = "0.2.155" libc = "0.2.155"
libloading = "0.8" libloading = "0.8"
scryer-modular-bitfield = "0.11.4" modular-bitfield = "0.13.1"
num-order = { version = "1.2.0" } num-order = { version = "1.2.0" }
ordered-float = "5.0.0" ordered-float = "5.0.0"
phf = { version = "0.11", features = ["macros"] } phf = { version = "0.11", features = ["macros"] }

4
_typos.toml
View File

@@ -16,6 +16,10 @@ extend-ignore-re = [
interm = "interm" interm = "interm"
IntermReg = "IntermReg" IntermReg = "IntermReg"
[type.rust]
extend-glob = [ "*.rs" ]
[type.rust.extend-identifiers]
consts = "consts" # std::{f32,f64}::consts
[type.prolog] [type.prolog]

2
src/arena.rs
View File

@@ -52,7 +52,7 @@ where
payload_offset - header_offset payload_offset - header_offset
} }
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq)] #[derive(Specifier, Copy, Clone, Debug, PartialEq)]
#[bits = 7] #[bits = 7]
pub enum ArenaHeaderTag { pub enum ArenaHeaderTag {
Integer = 0b10, Integer = 0b10,

2
src/atom_table.rs
View File

@@ -23,7 +23,7 @@ use arcu::rcu_ref::RcuRef;
use arcu::Rcu; use arcu::Rcu;
use indexmap::IndexSet; use indexmap::IndexSet;
use scryer_modular_bitfield::prelude::*; use modular_bitfield::prelude::*;
#[bitfield] #[bitfield]
#[repr(u64)] #[repr(u64)]

6
src/heap_iter.rs
View File

@@ -17,7 +17,7 @@ use crate::types::*;
use core::marker::PhantomData; use core::marker::PhantomData;
use fxhash::FxBuildHasher; use fxhash::FxBuildHasher;
use indexmap::IndexSet; use indexmap::IndexSet;
use scryer_modular_bitfield::prelude::*; use modular_bitfield::prelude::*;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::ops::Deref; use std::ops::Deref;
@@ -496,7 +496,7 @@ impl<'a> Iterator for EagerStackfulPreOrderHeapIter<'a> {
} }
} }
#[derive(BitfieldSpecifier, Clone, Copy, Debug, PartialEq, Eq)] #[derive(Specifier, Clone, Copy, Debug, PartialEq, Eq)]
#[bits = 2] #[bits = 2]
enum IterStackLocTag { enum IterStackLocTag {
Iterable, Iterable,
@@ -504,7 +504,7 @@ enum IterStackLocTag {
PendingMark, PendingMark,
} }
#[derive(BitfieldSpecifier, Clone, Copy, Debug, PartialEq, Eq)] #[derive(Specifier, Clone, Copy, Debug, PartialEq, Eq)]
#[bits = 1] #[bits = 1]
pub enum HeapOrStackTag { pub enum HeapOrStackTag {
Heap, Heap,

6
src/machine/copier.rs
View File

@@ -9,14 +9,14 @@ use crate::machine::heap::*;
use crate::machine::stack::*; use crate::machine::stack::*;
use crate::types::*; use crate::types::*;
use scryer_modular_bitfield::specifiers::*; use modular_bitfield::specifiers::*;
use scryer_modular_bitfield::*; use modular_bitfield::*;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::mem; use std::mem;
use std::ops::{IndexMut, Range}; use std::ops::{IndexMut, Range};
#[derive(BitfieldSpecifier, Copy, Clone, Debug)] #[derive(Specifier, Copy, Clone, Debug)]
#[bits = 6] #[bits = 6]
enum TrailRefTag { enum TrailRefTag {
HeapCell = 0b001011, HeapCell = 0b001011,

6
src/machine/machine_indices.rs
View File

@@ -14,8 +14,8 @@ use crate::offset_table::*;
use fxhash::FxBuildHasher; use fxhash::FxBuildHasher;
use indexmap::{IndexMap, IndexSet}; use indexmap::{IndexMap, IndexSet};
use scryer_modular_bitfield::specifiers::*; use modular_bitfield::specifiers::*;
use scryer_modular_bitfield::{bitfield, BitfieldSpecifier}; use modular_bitfield::{bitfield, Specifier};
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::BTreeSet; use std::collections::BTreeSet;
@@ -66,7 +66,7 @@ impl PartialOrd<Ref> for HeapCellValue {
} }
} }
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq)] #[derive(Specifier, Copy, Clone, Debug, PartialEq)]
#[bits = 7] #[bits = 7]
pub enum IndexPtrTag { pub enum IndexPtrTag {
DynamicUndefined = 0b1000101, // a predicate, declared as dynamic, whose location in code is as yet undefined. DynamicUndefined = 0b1000101, // a predicate, declared as dynamic, whose location in code is as yet undefined.

8
src/machine/streams.rs
View File

@@ -14,7 +14,7 @@ use crate::machine::machine_indices::*;
use crate::machine::machine_state::*; use crate::machine::machine_state::*;
use crate::types::*; use crate::types::*;
pub use scryer_modular_bitfield::prelude::*; pub use modular_bitfield::prelude::*;
#[cfg(feature = "http")] #[cfg(feature = "http")]
use bytes::{buf::Reader as BufReader, Buf, Bytes}; use bytes::{buf::Reader as BufReader, Buf, Bytes};
@@ -43,7 +43,7 @@ use warp::hyper;
mod compat; mod compat;
pub use compat::*; pub use compat::*;
#[derive(Debug, BitfieldSpecifier, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Specifier, Clone, Copy, PartialEq, Eq, Hash)]
#[bits = 1] #[bits = 1]
pub enum StreamType { pub enum StreamType {
Binary, Binary,
@@ -76,7 +76,7 @@ impl StreamType {
} }
} }
#[derive(Debug, BitfieldSpecifier, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Specifier, Clone, Copy, PartialEq, Eq, Hash)]
#[bits = 2] #[bits = 2]
pub enum EOFAction { pub enum EOFAction {
EOFCode, EOFCode,
@@ -84,7 +84,7 @@ pub enum EOFAction {
Reset, Reset,
} }
#[derive(Debug, BitfieldSpecifier, Copy, Clone, PartialEq)] #[derive(Debug, Specifier, Copy, Clone, PartialEq)]
#[bits = 2] #[bits = 2]
pub(crate) enum AtEndOfStream { pub(crate) enum AtEndOfStream {
Not, Not,

6
src/parser/ast.rs
View File

@@ -24,8 +24,8 @@ use dashu::Rational;
use fxhash::FxBuildHasher; use fxhash::FxBuildHasher;
use indexmap::IndexMap; use indexmap::IndexMap;
use ordered_float::OrderedFloat; use ordered_float::OrderedFloat;
use scryer_modular_bitfield::error::OutOfBounds; use modular_bitfield::error::OutOfBounds;
use scryer_modular_bitfield::prelude::*; use modular_bitfield::prelude::*;
pub type Specifier = u32; pub type Specifier = u32;
@@ -671,7 +671,7 @@ impl Fixnum {
#[inline] #[inline]
pub fn get_tag(&self) -> HeapCellValueTag { pub fn get_tag(&self) -> HeapCellValueTag {
use scryer_modular_bitfield::Specifier; use modular_bitfield::Specifier;
HeapCellValueTag::from_bytes(self.tag()).unwrap() HeapCellValueTag::from_bytes(self.tag()).unwrap()
} }

10
src/types.rs
View File

@@ -19,7 +19,7 @@ use std::ops::{Add, Sub, SubAssign};
use dashu::{Integer, Rational}; use dashu::{Integer, Rational};
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[repr(u8)] #[repr(u8)]
#[bits = 6] #[bits = 6]
pub enum HeapCellValueTag { pub enum HeapCellValueTag {
@@ -46,7 +46,7 @@ pub enum HeapCellValueTag {
TrailedBlackboardOffset = 0b110001, TrailedBlackboardOffset = 0b110001,
} }
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[repr(u8)] #[repr(u8)]
#[bits = 6] #[bits = 6]
pub enum HeapCellValueView { pub enum HeapCellValueView {
@@ -73,7 +73,7 @@ pub enum HeapCellValueView {
TrailedBlackboardOffset = 0b110001, TrailedBlackboardOffset = 0b110001,
} }
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[bits = 1] #[bits = 1]
pub enum ConsPtrMaskTag { pub enum ConsPtrMaskTag {
Cons = 0b0, Cons = 0b0,
@@ -112,7 +112,7 @@ impl ConsPtr {
} }
} }
#[derive(BitfieldSpecifier, Copy, Clone, Debug)] #[derive(Specifier, Copy, Clone, Debug)]
#[bits = 6] #[bits = 6]
pub(crate) enum RefTag { pub(crate) enum RefTag {
HeapCell = 0b001011, HeapCell = 0b001011,
@@ -199,7 +199,7 @@ pub enum TrailRef {
} }
#[allow(clippy::enum_variant_names)] // allow the common "Trailed" prefix #[allow(clippy::enum_variant_names)] // allow the common "Trailed" prefix
#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[bits = 6] #[bits = 6]
pub(crate) enum TrailEntryTag { pub(crate) enum TrailEntryTag {
TrailedHeapVar = 0b101111, TrailedHeapVar = 0b101111,