From 1ff698f43716e160578dc86cbd25b56b59877179 Mon Sep 17 00:00:00 2001
From: David Benepe <benepe96@gmail.com>
Date: Fri, 29 Apr 2022 16:59:02 -0400
Subject: [PATCH] Fixed score script.

---
 README.md             | 14 +++++++-------
 tools/python/score.py |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 61a01792..6532f2ba 100755
--- a/README.md
+++ b/README.md
@@ -117,8 +117,8 @@ As of April 29th, 2022, this is our current score:
 ```
  =================================================================== 
                ADVENTURE ONE (ASM -> C Decompilation)                
- ------------------------- 22.80% Complete ------------------------- 
-                    # Decompiled functions: 1090                     
+ ------------------------- 23.32% Complete ------------------------- 
+                    # Decompiled functions: 1124                     
                      # GLOBAL_ASM remaining: 656                     
                      # NON_MATCHING functions: 8                     
                  # NON_EQUIVALENT WIP functions: 107                 
@@ -126,18 +126,18 @@ As of April 29th, 2022, this is our current score:
               Balloons: 12/47, Keys: 1/4, Trophies: 0/5              
                T.T. Amulets: 1/4, Wizpig Amulets: 1/4                
  ------------------------------------------------------------------- 
- We are participating in the Trophy Race of Dino Domain. (Round One) 
+ We are participating in the Trophy Race of Dino Domain. (Round Two) 
  =================================================================== 
                 ADVENTURE TWO (Cleanup & Documentation)              
- -------------------------  2.98% Complete ------------------------- 
-                     # Documented functions: 146                     
-                   # Undocumented remaining: 1600                    
+ -------------------------  2.99% Complete ------------------------- 
+                     # Documented functions: 147                     
+                   # Undocumented remaining: 1633                    
  --------------------------- Game Status --------------------------- 
               Balloons: 1/47, Keys: 0/4, Trophies: 0/5               
                T.T. Amulets: 0/4, Wizpig Amulets: 0/4                
  ------------------------------------------------------------------- 
       We are collecting the second balloon on Timber's Island.       
- ===================================================================
+ =================================================================== 
 ```
 
 ---
diff --git a/tools/python/score.py b/tools/python/score.py
index 93912948..872c5e77 100644
--- a/tools/python/score.py
+++ b/tools/python/score.py
@@ -30,7 +30,7 @@ for folder in ASM_FOLDERS:
 BUILD_DIRECTORY = './build/us_1.0'
 SRC_DIRECTORY = './src'
 LIB_SRC_DIRECTORY = './lib/src'
-FUNCTION_REGEX = r'(?<!static\s)(?:(\/[*][*!][*]*\n(?:[^/]*\n)+?\s*[*]\/\n)(?:\s*)*?)?(void|s64|s32|s16|s8|u64|u32|u16|u8|f32|f64|int|char|short|long)\s(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{'
+FUNCTION_REGEX = r'^(?<!static\s)(?:(\/[*][*!][*]*\n(?:[^/]*\n)+?\s*[*]\/\n)(?:\s*)*?)?([^\s]+)\s(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\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)
@@ -66,6 +66,8 @@ class DkrMapFile:
 
 MAP_FILE = DkrMapFile()
 
+NOT_FUNCTION_NAMES = ['if', 'else', 'switch', 'while', 'for']
+
 class ScoreFileMatch:
     def __init__(self, comment, functionName):
         self.comment = comment
@@ -94,7 +96,8 @@ class ScoreFile:
         matches = re.finditer(FUNCTION_REGEX, self.text, re.MULTILINE)
         for matchNum, match in enumerate(matches, start=1):
             groups = match.groups()
-            self.functions.append(ScoreFileMatch(groups[0], groups[2]))
+            if groups[2] not in NOT_FUNCTION_NAMES:
+                self.functions.append(ScoreFileMatch(groups[0], groups[2]))
         matches = re.finditer(GLOBAL_ASM_REGEX, self.text, re.MULTILINE)
         for matchNum, match in enumerate(matches, start=1):
             groups = match.groups()