parser will now ignore preceding whitespace in var blocks; removed un…

…used file penis
Chronitonity · Feb 26, 2016 · be29040 · be29040
1 parent 28ae2a7
commit be29040
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 74 deletions.
diff --git a/tools/mapmerge/dmm2tgm.py b/tools/mapmerge/dmm2tgm.py
diff --git a/tools/mapmerge/map_helpers.py b/tools/mapmerge/map_helpers.py
@@ -136,7 +136,6 @@ def write_dictionary_tgm(filename, dictionary):
             for thing in list_:
                 buffer = ""
                 in_quote_block = False
-                escaping_quote = False
                 in_varedit_block = False
                 for char in thing:
 
@@ -226,13 +225,12 @@ def parse_map(map_file):
         characters = map_input.read()
 
         in_quote_block = False
-        escaping_quote = False
         in_key_block = False
         in_data_block = False
         in_varedit_block = False
         after_data_block = False
-        escaping_parenthesis = 0
         escaping = False
+        skip_whitespace = False
 
         dictionary = collections.OrderedDict()
         curr_key = ""
@@ -285,12 +283,22 @@ def parse_map(map_file):
 
                             curr_datum = curr_datum + char
                             continue
+
+                        if skip_whitespace and char == " ":
+                            skip_whitespace = False
+                            continue
+                        skip_whitespace = False
 
                         if char == "\"":
                             curr_datum = curr_datum + char
                             in_quote_block = True
                             continue
 
+                        if char == ";":
+                            skip_whitespace = True
+                            curr_datum = curr_datum + char
+                            continue
+
                         if char == "}":
                             curr_datum = curr_datum + char
                             in_varedit_block = False

diff --git a/tools/mapmerge/mapmerger.py b/tools/mapmerge/mapmerger.py
@@ -1,7 +1,6 @@
 import sys
 import os
 import pathlib
-import dmm2tgm
 import map_helpers
 
 #main("../../_maps/")