From 0c114f958f0081b984b29211276ab4f8ae4ae82c Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Tue, 8 Feb 2022 11:27:00 -0500
Subject: [PATCH] Update the score to show NON_EQUIVALENT as well

---
 tools/python/score.py         | 6 +++++-
 tools/python/score_display.py | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/python/score.py b/tools/python/score.py
index c2cb6e70..93912948 100644
--- a/tools/python/score.py
+++ b/tools/python/score.py
@@ -34,6 +34,7 @@ FUNCTION_REGEX = r'(?<!static\s)(?:(\/[*][*!][*]*\n(?:[^/]*\n)+?\s*[*]\/\n)(?:\s
 GLOBAL_ASM_REGEX = r'GLOBAL_ASM[(]".*(?=\/)\/([^.]+).s"[)]'
 WIP_REGEX = r'#if(?:.|\n)*?(GLOBAL_ASM[(][^)]*[)])(.|\n)*?#endif'
 NON_MATCHING_REGEX = re.compile(r'^#ifdef[ ]+NON_MATCHING', re.MULTILINE)
+NON_EQUVIALENT_REGEX = re.compile(r'^#ifdef[ ]+NON_EQUIVALENT', re.MULTILINE)
 
 CODE_START = 0x80000400
 CODE_END = 0x800D75F4
@@ -86,6 +87,7 @@ class ScoreFile:
         with open(self.path, "r") as inFile:
             self.text = inFile.read()
             self.numNonMatchings = len(re.findall(NON_MATCHING_REGEX, self.text))
+            self.numNonEquivalents = len(re.findall(NON_EQUVIALENT_REGEX, self.text))
             self.text = re.sub(WIP_REGEX, r"GLOBAL_ASM(\1)", self.text)
             
     def get_matches(self):
@@ -140,6 +142,7 @@ def main():
     totalNumberOfDocumentedFunctions = 0
     totalNumberOfGlobalAsms = 0
     totalNumberOfNonMatching = 0
+    totalNumberOfNonEquivalent = 0
     totalSizeOfDecompiledFunctions = 0
     totalSizeOfDocumentedFunctions = 0
     
@@ -149,6 +152,7 @@ def main():
         totalNumberOfDecompiledFunctions += len(scoreFile.functions)
         totalNumberOfGlobalAsms += scoreFile.numGlobalAsms
         totalNumberOfNonMatching += scoreFile.numNonMatchings
+        totalNumberOfNonEquivalent += scoreFile.numNonEquivalents
         totalNumberOfDocumentedFunctions += scoreFile.get_number_of_documented_functions()
         totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions()
         totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions()
@@ -173,7 +177,7 @@ def main():
     adventureTwoPercentage = (totalSizeOfDocumentedFunctions / CODE_SIZE) * 100
     
     scoreDisplay = ScoreDisplay()
-    print(scoreDisplay.getDisplay(adventureOnePercentage, adventureTwoPercentage, adventureSelect, totalNumberOfDecompiledFunctions, totalNumberOfGlobalAsms, totalNumberOfNonMatching, totalNumberOfDocumentedFunctions, totalNumberOfFunctions - totalNumberOfDocumentedFunctions))
+    print(scoreDisplay.getDisplay(adventureOnePercentage, adventureTwoPercentage, adventureSelect, totalNumberOfDecompiledFunctions, totalNumberOfGlobalAsms, totalNumberOfNonMatching, totalNumberOfNonEquivalent, totalNumberOfDocumentedFunctions, totalNumberOfFunctions - totalNumberOfDocumentedFunctions))
     
     if showTopFiles > 0:
         if showTopFiles > len(scoreFiles):
diff --git a/tools/python/score_display.py b/tools/python/score_display.py
index 4cc6c75b..73670111 100644
--- a/tools/python/score_display.py
+++ b/tools/python/score_display.py
@@ -106,7 +106,7 @@ class ScoreDisplay:
         out += self.makeLine(' ', dashLen, status['Msg'])
         return [out, dashLen]
     
-    def getDisplay(self, advOnePer, advTwoPer, showFlags=3, totalDecompFunctions=0, totalGlobalAsm=0, totalNonMatching=0, totalDocumented=0, totalUndocumented=0):
+    def getDisplay(self, advOnePer, advTwoPer, showFlags=3, totalDecompFunctions=0, totalGlobalAsm=0, totalNonMatching=0, totalNonEquivalent=0, totalDocumented=0, totalUndocumented=0):
         advOneStatus = self.getStatus(advOnePer)
         advTwoStatus = self.getStatus(advTwoPer)
         if showFlags == 3:
@@ -130,6 +130,7 @@ class ScoreDisplay:
             out += self.makeLine(' ', dashLen, '# Decompiled functions: ' + str(totalDecompFunctions))
             out += self.makeLine(' ', dashLen, '# GLOBAL_ASM remaining: ' + str(totalGlobalAsm))
             out += self.makeLine(' ', dashLen, '# NON_MATCHING functions: ' + str(totalNonMatching))
+            out += self.makeLine(' ', dashLen, '# NON_EQUIVALENT WIP functions: ' + str(totalNonEquivalent))
             out += advOneGameStatusDisplay[0]
         if showFlags & 2:
             out += self.makeLine('=', dashLen)