Fix #230

[anweiss]

Addresses large tags when targeting wasm32

[Copilot]

PR Overview

This PR fixes issue #230 by addressing handling of large tag values when targeting wasm32 and ensuring consistent number types throughout the CBOR validation and tokenization code.

• Updated test cases in tests/cbor.rs to validate large tag values.
• Adjusted numeric type conversions in lexer.rs, token.rs, ast/mod.rs, and validator/cbor.rs to use u64 instead of usize for handling large values.
• Added the hex crate in Cargo.toml to support tests.

Changes

File	Description
tests/cbor.rs	Modified CBOR test cases to verify support for large tag values and removed duplicate struct definitions.
src/lexer.rs	Updated numeric conversion for tokens and adjusted the return type of read_number for improved consistency.
src/token.rs	Changed Option field from usize to u64 in Token variants.
Cargo.toml	Added the hex crate dependency for tests.
src/ast/mod.rs	Adjusted type definitions for tagged data and constraints to use u64 for wider numeric support.
src/validator/cbor.rs	Updated comparisons by casting lengths to u64 ensuring consistency in constraint checks.

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (1)

tests/cbor.rs:304

• [nitpick] The variable 'bytes' is declared multiple times in the 'verify_large_tag_values' test, which might reduce clarity. Consider using distinct variable names or reusing a single variable if appropriate to enhance readability.

let mut bytes = Vec::new();

Tip: Turn on automatic Copilot reviews for this repository to get quick feedback on every pull request. Learn more

[Copilot]

PR Overview

This pull request fixes issue #230 by addressing the handling of large tag values when targeting wasm32. Key changes include updating numeric types from usize to u64 in various modules, adding tests for large tag values in the CBOR test suite, and ensuring consistency in number parsing and validation.

Changes

File	Description
tests/cbor.rs	Adds tests to verify handling of small and large tag values and removes duplicate struct definitions.
src/token.rs	Updates the optional constraint type from Option to Option to support larger tags.
src/ast/mod.rs	Refactors tagged type definitions to use u64 for tag and constraint, with an explanatory comment.
src/lexer.rs	Adjusts number reading and token construction to use u64, and casts back to usize where needed for non-wasm32 targets.
Cargo.toml	Adds the hex crate dependency required for tests.
src/validator/cbor.rs	Updates constraint comparisons to cast lengths to u64, ensuring consistency with the new numeric type.

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (11)

tests/cbor.rs:295

• [nitpick] Consider adding inline comments within the 'verify_large_tag_values' test to clarify the purpose of each test case (small tag, large tag, and wrong tag scenarios).

#[test]

src/token.rs:34

• Confirm that updating the constraint type from Option to Option does not introduce side effects in code sections that assume a usize value.

Option<u64>,

src/ast/mod.rs:1219

• Ensure that updating 'tag' from Option to Option supports larger tag values and matches all pattern usages in the code.

tag: Option<u64>,

src/ast/mod.rs:1239

• Verify that changing 'constraint' from Option to Option aligns correctly with all type validations and comparisons.

constraint: Option<u64>,

src/lexer.rs:503

• Review the casting to u64 when constructing a TAG token to ensure it is compatible with all token consumers expecting numeric types.

Token::TAG(Some(t as u8), Some(self.read_number(idx)?.1 as u64)),

src/lexer.rs:959

• Ensure that casting the value 'i' to usize for non-wasm32 targets is safe and does not result in data loss from larger u64 values.

Ok(Token::VALUE(Value::UINT(i as usize)))

src/lexer.rs:969

• Verify that the updated return type of read_number to u64 is correctly handled across all its call sites.

fn read_number(&mut self, idx: usize) -> Result<(usize, u64)> {

src/validator/cbor.rs:2106

• Ensure that casting b.len() to u64 for constraint matching is appropriate and consistent with the new constraint type.

Some(c) if *c == b.len() as u64 => return Ok(()),

src/validator/cbor.rs:2124

• Validate that using t.len() as u64 for text string constraints aligns with the overall update to support larger tag values.

Some(c) if *c == t.len() as u64 => return Ok(()),

src/validator/cbor.rs:2142

• Confirm that casting a.len() to u64 is correct for array constraints and does not cause discrepancies with expected sizes.

Some(c) if *c == a.len() as u64 => return Ok(()),

src/validator/cbor.rs:2160

• Ensure casting m.len() to u64 for map constraints is consistent and correctly supports the change to larger tag values.

Some(c) if *c == m.len() as u64 => return Ok(()),

Tip: Turn on automatic Copilot reviews for this repository to get quick feedback on every pull request. Learn more