From 69a207bf746bc162a8ef861f5aa359fd059ce3b0 Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Wed, 12 Aug 2026 16:52:01 +0200 Subject: [PATCH] simplify full ABNF in spdx-license-expressions.md * remove re-definitions of RFC5234 Core Rules * replace some hex definitions with literal strings that shorten the file and are easier to read. * dereference `or-later-expression` as it was only used once improves https://github.com/spdx/spdx-spec/issues/1435 Signed-off-by: Bernhard Reiter --- docs/annexes/spdx-license-expressions.md | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/docs/annexes/spdx-license-expressions.md b/docs/annexes/spdx-license-expressions.md index 4206d74959c5..c322e40fb54f 100644 --- a/docs/annexes/spdx-license-expressions.md +++ b/docs/annexes/spdx-license-expressions.md @@ -206,11 +206,9 @@ with-expression = identifier required-ws "WITH" required-ws addition-identifier addition-identifier = license-exception-id / addition-ref -identifier = license-id / or-later-expression / license-ref +identifier = license-id / license-id "+" / license-ref -or-later-expression = license-id PLUS - -parenthesized-expression = LPAREN optional-ws SPDX-license-expression optional-ws RPAREN +parenthesized-expression = "(" optional-ws SPDX-license-expression optional-ws ")" special-identifier = "NONE" / "NOASSERTION" @@ -224,22 +222,14 @@ license-exception-id =