Add new phrase for 'extra-words` in rules

Add new phrases like `extra_phrase` this is special for extra-words.
This phrase is represented in the format [[n]], where n indicates the maximum number of extra-words allowed at that position in the rule.

If extra-words appear at the correct position and their count does not exceed the allowed limit `n`, then the score is increased to `100`.

Signed-off-by: Alok Kumar <[email protected]>

Author: alok1304

src/licensedcode/data/rules/bsd-new_158.RULE

@@ -14,7 +14,7 @@ Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-Neither the name of [[6]] nor the names of its
+Neither the name of [[3]] nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 

src/licensedcode/index.py

@@ -391,6 +391,9 @@ def _add_rules(
             # "weak" rules can only be matched with an automaton exactly.
             is_weak = True
 
+            # identify and capture the spans of extra phrases specified within the rule
+            rule.extra_phrase_spans = list(rule.extra_phrases())
+         
             for rts in rule.tokens():
                 rule_tokens_append(rts)
                 rtid = dictionary_get(rts)

src/licensedcode/match.py

@@ -601,7 +601,7 @@ def score(self):
 
         # Check whether extra words in the matched text appear in allowed positions,
         # and do not exceed the maximum allowed word count at those positions.
-        if is_extra_words_position_valid(match=self):
+        if is_extra_words_position_valid(self):
             return 100
 
         # relevance is a number between 0 and 100. Divide by 100
@@ -1104,30 +1104,26 @@ def is_extra_words_position_valid(match):
     extra_phrase_count = 0
 
     for span, allowed_extra_words in extra_phrase_spans:
-        rule_index = span.start - extra_phrase_count - 1
+        rule_index = span.start
         allowed_extra_words = allowed_extra_words
 
-        matched_index = span.start + matched_count - extra_phrase_count
+        matched_index = rule_index + matched_count - extra_phrase_count
         extra_words_count = 0
 
-        # return false if token before `extra-words` in `matched_token` is not same as token before `extra-phrases` in `rule_tokens`
-        if(matched_tokens[matched_index-1] != rule_tokens[rule_index]):
-            return False 
-
-        # Count how many tokens in `matched_text` do not match the next rule token
+        # Count how many tokens in matched_text do not match the next rule token
         while (matched_index < len(matched_tokens) and
                matched_tokens[matched_index] != rule_tokens[rule_index + 1]):
             matched_index += 1
             matched_count += 1
             extra_words_count += 1
 
-            if extra_words_count > allowed_extra_words:
-               return False
-
         extra_phrase_count += 1
 
-    return True
+        if extra_words_count > allowed_extra_words:
+            return False
 
+    return True
+        
 
 def filter_contained_matches(
     matches,

src/licensedcode/models.py

@@ -2334,13 +2334,8 @@ def tokens(self):
         recomputed as a side effect.
         """
 
-        # identify and capture the spans of extra phrases specified within the rule
-        self.extra_phrase_spans = list(self.extra_phrases())
-        
         # remove extra_phrase marker from rules
-        self.text = remove_extra_phrase(self.text)
-
-        text = self.text
+        text = remove_extra_phrase(self.text)
 
         # We tag this rule as being a bare URL if it starts with a scheme and is
         # on one line: this is used to determine a matching approach

tests/licensedcode/data/plugin_license/extra-words/scan-extra-words-2-aho-license.expected.json

@@ -5,9 +5,7 @@
       "license_expression": "bsd-new",
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
-      "detection_log": [
-        "extra-words-permitted-in-rule"
-      ],
+      "detection_log": [],
       "reference_matches": [
         {
           "license_expression": "bsd-new",
@@ -56,9 +54,7 @@
               "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions are met:\r\n\r\n* Redistributions of source code must retain the above copyright notice, this\r\n  list of conditions and the following disclaimer.\r\n\r\n* Redistributions in binary form must reproduce the above copyright notice,\r\n  this list of conditions and the following disclaimer in the documentation\r\n  and/or other materials provided with the distribution.\r\n\r\n* Neither the name of [filesize] nor the names of its\r\n  contributors may be used to endorse or promote products derived from\r\n  this software without specific prior written permission.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\r\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\r\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\r\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\r\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             }
           ],
-          "detection_log": [
-            "extra-words-permitted-in-rule"
-          ],
+          "detection_log": [],
           "identifier": "bsd_new-f3efb258-e9c3-604d-9bbd-147fe74af22e"
         }
       ],

tests/licensedcode/test_tokenize.py

@@ -616,9 +616,9 @@ def test_get_extra_phrase_spans_simple(self):
         assert spans == [(Span([2]), 2)]
 
     def test_get_extra_phrase_spans_multiple(self):
-        text = 'Some [[4]] text [[6]] with multiple markers.'
+        text = 'Some [[1]] text [[3]] with multiple markers.'
         spans = get_extra_phrase_spans(text)
-        assert spans == [(Span([1]), 4), (Span([3]), 6)]
+        assert spans == [(Span([1]), 1), (Span([3]), 3)]
 
     def test_get_extra_phrase_spans_returns_nothing_if_none_found(self):
         text = 'Just some normal text.'