Merge pull request #30 from pmonks/dev

pmonks · Oct 31, 2023 · ef2fcb6 · ef2fcb6
2 parents 3f9b2e7 + b8dab1f
commit ef2fcb6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/lice_comb/impl/regex_matching.clj b/src/lice_comb/impl/regex_matching.clj
@@ -206,7 +206,7 @@
 (def lgpl-re          #"(?<lgpl>L\s?GPL|GNU\s+(Library|Lesser)|(Library|Lesser)\s+(L?GPL|General\s+Public\s+Licen[cs]e))(\s+or\s+Lesser)?(\s+General)?(\s+Pub?lic)?(\s+Licen[cs]e)?(\s+\(?LGPL\)?)?")
 (def gpl-re           #"(?<!(Affero|Lesser|Library)\s+)(?<gpl>GNU(?!\s+Classpath)|(?<!(L|A)\s*)GPL|General\s+Public\s+Licen[cs]e)(?!\s+(Affero|Library|Lesser|General\s+Lesser|General\s+Library|LGPL|AGPL))((\s+General)?(?!\s+(Affero|Lesser|Library))\s+Public\s+Licen[cs]e)?(\s+\(?GPL\)?)?")
 (def version-re       #"[\s,-]*(_?V(ersion)?)?[\s\._]*(?<version>\d+([\._]\d+)?)?")
-(def only-or-later-re #"[\s-]*((?<only>only)|(\(?or(\s+\(?at\s+your\s+(option|discretion)\)?)?(\s+any)?)?([\s-]*(?<orLater>later|lator|newer|\+)))?")
+(def only-or-later-re #"[\s-]*((?<only>\(?only\)?)|(\(?or(\s+\(?at\s+your\s+(option|discretion)\)?)?(\s+any)?)?([\s-]*(?<orLater>later|lator|newer|\+)))?")
 (def gnu-re           (lciu/re-concat "(?x)(?i)\\b(\n# Alternative 1: AGPL\n"
                                       agpl-re
                                       "\n# Alternative 2: LGPL\n|"

diff --git a/src/lice_comb/matching.clj b/src/lice_comb/matching.clj
@@ -29,7 +29,7 @@
 
   An expressions-info map has this structure:
   * key:   an SPDX expression (String), which may be a single SPDX license
-           identifier)
+           identifier
   * value: a sequence of 'expression-info' maps
 
   Each lice-comb expression-info map has this structure:

diff --git a/test/lice_comb/impl/regex_matching_test.clj b/test/lice_comb/impl/regex_matching_test.clj
@@ -173,6 +173,7 @@
   "The GNU General Public License"                                               '("GPL-3.0-only")
   "The GNU General Public License v3.0"                                          '("GPL-3.0-only")
   "The GNU General Public License, Version 2  "                                  '("GPL-2.0-only")
+  "GNU General Public License version 2 (only)"                                  '("GPL-2.0-only")
   })
 
 (def cc-by-licenses-and-ids {