feat: relax interface names

Allow uppercase letters in interface names. Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
varlink · Dec 6, 2021 · b95c624 · b95c624
1 parent bcd0c3c
commit b95c624
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/varlink_parser/src/test.rs b/varlink_parser/src/test.rs
@@ -218,12 +218,12 @@ fn test_domainnames() {
     assert!(IDL::try_from("interface com.-example.leadinghyphen\nmethod F()->()").is_err());
     assert!(IDL::try_from("interface xn--lgbbat1ad8j.example.algeria\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface com.example-.danglinghyphen-\nmethod F()->()").is_err());
-    assert!(IDL::try_from("interface Com.example.uppercase-toplevel\nmethod F()->()").is_err());
-    assert!(IDL::try_from("interface Co9.example.number-toplevel\nmethod F()->()").is_err());
     assert!(IDL::try_from("interface 1om.example.number-toplevel\nmethod F()->()").is_err());
-    assert!(IDL::try_from("interface com.Example\nmethod F()->()").is_err());
+    assert!(IDL::try_from("interface com.Example\nmethod F()->()").is_ok());
+    assert!(IDL::try_from("interface Com.example.uppercase-toplevel\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface a.b\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface a.b.c\nmethod F()->()").is_ok());
+    assert!(IDL::try_from("interface co9.example.number-toplevel\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface a1.b1.c1\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface a1.b--1.c--1\nmethod F()->()").is_ok());
     assert!(IDL::try_from("interface a--1.b--1.c--1\nmethod F()->()").is_ok());

diff --git a/varlink_parser/src/varlink_grammar.rs b/varlink_parser/src/varlink_grammar.rs
@@ -37,8 +37,8 @@ peg::parser! {
             = $( ['A'..='Z']['a'..='z' | 'A'..='Z' | '0'..='9']* )
 
         rule interface_name() -> &'input str /* no hyphen at begin and end */
-            = quiet! { $( ['a'..='z'] ( ['-']*['a'..='z' | '0'..='9'] )* ( ['.']['a'..='z' | '0'..='9'] (['-']*['a'..='z' | '0'..='9'])* )+ ) }
-              / expected!("<reverse domain name>")
+            = quiet! { $( ['A'..='Z' | 'a'..='z'] ( ['a'..='z' | '0'..='9' | '-' ] )* ( ['.']['A'..='Z' | 'a'..='z' | '0'..='9'] (['-']*['A'..='Z' | 'a'..='z' | '0'..='9'])* )+ ) }
+            / expected!("<reverse domain name>")
 
         rule array() -> ()
             = "[]"