wip

librasn · Apr 30, 2023 · b5d967d · b5d967d
1 parent 09decf7
commit b5d967d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/benches/common.rs b/benches/common.rs
@@ -24,7 +24,7 @@ pub struct Bench {
 #[derive(AsnType, Decode, Encode)]
 pub struct EmptySequence {}
 
-#[derive(AsnType, Clone, Copy, Decode, Encode, PartialEq)]
+#[derive(AsnType, Clone, Copy, Decode, Debug, Encode, PartialEq)]
 #[rasn(enumerated)]
 pub enum BenchEnum {
     A,

diff --git a/macros/src/enum.rs b/macros/src/enum.rs
@@ -89,7 +89,7 @@ impl Enum {
         let enumerated_impl = self.config.enumerated.then(|| {
             let (variants, extended_variants): (Vec<_>, Vec<_>) = self.variants.iter()
                 .map(|variant| VariantConfig::new(variant, &self.generics, &self.config))
-                .partition(|config| config.extension_addition);
+                .partition(|config| !config.extension_addition);
 
             let discriminants = variants.iter().enumerate().map(|(i, config)| {
                 let discriminant = config.discriminant().unwrap_or(i) as isize;

diff --git a/src/per.rs b/src/per.rs
@@ -111,9 +111,9 @@ mod tests {
         #[rasn(enumerated, crate_root = "crate")]
         enum Enum1 { Green, Red, Blue, }
 
-        // round_trip!(uper, Enum1, Enum1::Green, &[0]);
-        // round_trip!(uper, Enum1, Enum1::Red, &[0x40]);
-        // round_trip!(uper, Enum1, Enum1::Blue, &[0x80]);
+        round_trip!(uper, Enum1, Enum1::Green, &[0]);
+        round_trip!(uper, Enum1, Enum1::Red, &[0x40]);
+        round_trip!(uper, Enum1, Enum1::Blue, &[0x80]);
 
         #[derive(AsnType, Clone, Copy, Debug, Decode, Encode, PartialEq)]
         #[rasn(enumerated, crate_root = "crate")]
@@ -128,7 +128,7 @@ mod tests {
             Purple,
         }
 
-        // round_trip!(uper, Enum2, Enum2::Red, &[0]);
+        round_trip!(uper, Enum2, Enum2::Red, &[0]);
         round_trip!(uper, Enum2, Enum2::Yellow, &[0x80]);
         round_trip!(uper, Enum2, Enum2::Purple, &[0x81]);
     }

diff --git a/src/per/de.rs b/src/per/de.rs
@@ -221,6 +221,21 @@ impl<'input> Decoder<'input> {
         self.parse_integer(Constraints::new(&[constraints]))
     }
 
+    fn parse_non_negative_binary_integer(&mut self, range: i128) -> Result<types::Integer> {
+        let bits = super::log2(range);
+        let (input, data) = nom::bytes::streaming::take(bits)(self.input)?;
+        self.input = input;
+        let data = if data.len() < 8 {
+            let mut buffer = types::BitString::repeat(false, 8-data.len());
+            buffer.extend_from_bitslice(&data);
+            buffer
+        } else {
+            data.to_bitvec()
+        };
+
+        Ok(num_bigint::BigUint::from_bytes_le(&dbg!(data).into_vec()).into())
+    }
+
     fn parse_integer(&mut self, constraints: Constraints) -> Result<types::Integer> {
         let extensible = self.parse_extensible_bit(&constraints)?;
         let value_constraint = constraints.value();
@@ -237,11 +252,9 @@ impl<'input> Decoder<'input> {
         {
             if range == 0 {
                 return Ok(value_constraint.constraint.minimum().into())
+            } else {
+                self.parse_non_negative_binary_integer(range)?
             }
-            let bits = super::log2(range);
-            let (input, data) = nom::bytes::streaming::take(bits)(self.input)?;
-            self.input = input;
-            num_bigint::BigUint::from_bytes_be(&data.to_bitvec().into_vec()).into()
         } else {
             let bytes = self.decode_octets()?.into_vec();
             value_constraint
@@ -277,12 +290,12 @@ impl<'input> crate::Decoder for Decoder<'input> {
     fn decode_enumerated<E: Enumerated>(&mut self, _: Tag) -> Result<E> {
         let extensible = E::EXTENDED_VARIANTS.is_some().then(|| self.parse_one_bit()).transpose()?.unwrap_or_default();
 
-        if extensible {
+        if dbg!(extensible) {
             let index: usize = self.parse_normally_small_integer()?.try_into().map_err(Error::custom)?;
             E::from_extended_enumeration_index(index)
                 .ok_or_else(|| Error::custom(format!("Extended index {} not found", index)))
         } else {
-            let index = self.parse_non_negative_binary_integer(E::variance() as i128)?.try_into().map_err(Error::custom)?;
+            let index = dbg!(self.parse_non_negative_binary_integer(E::variance() as i128)?).try_into().map_err(Error::custom)?;
             E::from_enumeration_index(index)
                 .ok_or_else(|| Error::custom(format!("Index {} not found", index)))
         }

diff --git a/src/per/enc.rs b/src/per/enc.rs
@@ -556,8 +556,8 @@ impl crate::Encoder for Encoder {
     ) -> Result<Self::Ok, Self::Error> {
         let mut buffer = BitString::default();
         let index = value.enumeration_index();
-        if E::EXTENDED_VARIANTS.is_some() {
-            buffer.push(value.is_extended_variant());
+        if dbg!(E::EXTENDED_VARIANTS.is_some()) {
+            buffer.push(dbg!(value.is_extended_variant()));
         }
 
         if value.is_extended_variant() {