Skip to content

Commit

Permalink
Merge pull request #7 from sile/support-newer-tags
Browse files Browse the repository at this point in the history 
Support newer tags
  • Loading branch information
@sile
sile committed Apr 3, 2022
2 parents e01e1ee + dc25f68 commit 6b9d637
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 20 deletions.
75 changes: 62 additions & 13 deletions src/codec.rs
View file
Expand Up @@ -62,11 +62,13 @@ const BIT_BINARY_EXT: u8 = 77;
const COMPRESSED_TERM: u8 = 80;
const ATOM_CACHE_REF: u8 = 82;
const NEW_PID_EXT: u8 = 88;
const NEW_PORT_EXT: u8 = 89;
const NEWER_REFERENCE_EXT: u8 = 90;
const SMALL_INTEGER_EXT: u8 = 97;
const INTEGER_EXT: u8 = 98;
const FLOAT_EXT: u8 = 99;
const ATOM_EXT: u8 = 100;
const REFERENCE_EXT: u8 = 101;
const ATOM_EXT: u8 = 100; // deprecated
const REFERENCE_EXT: u8 = 101; // deprecated
const PORT_EXT: u8 = 102;
const PID_EXT: u8 = 103;
const SMALL_TUPLE_EXT: u8 = 104;
Expand All @@ -80,11 +82,12 @@ const LARGE_BIG_EXT: u8 = 111;
const NEW_FUN_EXT: u8 = 112;
const EXPORT_EXT: u8 = 113;
const NEW_REFERENCE_EXT: u8 = 114;
const SMALL_ATOM_EXT: u8 = 115;
const SMALL_ATOM_EXT: u8 = 115; // deprecated
const MAP_EXT: u8 = 116;
const FUN_EXT: u8 = 117;
const ATOM_UTF8_EXT: u8 = 118;
const SMALL_ATOM_UTF8_EXT: u8 = 119;
const V4_PORT_EXT: u8 = 120;

pub struct Decoder<R> {
reader: R,
Expand Down Expand Up @@ -124,6 +127,8 @@ impl<R: io::Read> Decoder<R> {
ATOM_EXT => self.decode_atom_ext(),
REFERENCE_EXT => self.decode_reference_ext(),
PORT_EXT => self.decode_port_ext(),
NEW_PORT_EXT => self.decode_new_port_ext(),
V4_PORT_EXT => self.decode_v4_port_ext(),
PID_EXT => self.decode_pid_ext(),
NEW_PID_EXT => self.decode_new_pid_ext(),
SMALL_TUPLE_EXT => self.decode_small_tuple_ext(),
Expand All @@ -142,6 +147,7 @@ impl<R: io::Read> Decoder<R> {
FUN_EXT => self.decode_fun_ext(),
ATOM_UTF8_EXT => self.decode_atom_utf8_ext(),
SMALL_ATOM_UTF8_EXT => self.decode_small_atom_utf8_ext(),
NEWER_REFERENCE_EXT => self.decode_newer_reference_ext(),
_ => Err(DecodeError::UnknownTag { tag }),
}
}
Expand Down Expand Up @@ -248,22 +254,58 @@ impl<R: io::Read> Decoder<R> {
})?;
Ok(Term::from(Port {
node,
id: self.reader.read_u32::<BigEndian>()?,
creation: self.reader.read_u8()?,
id: u64::from(self.reader.read_u32::<BigEndian>()?),
creation: u32::from(self.reader.read_u8()?),
}))
}
fn decode_new_port_ext(&mut self) -> DecodeResult {
let node: Atom = self.decode_term().and_then(|t| {
t.try_into().map_err(|t| DecodeError::UnexpectedType {
value: t,
expected: "Atom".to_string(),
})
})?;
Ok(Term::from(Port {
node,
id: u64::from(self.reader.read_u32::<BigEndian>()?),
creation: self.reader.read_u32::<BigEndian>()?,
}))
}
fn decode_v4_port_ext(&mut self) -> DecodeResult {
let node: Atom = self.decode_term().and_then(|t| {
t.try_into().map_err(|t| DecodeError::UnexpectedType {
value: t,
expected: "Atom".to_string(),
})
})?;
Ok(Term::from(Port {
node,
id: self.reader.read_u64::<BigEndian>()?,
creation: self.reader.read_u32::<BigEndian>()?,
}))
}
fn decode_reference_ext(&mut self) -> DecodeResult {
let node = self.decode_term().and_then(aux::term_into_atom)?;
Ok(Term::from(Reference {
node,
id: vec![self.reader.read_u32::<BigEndian>()?],
creation: self.reader.read_u8()?,
creation: u32::from(self.reader.read_u8()?),
}))
}
fn decode_new_reference_ext(&mut self) -> DecodeResult {
let id_count = self.reader.read_u16::<BigEndian>()? as usize;
let node = self.decode_term().and_then(aux::term_into_atom)?;
let creation = self.reader.read_u8()?;
let creation = u32::from(self.reader.read_u8()?);
let mut id = Vec::with_capacity(id_count);
for _ in 0..id_count {
id.push(self.reader.read_u32::<BigEndian>()?);
}
Ok(Term::from(Reference { node, id, creation }))
}
fn decode_newer_reference_ext(&mut self) -> DecodeResult {
let id_count = self.reader.read_u16::<BigEndian>()? as usize;
let node = self.decode_term().and_then(aux::term_into_atom)?;
let creation = self.reader.read_u32::<BigEndian>()?;
let mut id = Vec::with_capacity(id_count);
for _ in 0..id_count {
id.push(self.reader.read_u32::<BigEndian>()?);
Expand Down Expand Up @@ -561,20 +603,27 @@ impl<W: io::Write> Encoder<W> {
Ok(())
}
fn encode_port(&mut self, x: &Port) -> EncodeResult {
self.writer.write_u8(PORT_EXT)?;
self.encode_atom(&x.node)?;
self.writer.write_u32::<BigEndian>(x.id)?;
self.writer.write_u8(x.creation)?;
if (x.id >> 32) & 0xFFFFFFFF == 0 {
self.writer.write_u8(NEW_PORT_EXT)?;
self.encode_atom(&x.node)?;
self.writer.write_u32::<BigEndian>(x.id as u32)?;
self.writer.write_u32::<BigEndian>(x.creation)?;
} else {
self.writer.write_u8(V4_PORT_EXT)?;
self.encode_atom(&x.node)?;
self.writer.write_u64::<BigEndian>(x.id)?;
self.writer.write_u32::<BigEndian>(x.creation)?;
}
Ok(())
}
fn encode_reference(&mut self, x: &Reference) -> EncodeResult {
self.writer.write_u8(NEW_REFERENCE_EXT)?;
self.writer.write_u8(NEWER_REFERENCE_EXT)?;
if x.id.len() > std::u16::MAX as usize {
return Err(EncodeError::TooLargeReferenceId(x.clone()));
}
self.writer.write_u16::<BigEndian>(x.id.len() as u16)?;
self.encode_atom(&x.node)?;
self.writer.write_u8(x.creation)?;
self.writer.write_u32::<BigEndian>(x.creation)?;
for n in &x.id {
self.writer.write_u32::<BigEndian>(*n)?;
}
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
View file
Expand Up @@ -426,8 +426,8 @@ impl<'a> From<(&'a str, u32, u32)> for Pid {
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
pub struct Port {
pub node: Atom,
pub id: u32,
pub creation: u8,
pub id: u64,
pub creation: u32,
}
impl fmt::Display for Port {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand All @@ -438,7 +438,7 @@ impl<'a> From<(&'a str, u32)> for Port {
fn from((node, id): (&'a str, u32)) -> Self {
Port {
node: Atom::from(node),
id,
id: u64::from(id),
creation: 0,
}
}
Expand All @@ -449,7 +449,7 @@ impl<'a> From<(&'a str, u32)> for Port {
pub struct Reference {
pub node: Atom,
pub id: Vec<u32>,
pub creation: u8,
pub creation: u32,
}
impl fmt::Display for Reference {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand Down
6 changes: 3 additions & 3 deletions tests/lib.rs
View file
Expand Up @@ -201,8 +201,8 @@ fn port_test() {
// Encode
assert_eq!(
vec![
131, 102, 100, 0, 13, 110, 111, 110, 111, 100, 101, 64, 110, 111, 104, 111, 115, 116,
0, 0, 1, 110, 0
131, 89, 100, 0, 13, 110, 111, 110, 111, 100, 101, 64, 110, 111, 104, 111, 115, 116, 0,
0, 1, 110, 0, 0, 0, 0
],
encode(Term::from(Port::from(("nonode@nohost", 366))))
);
Expand Down Expand Up @@ -233,7 +233,7 @@ fn reference_test() {

// Encode
assert_eq!(
vec![131, 114, 0, 1, 100, 0, 3, 102, 111, 111, 0, 0, 0, 0, 123],
vec![131, 90, 0, 1, 100, 0, 3, 102, 111, 111, 0, 0, 0, 0, 0, 0, 0, 123],
encode(Term::from(Reference::from(("foo", 123))))
);
}
Expand Down

0 comments on commit 6b9d637

Please sign in to comment.