spdx-utils: Disambiguate parser rules for ids and exceptions #1498
Conversation
Previously, an id without the optional "+" was the same as an exception, and only the rule order determined that an exception was given precedence. Now, require an exception to actually require the word "exception" as specified at https://spdx.github.io/spdx-spec/appendix-I-SPDX-license-list/#i2-exceptions-list Signed-off-by: Sebastian Schuberth <sebastian.schuberth@here.com>
| LICENSEREFERENCE : ('DocumentRef-' IDSTRING ':')? 'LicenseRef-' IDSTRING ; | ||
| IDSTRING : (ALPHA | DIGIT)(ALPHA | DIGIT | '-' | '.')* ; | ||
| IDSTRING : (ALPHA | DIGIT)(ALPHA | DIGIT | '-' | '.')* ; | ||
| LICENSE_EXCEPTION : (IDSTRING '-exception' | IDSTRING '-exception-' IDSTRING) ; |
There was a problem hiding this comment.
It's true that all "official" SDPX exceptions contain "-exception-", and that what comes after WITH needs to be in that list, but it does not specifically define that "-exception-" needs to be contained. For our lenient implementation that shall be able to parse also expressions with typos or non-SPDX IDs I would not make that requirement.
Is there any specific problem you want so solve? Otherwise I would not make the grammar more complex than it needs to be.
There was a problem hiding this comment.
The specific issue I wanted to solve was the bogus line 1:8 no viable alternative at input 'licensea' console output I see when running PackageCurationTest. I noticed the ambiguity between licenseIdExpression and licenseExceptionExpression while looking for the cause, and wanted to address it along the way. In any case, this change does not fix the "no viable alternative at input" issue.
Previously, an id without the optional "+" was the same as an exception,
and only the rule order determined that an exception was given precedence.
Now, require an exception to actually require the word "exception" as
specified at
https://spdx.github.io/spdx-spec/appendix-I-SPDX-license-list/#i2-exceptions-list
Signed-off-by: Sebastian Schuberth sebastian.schuberth@here.com
This change is