From c23b0883b5f2eac12a72a48ccd45f39ea1b061c8 Mon Sep 17 00:00:00 2001
From: Robert MacGregor <ragoradev@gmail.com>
Date: Thu, 21 Apr 2016 23:43:35 -0400
Subject: [PATCH] Fix formatting bug & bug with detecting datablocks due to
 whitespace

---
 tsscraper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tsscraper.py b/tsscraper.py
index 002153d..b059ec8 100644
--- a/tsscraper.py
+++ b/tsscraper.py
@@ -200,7 +200,7 @@ class TSScraper(object):
     _target_directories = None
     _dependencies = None
 
-    _combined_pattern = re.compile("(?<!.)\s*function\s+(([A-z]|_))+(::([A-z]|_)+)*\(\s*(%[A-z]+(\s*,\s*%[A-z]+)*)*\s*\)|((?<!.)\s*datablock\s+[A-z]+\s*\(\s*\S+\s*\)\s*(:\s*[A-z]+)?\s*(//.*)?\s*\{(\s|\S)*?\s*(?<!.)\};)")
+    _combined_pattern = re.compile("(?<!.)\s*function\s+(([A-z]|_))+(::([A-z]|_)+)*\(\s*(%[A-z]+(\s*,\s*%[A-z]+)*)*\s*\)|((?<!.)\s*datablock\s+[A-z]+\s*\(\s*\S+\s*\)\s*(:\s*[A-z]+)?\s*(//.*)?\s*\{(\s|\S)*?\s*(?<!.)\s*\};)")
 
     bound_function_pattern = re.compile("(?<!.)\s*function\s+(([A-z]|_)+::)([A-z]|_)+\(\s*(%[A-z]+(\s*,\s*%[A-z]+)*)*\s*\)")
     function_pattern = re.compile("(?<!.)\s*function\s+([A-z]|_)+\(\s*(%[A-z]+(\w*,\s*%[A-z]+)*)*\s*\)")
@@ -664,7 +664,7 @@ class TSScraper(object):
                 if (datablock.derived is not None):
                     for parent in datablock.derived:
                         if (parent.lower() not in datablock_list.keys()):
-                            print("Warning: Datablock '%s' derives from non-existent parent '%s'! (Declaration in %s, line %u)" % (datablock.name, datablock.derived, datablock.filepath, datablock.line))
+                            print("Warning: Datablock '%s' derives from non-existent parent '%s'! (Declaration in %s, line %u)" % (datablock.name, parent, datablock.filepath, datablock.line))
                             datablock.derived.remove(parent)
                 elif (datablock.derived is not None):
                     datablock.derived = datablock_list[datablock.derived]