StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a2877 am: e6d7954914

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624469

Change-Id: I2d8aa648dd1bc2d59c8da058570fce89c485123a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-13 23:20:59 +00:00
committed by Automerger Merge Worker
parent 2b57d75a06 e6d7954914
commit 71b0098f49
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/aconfig/src/codegen.rs
View File

@@ -17,7 +17,10 @@
use anyhow::{ensure, Result}; use anyhow::{ensure, Result};
pub fn is_valid_name_ident(s: &str) -> bool { pub fn is_valid_name_ident(s: &str) -> bool {
// Identifiers must match [a-z][a-z0-9_]* // Identifiers must match [a-z][a-z0-9_]*, except consecutive underscores are not allowed
if s.contains("__") {
return false;
}
let mut chars = s.chars(); let mut chars = s.chars();
let Some(first) = chars.next() else { let Some(first) = chars.next() else {
return false; return false;
@@ -46,11 +49,14 @@ mod tests {
fn test_is_valid_name_ident() { fn test_is_valid_name_ident() {
assert!(is_valid_name_ident("foo")); assert!(is_valid_name_ident("foo"));
assert!(is_valid_name_ident("foo_bar_123")); assert!(is_valid_name_ident("foo_bar_123"));
assert!(is_valid_name_ident("foo_"));
assert!(!is_valid_name_ident("")); assert!(!is_valid_name_ident(""));
assert!(!is_valid_name_ident("123_foo")); assert!(!is_valid_name_ident("123_foo"));
assert!(!is_valid_name_ident("foo-bar")); assert!(!is_valid_name_ident("foo-bar"));
assert!(!is_valid_name_ident("foo-b\u{00e5}r")); assert!(!is_valid_name_ident("foo-b\u{00e5}r"));
assert!(!is_valid_name_ident("foo__bar"));
assert!(!is_valid_name_ident("_foo"));
} }
#[test] #[test]
@@ -59,6 +65,7 @@ mod tests {
assert!(is_valid_package_ident("foo_bar_123")); assert!(is_valid_package_ident("foo_bar_123"));
assert!(is_valid_package_ident("foo.bar")); assert!(is_valid_package_ident("foo.bar"));
assert!(is_valid_package_ident("foo.bar.a123")); assert!(is_valid_package_ident("foo.bar.a123"));
assert!(!is_valid_package_ident("foo._bar"));
assert!(!is_valid_package_ident("")); assert!(!is_valid_package_ident(""));
assert!(!is_valid_package_ident("123_foo")); assert!(!is_valid_package_ident("123_foo"));
@@ -69,6 +76,7 @@ mod tests {
assert!(!is_valid_package_ident("foo.bar.")); assert!(!is_valid_package_ident("foo.bar."));
assert!(!is_valid_package_ident(".")); assert!(!is_valid_package_ident("."));
assert!(!is_valid_package_ident("foo..bar")); assert!(!is_valid_package_ident("foo..bar"));
assert!(!is_valid_package_ident("foo.__bar"));
} }
#[test] #[test]