From 9866200bbe8eb65628f3f3e6eb290c48efb5a8ac Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 11 Jan 2023 11:39:02 +1100 Subject: [PATCH] Correct property EBNF for unquoted strings Reviewed-by: Richard Levitte Reviewed-by: Hugo Landau Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/20023) --- crypto/property/properties.ebnf | 18 ------------------ doc/man7/property.pod | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 crypto/property/properties.ebnf diff --git a/crypto/property/properties.ebnf b/crypto/property/properties.ebnf deleted file mode 100644 index a55198bd75f..00000000000 --- a/crypto/property/properties.ebnf +++ /dev/null @@ -1,18 +0,0 @@ -(* https://bottlecaps.de/rr/ui *) - -Definition - ::= PropertyName ( '=' Value )? ( ',' PropertyName ( '=' Value )? )* -Query ::= PropertyQuery ( ',' PropertyQuery )* -PropertyQuery ::= '-' PropertyName - | '?'? ( PropertyName (( '=' | '!=' ) Value)?) -Value ::= NumberLiteral - | StringLiteral -StringLiteral ::= QuotedString | UnquotedString -QuotedString ::= '"' [^"]* '"' - | "'" [^']* "'" -UnquotedString ::= [^{space},]+ -NumberLiteral - ::= '0' ( [0-7]* | 'x' [0-9A-Fa-f]+ ) - | '-'? [1-9] [0-9]+ -PropertyName - ::= [A-Z] [A-Z0-9_]* ( '.' [A-Z] [A-Z0-9_]* )* diff --git a/doc/man7/property.pod b/doc/man7/property.pod index 109336ba472..3d6f269d7ff 100644 --- a/doc/man7/property.pod +++ b/doc/man7/property.pod @@ -154,9 +154,9 @@ The lexical syntax in EBNF is given by: Value ::= NumberLiteral | StringLiteral StringLiteral ::= QuotedString | UnquotedString QuotedString ::= '"' [^"]* '"' | "'" [^']* "'" - UnquotedString ::= [^{space},]+ + UnquotedString ::= [A-Za-z] [^{space},]+ NumberLiteral ::= '0' ( [0-7]* | 'x' [0-9A-Fa-f]+ ) | '-'? [1-9] [0-9]+ - PropertyName ::= [A-Z] [A-Z0-9_]* ( '.' [A-Z] [A-Z0-9_]* )* + PropertyName ::= [A-Za-z] [A-Za-z0-9_]* ( '.' [A-Za-z] [A-Za-z0-9_]* )* =head1 HISTORY -- 2.47.2