Skip to content
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

Jump to bottom

Fix ABNF for license expressions #960

Merged
merged 2 commits into from
May 28, 2024
Merged

Fix ABNF for license expressions #960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f6326
Fixes ABNF for license expressions
zvr May 9, 2024
b17c012
Merge branch 'development/v3.0.1' into abnf-fix
kestewart May 28, 2024
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
15 changes: 7 additions & 8 deletions docs/annexes/SPDX-license-expressions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Often a single license can be used to represent the licensing terms of a source

SPDX License Expressions provide a way for one to construct expressions that more accurately represent the licensing terms typically found in open source software source code. A license expression could be a single license identifier found on the SPDX License List; a user defined license reference denoted by the LicenseRef-`[idString]`; a license identifier combined with an SPDX exception; or some combination of license identifiers, license references and exceptions constructed using a small set of defined operators (e.g., `AND`, `OR`, `WITH` and `+`). We provide the definition of what constitutes a valid SPDX License Expression in this section.

The exact syntax of license expressions is described below in [ABNF](http://tools.ietf.org/html/rfc5234).
The exact syntax of license expressions is described below in ABNF, as defined in [RFC5234](http://tools.ietf.org/html/rfc5234) and expanded in [RFC7405](http://tools.ietf.org/html/rfc7405).

```text
idstring = 1*(ALPHA / DIGIT / "-" / "." )
Expand All @@ -15,21 +15,21 @@ license-id = <short form license identifier in Annex A.1>

license-exception-id = <short form license exception identifier in Annex A.2>

license-ref = ["DocumentRef-"(idstring)":"]"LicenseRef-"(idstring)
license-ref = [%s"DocumentRef-"(idstring)":"]%s"LicenseRef-"(idstring)

addition-ref = ["DocumentRef-"(idstring)":"]"AdditionRef-"(idstring)
addition-ref = [%s"DocumentRef-"(idstring)":"]%s"AdditionRef-"(idstring)

simple-expression = license-id / license-id"+" / license-ref

addition-expression = license-exception-id / addition-ref

compound-expression = (simple-expression /

simple-expression ( "WITH" / "with" ) addition-expression /
simple-expression ( %s"WITH" / %s"with" ) addition-expression /

compound-expression ( "AND" / "and" ) compound-expression /
compound-expression ( %s"AND" / %s"and" ) compound-expression /

compound-expression ( "OR" / "or" ) compound-expression /
compound-expression ( %s"OR" / %s"or" ) compound-expression /

"(" compound-expression ")" )

Expand Down Expand Up @@ -74,8 +74,7 @@ LicenseRef-MIT-Style-1
DocumentRef-spdx-tool-1.2:LicenseRef-MIT-Style-2
```

The current set of valid license identifiers can be found in [spdx.org/licenses](https:/
/spdx.org/licenses).
The current set of valid license identifiers can be found in [spdx.org/licenses](https://spdx.org/licenses).

## D.4 Composite license expressions <a name="D.4"></a>

Expand Down
Loading