Skip to content

Fix VisibleString character set to follow X.680 ISO/IEC 646 definition #192

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
6d7a merged 2 commits into from
Jan 19, 2026
Merged

Fix VisibleString character set to follow X.680 ISO/IEC 646 definition #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78be9aa
Fix VisibleString character set to follow X.680 ISO/IEC 646 definition
mp0rta Jan 7, 2026
de25de9
Merge branch 'main' into fix_visiblestring
6d7a Jan 19, 2026
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
19 changes: 13 additions & 6 deletions rasn-compiler/src/intermediate/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::{
borrow::Cow,
cell::RefCell,
collections::BTreeMap,
ops::{Add, Deref},
ops::Add,
rc::Rc,
sync::LazyLock,
};
Expand Down Expand Up @@ -1011,9 +1011,17 @@ impl CharacterStringType {
.enumerate()
.collect()
});
// X.680 defines VisibleString using the ISO/IEC 646 encoding (cells 2/0–7/14),
// i.e. the 95 visible characters with indices computed as (ISO 646 ENCODING) - 32.
static VISIBLE_CHARSET: LazyLock<BTreeMap<usize, char>> = LazyLock::new(|| {
(0x20u32..=0x7Eu32)
.filter_map(char::from_u32)
.enumerate()
.collect()
});
static IA5_CHARSET: LazyLock<BTreeMap<usize, char>> = LazyLock::new(|| {
(0..128u32)
.map(|i| char::from_u32(i).unwrap())
.filter_map(char::from_u32)
.enumerate()
.collect()
});
Expand All @@ -1026,10 +1034,9 @@ impl CharacterStringType {

match self {
CharacterStringType::NumericString => &NUMERIC_CHARSET,
CharacterStringType::VisibleString | CharacterStringType::PrintableString => {
&PRINTABLE_CHARSET
}
CharacterStringType::IA5String => IA5_CHARSET.deref(),
CharacterStringType::VisibleString => &VISIBLE_CHARSET,
CharacterStringType::PrintableString => &PRINTABLE_CHARSET,
CharacterStringType::IA5String => &IA5_CHARSET,
_ => &ANY_CHARSET,
}
}
Expand Down
Loading