Fix #230 (#235)

* fix #230

Cargo.toml

@@ -56,6 +56,7 @@ simplelog = "0.12.1"
 indoc = "2.0.1"
 pretty_assertions = "1.2.0"
 wasm-bindgen-test = "0.3.34"
+hex = "0.4.3"                # Add hex crate for tests
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 crossterm = { version = "0.28.1", optional = true }

src/ast/mod.rs

@@ -1216,7 +1216,7 @@ pub enum Type2<'a> {
   /// is the type of the tagged value
   TaggedData {
     /// Tag
-    tag: Option<usize>,
+    tag: Option<u64>,
     /// Type
     t: Type<'a>,
     /// Span
@@ -1235,8 +1235,8 @@ pub enum Type2<'a> {
   DataMajorType {
     /// Major type
     mt: u8,
-    /// Constraint
-    constraint: Option<usize>,
+    /// Constraint - Using u64 to support larger values in wasm32
+    constraint: Option<u64>,
     /// Span
     #[cfg(feature = "ast-span")]
     span: Span,

src/lexer.rs

@@ -500,7 +500,7 @@ impl<'a> Lexer<'a> {
                 {
                   Ok((
                     self.position,
-                    Token::TAG(Some(t as u8), Some(self.read_number(idx)?.1 as usize)),
+                    Token::TAG(Some(t as u8), Some(self.read_number(idx)?.1 as u64)),
                   ))
                 }
               }
@@ -956,7 +956,7 @@ impl<'a> Lexer<'a> {
 
     #[cfg(not(target_arch = "wasm32"))]
     {
-      Ok(Token::VALUE(Value::UINT(i)))
+      Ok(Token::VALUE(Value::UINT(i as usize)))
     }
 
     #[cfg(target_arch = "wasm32")]
@@ -966,7 +966,7 @@ impl<'a> Lexer<'a> {
   }
 
   #[cfg(not(target_arch = "wasm32"))]
-  fn read_number(&mut self, idx: usize) -> Result<(usize, usize)> {
+  fn read_number(&mut self, idx: usize) -> Result<(usize, u64)> {
     let mut end_index = idx;
 
     while let Some(&c) = self.peek_char() {

src/token.rs

@@ -31,7 +31,7 @@ pub enum Token<'a> {
     /// Major type
     Option<u8>,
     /// Optional constraint
-    Option<usize>,
+    Option<u64>,
   ),
 
   // Operators

src/validator/cbor.rs

@@ -2103,7 +2103,7 @@ where
         Value::Bytes(b) => {
           match mt {
             2u8 => match constraint {
-              Some(c) if *c == b.len() => return Ok(()),
+              Some(c) if *c == b.len() as u64 => return Ok(()),
               Some(c) => self.add_error(format!(
                 "expected byte string type with constraint {} (#{}.{}), got {:?}",
                 c, mt, c, self.cbor
@@ -2121,7 +2121,7 @@ where
         Value::Text(t) => {
           match mt {
             3u8 => match constraint {
-              Some(c) if *c == t.len() => return Ok(()),
+              Some(c) if *c == t.len() as u64 => return Ok(()),
               Some(c) => self.add_error(format!(
                 "expected text string type with constraint {} (#{}.{}), got {:?}",
                 c, mt, c, self.cbor
@@ -2139,7 +2139,7 @@ where
         Value::Array(a) => {
           match mt {
             4u8 => match constraint {
-              Some(c) if *c == a.len() => return Ok(()),
+              Some(c) if *c == a.len() as u64 => return Ok(()),
               Some(c) => self.add_error(format!(
                 "expected array type with constraint {} (#{}.{}), got {:?}",
                 c, mt, c, self.cbor
@@ -2157,7 +2157,7 @@ where
         Value::Map(m) => {
           match mt {
             5u8 => match constraint {
-              Some(c) if *c == m.len() => return Ok(()),
+              Some(c) if *c == m.len() as u64 => return Ok(()),
               Some(c) => self.add_error(format!(
                 "expected map type with constraint {} (#{}.{}), got {:?}",
                 c, mt, c, self.cbor

tests/cbor.rs

@@ -2,11 +2,12 @@
 #![cfg(feature = "cbor")]
 #![cfg(not(target_arch = "wasm32"))]
 
-use cddl::{self, validator::validate_cbor_from_slice};
-
+use cddl::validator::validate_cbor_from_slice;
+use ciborium::value::Value;
 use serde::{Deserialize, Serialize};
+use std::error::Error;
 
-#[rustfmt::skip] // allow arbitrary indents for readability
+#[rustfmt::skip] 
 pub mod cbor {
     // example values from rfc7049 appendix A
     pub const BOOL_FALSE:   &[u8] = b"\xF4";
@@ -38,6 +39,29 @@ pub mod cbor {
 
 }
 
+// These data structures exist so that we can serialize some more complex
+// beyond the RFC examples.
+#[derive(Debug, Serialize, Deserialize)]
+struct PersonStruct {
+  name: String,
+  age: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct PersonTuple(String, u32);
+
+#[derive(Debug, Serialize, Deserialize)]
+struct BackwardsTuple(u32, String);
+
+#[derive(Debug, Serialize, Deserialize)]
+struct LongTuple(String, u32, u32);
+
+#[derive(Debug, Serialize, Deserialize)]
+struct ShortTuple(String);
+
+#[derive(Debug, Serialize, Deserialize)]
+struct KitchenSink(String, u32, f64, bool);
+
 #[test]
 fn validate_cbor_bool() {
   let cddl_input = r#"thing = true"#;
@@ -126,29 +150,6 @@ fn validate_cbor_array() {
   validate_cbor_from_slice(cddl_input, cbor::ARRAY_123, None).unwrap();
 }
 
-// These data structures exist so that we can serialize some more complex
-// beyond the RFC examples.
-#[derive(Debug, Serialize, Deserialize)]
-struct PersonStruct {
-  name: String,
-  age: u32,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct PersonTuple(String, u32);
-
-#[derive(Debug, Serialize, Deserialize)]
-struct BackwardsTuple(u32, String);
-
-#[derive(Debug, Serialize, Deserialize)]
-struct LongTuple(String, u32, u32);
-
-#[derive(Debug, Serialize, Deserialize)]
-struct ShortTuple(String);
-
-#[derive(Debug, Serialize, Deserialize)]
-struct KitchenSink(String, u32, f64, bool);
-
 #[test]
 fn validate_cbor_group() {
   let cddl_input = r#"thing = (* int)"#;
@@ -290,3 +291,34 @@ fn validate_cbor_map() {
   let cddl_input = r#"thing = {x: int, y: int, z: int}"#;
   validate_cbor_from_slice(cddl_input, cbor::ARRAY_123, None).unwrap_err();
 }
+
+#[test]
+fn verify_large_tag_values() -> Result<(), Box<dyn Error>> {
+  let input = r#"
+        thing = #6.8386104246373017956(tstr) / #6.42(tstr)
+    "#;
+
+  // Test tag 42 (small tag value)
+  let test_str = "test";
+  let cbor = Value::Tag(42, Box::new(Value::Text(test_str.to_string())));
+  let mut bytes = Vec::new();
+  ciborium::ser::into_writer(&cbor, &mut bytes)?;
+  assert!(validate_cbor_from_slice(input, &bytes, None).is_ok());
+
+  // Test tag 8386104246373017956 (large tag value)
+  let cbor = Value::Tag(
+    8386104246373017956,
+    Box::new(Value::Text(test_str.to_string())),
+  );
+  let mut bytes = Vec::new();
+  ciborium::ser::into_writer(&cbor, &mut bytes)?;
+  assert!(validate_cbor_from_slice(input, &bytes, None).is_ok());
+
+  // Test wrong tag value - should fail
+  let cbor = Value::Tag(99, Box::new(Value::Text(test_str.to_string())));
+  let mut bytes = Vec::new();
+  ciborium::ser::into_writer(&cbor, &mut bytes)?;
+  assert!(validate_cbor_from_slice(input, &bytes, None).is_err());
+
+  Ok(())
+}