Skip to content

Add newtype of CodeUnits #6241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 3 commits into from
Nov 10, 2025
Merged

Add newtype of CodeUnits #6241

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
140ed86
Base CodeUnits newtype
ShaharNaveh Nov 9, 2025
8c7466d
Adjust code to use `CodeUnits`
ShaharNaveh Nov 9, 2025
7eb336d
Trigger CI
ShaharNaveh Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Base CodeUnits newtype
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Nov 9, 2025
commit 140ed86b953254f6687b86b114e72fc9a2f3aaec
60 changes: 55 additions & 5 deletions compiler/core/src/bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
//! Implement python as a virtual machine with bytecode. This module
//! implements bytecode structure.

use crate::{OneIndexed, SourceLocation};
use crate::{
marshal::MarshalError,
{OneIndexed, SourceLocation},
};
use bitflags::bitflags;
use itertools::Itertools;
use malachite_bigint::BigInt;
use num_complex::Complex64;
use rustpython_wtf8::{Wtf8, Wtf8Buf};
use std::{collections::BTreeSet, fmt, hash, marker::PhantomData, mem};
use std::{collections::BTreeSet, fmt, hash, marker::PhantomData, mem, ops::Deref};

#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
#[repr(i8)]
Expand Down Expand Up @@ -257,6 +260,12 @@ impl OpArgByte {
}
}

impl From<u8> for OpArgByte {
fn from(raw: u8) -> Self {
Self(raw)
}
}

impl fmt::Debug for OpArgByte {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
Expand Down Expand Up @@ -808,14 +817,14 @@ impl From<Instruction> for u8 {
}

impl TryFrom<u8> for Instruction {
type Error = crate::marshal::MarshalError;
type Error = MarshalError;

#[inline]
fn try_from(value: u8) -> Result<Self, crate::marshal::MarshalError> {
fn try_from(value: u8) -> Result<Self, MarshalError> {
if value <= u8::from(LAST_INSTRUCTION) {
Ok(unsafe { std::mem::transmute::<u8, Self>(value) })
} else {
Err(crate::marshal::MarshalError::InvalidBytecode)
Err(MarshalError::InvalidBytecode)
}
}
}
Expand All @@ -835,6 +844,47 @@ impl CodeUnit {
}
}

impl TryFrom<&[u8]> for CodeUnit {
type Error = MarshalError;

fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
match bytes.len() {
2 => Ok(Self::new(bytes[0].try_into()?, bytes[1].into())),
_ => Err(Self::Error::InvalidBytecode),
}
}
}

pub struct CodeUnits(Box<[CodeUnit]>);

impl TryFrom<&[u8]> for CodeUnits {
type Error = MarshalError;

fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
bytes.chunks_exact(2).map(CodeUnit::try_from).collect()
}
}

impl<const N: usize> From<[CodeUnit; N]> for CodeUnits {
fn from(value: [CodeUnit; N]) -> Self {
Self(Box::from(value))
}
}

impl FromIterator<CodeUnit> for CodeUnits {
fn from_iter<T: IntoIterator<Item = CodeUnit>>(iter: T) -> Self {
Self(iter.into_iter().collect())
}
}

impl Deref for CodeUnits {
type Target = [CodeUnit];

fn deref(&self) -> &Self::Target {
&self.0
}
}

use self::Instruction::*;

bitflags! {
Expand Down