Skip to content

Ci/add wch riscv test #958

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

Open
Shriyans406 wants to merge 3 commits into
base: master
Choose a base branch
from
+39 −5
Open

Ci/add wch riscv test #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55b059e
Fixed special charcter escaping
Shriyans406 Apr 21, 2026
6749f3b
Fixed special charcter escaping
Shriyans406 Apr 21, 2026
81c05a4
added WCH ch32v30x to risc-v regression tests
Shriyans406 Apr 24, 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
34 changes: 30 additions & 4 deletions src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,24 @@ pub fn escape_brackets(s: &str) -> String {

/// Escape basic html tags and brackets
pub fn escape_special_chars(s: &str) -> Cow<'_, str> {
if s.contains('[') {
escape_brackets(s).into()
} else {
s.into()
if !s.contains('[') && !s.contains('&') && !s.contains('<') && !s.contains('>'){
return s.into();
}
let mut escaped = s.to_string();
if escaped.contains('&') {
escaped = escaped.replace('&', "&amp;");
}
if escaped.contains('<') {
escaped = escaped.replace('<', "&lt;");
}
if escaped.contains('>') {
escaped = escaped.replace('>', "&gt;");
}
if escaped.contains('[') {
escaped = escape_brackets(&escaped);
}
escaped.into()

}

pub fn name_of<T: FullName>(maybe_array: &MaybeArray<T>, ignore_group: bool) -> String {
Expand Down Expand Up @@ -513,3 +526,16 @@ fn pascalcase() {
assert_eq!(to_pascal_case("FOO_BAR_1_2"), "FooBar1_2");
assert_eq!(to_pascal_case("FOO_BAR_1_2_"), "FooBar1_2_");
}

#[test]
fn test_escape_special_chars() {
assert_eq!(escape_special_chars("Array[0]"), "Array\\[0\\]");
assert_eq!(escape_special_chars("Enable & disable"), "Enable &amp; disable");
assert_eq!(escape_special_chars("Wait < 10"), "Wait &lt; 10");
assert_eq!(escape_special_chars("Delay > 5"), "Delay &gt; 5");
assert_eq!(
escape_special_chars("Flags & [Status] > 100"),
"Flags &amp; \\[Status\\] &gt; 100"
);
}

4 changes: 4 additions & 0 deletions svd2rust-regress/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ pub enum Manufacturer {
RaspberryPi,
Renesas,
Unknown,
GigaDevice,
WCH,
}

impl Manufacturer {
Expand All @@ -51,6 +53,8 @@ impl Manufacturer {
Renesas,
TexasInstruments,
Espressif,
GigaDevice,
WCH,
]
}
}
Expand Down
6 changes: 5 additions & 1 deletion svd2rust-regress/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,11 @@
mfgr: SiFive
chip: fu540
svd_url: https://raw.githubusercontent.com/riscv-rust/fu540-pac/master/fu540.svd

- arch: riscv
mfgr: WCH
chip: ch32v30x
svd_url: https://raw.githubusercontent.com/ch32-rs/ch32v30x/main/ch32v30x.svd

# SiliconLabs
- arch: cortex-m
mfgr: SiliconLabs
Expand Down
Loading