github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-15 00:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle -> Tx

Browse Source
This commit is contained in:
Andrew Morris
2023-10-31 16:17:19 +11:00
parent 44802a1843
commit b2f523a83c
10 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
valuescript_vm/src/bytecode.rs
View File

@@ -1,6 +1,6 @@
use std::{cell::RefCell, collections::HashMap, fmt, ops::Index, rc::Rc, slice::SliceIndex};
use storage::{StorageBackendHandle, StorageEntity};
use storage::{StorageEntity, StorageTx};
use crate::{bytecode_decoder::BytecodeDecoder, vs_value::Val};
@@ -45,7 +45,7 @@ impl DecoderMaker for Rc<Bytecode> {
}
}
impl<'a, E, Tx: StorageBackendHandle<'a, E>> StorageEntity<'a, E, Tx> for Bytecode {
impl<'a, E, Tx: StorageTx<'a, E>> StorageEntity<'a, E, Tx> for Bytecode {
fn to_storage_entry(&self, _tx: &mut Tx) -> Result<storage::StorageEntry, E> {
Ok(storage::StorageEntry {
ref_count: 1,

14
valuescript_vm/src/val_storage.rs
View File

@@ -4,7 +4,7 @@ use num_bigint::BigInt;
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
use storage::{
RcKey, StorageBackendHandle, StorageEntity, StorageEntry, StorageEntryReader, StorageEntryWriter,
RcKey, StorageEntity, StorageEntry, StorageEntryReader, StorageEntryWriter, StorageTx,
};
use crate::{
@@ -47,7 +47,7 @@ impl Tag {
}
}
impl<'a, E, Tx: StorageBackendHandle<'a, E>> StorageEntity<'a, E, Tx> for Val {
impl<'a, E, Tx: StorageTx<'a, E>> StorageEntity<'a, E, Tx> for Val {
fn from_storage_entry(tx: &mut Tx, entry: StorageEntry) -> Result<Self, E> {
let mut reader = StorageEntryReader::new(&entry);
let res = read_from_entry(tx, &mut reader);
@@ -156,7 +156,7 @@ impl<'a, E, Tx: StorageBackendHandle<'a, E>> StorageEntity<'a, E, Tx> for Val {
}
}
fn write_to_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
fn write_to_entry<'a, E, Tx: StorageTx<'a, E>>(
val: &Val,
tx: &mut Tx,
writer: &mut StorageEntryWriter,
@@ -246,7 +246,7 @@ fn write_to_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
Ok(())
}
fn write_ptr_to_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
fn write_ptr_to_entry<'a, E, Tx: StorageTx<'a, E>>(
tx: &mut Tx,
writer: &mut StorageEntryWriter,
key: RcKey,
@@ -264,7 +264,7 @@ fn write_ptr_to_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
Ok(())
}
fn read_from_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
fn read_from_entry<'a, E, Tx: StorageTx<'a, E>>(
tx: &mut Tx,
reader: &mut StorageEntryReader,
) -> Result<Val, E> {
@@ -422,7 +422,7 @@ fn read_symbol_from_entry(reader: &mut StorageEntryReader) -> VsSymbol {
FromPrimitive::from_u64(reader.read_vlq().unwrap()).unwrap()
}
fn read_ref_bytecode_from_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
fn read_ref_bytecode_from_entry<'a, E, Tx: StorageTx<'a, E>>(
tx: &mut Tx,
reader: &mut StorageEntryReader,
) -> Result<Rc<Bytecode>, E> {
@@ -433,7 +433,7 @@ fn read_ref_bytecode_from_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
Ok(Rc::new(Bytecode::from_storage_entry(tx, entry)?))
}
fn write_ref_bytecode_to_entry<'a, E, Tx: StorageBackendHandle<'a, E>>(
fn write_ref_bytecode_to_entry<'a, E, Tx: StorageTx<'a, E>>(
tx: &mut Tx,
writer: &mut StorageEntryWriter,
bytecode: &Rc<Bytecode>,