Fix throwing of errors

Author: MyNameIsTrez

Python/ini_converting/ini_parser.py

@@ -16,8 +16,8 @@ def get_parsed_tokens(tokens, parsed=None, token_idx=None, depth=0):
 		token = tokens[token_idx[0]]
 
 		if   state == "newline" and is_deeper(depth, token, tokens, token_idx[0] + 1):
-			children = { "type": "children", "content": [], "index": token["index"], "filepath": token["filepath"] }
-			append(children, parsed)
+			children = { "type": "children", "content": [] }
+			append(children, parsed, token)
 			get_parsed_tokens(tokens, children["content"], token_idx, depth + 1)
 			# "state" is deliberately not being changed here.
 		elif state == "newline" and is_same_depth(depth, token, tokens, token_idx[0] + 1):
@@ -30,38 +30,38 @@ def get_parsed_tokens(tokens, parsed=None, token_idx=None, depth=0):
 			state = "start"
 
 		elif state == "start" and token["type"] == "WORD":
-			append( { "type": "property", "content": token["content"] }, parsed )
+			append( { "type": "property", "content": token["content"] }, parsed, token )
 			state = "property"
 			token_idx[0] += 1
 		elif state == "property" and token["type"] == "EQUALS":
-			append( { "type": "extra", "content": token["content"] }, parsed )
+			append( { "type": "extra", "content": token["content"] }, parsed, token )
 			state = "equals"
 			token_idx[0] += 1
 		elif state == "property" and token["type"] == "NEWLINES":
-			append( { "type": "extra", "content": token["content"] }, parsed )
+			append( { "type": "extra", "content": token["content"] }, parsed, token )
 			state = "newline"
 			token_idx[0] += 1
 		elif state == "equals" and token["type"] == "WORD":
-			append( { "type": "value", "content": token["content"] }, parsed )
+			append( { "type": "value", "content": token["content"] }, parsed, token )
 			state = "value"
 			token_idx[0] += 1
 		elif state == "value" and token["type"] == "NEWLINES":
-			append( { "type": "extra", "content": token["content"] }, parsed )
+			append( { "type": "extra", "content": token["content"] }, parsed, token )
 			state = "newline"
 			token_idx[0] += 1
 
 		else:
-			append( { "type": "extra", "content": token["content"] }, parsed )
+			append( { "type": "extra", "content": token["content"] }, parsed, token )
 			token_idx[0] += 1
 
 	return parsed
 
 
-def append(token, parsed):
+def append(parsed_token, parsed, token):
 	if len(parsed) == 0:
-		token_error(token, "Incorrect tabbing at {line}, column {column} in {filepath}")
+		token_error(token, "Incorrect tabbing at line {line}, column {column} in {filepath}")
 
-	parsed[-1].append(token)
+	parsed[-1].append(parsed_token)
 
 
 def token_error(token, message):

Python/ini_converting/ini_parser_tests.py

@@ -4,12 +4,9 @@
 
 
 def parser_tests():
-	# test("invalid_tabbing", [ # This is expected to raise a "Too many tabs found" error.
-	# 	[
-	# 		{ "type": "property", "content": "AddEffect" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "MOPixel" }, { "type": "extra", "content": "\n" },
-	# 		{ "type": "extra", "content": "\t\t" }, { "type": "property", "content": "Foo" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "Bar" },
-	# 	]
-	# ])
+	# test("invalid_tabbing", []) # This is expected to raise a "Too many tabs found" error.
+	# test("invalid_immediate_tab", []) # This is expected to raise an "Incorrect tabbing" error.
+	
 	test("simple", [
 		[
 			{ "type": "property", "content": "AddEffect" }, { "type": "extra", "content": " " }, { "type": "extra", "content": "=" }, { "type": "extra", "content": " " }, { "type": "value", "content": "MOPixel" },

Python/ini_converting/ini_test_files/invalid_immediate_tab.ini

@@ -0,0 +1 @@
+	Foo

Python/ini_converting/ini_tokenizer_tests.py

@@ -3,12 +3,15 @@
 
 
 def tokenizer_tests():
-	# It's fine that the tokenizer doesn't notice that there's invalid tabbing in "invalid_tabbing.ini" and happily outputs this data,
-	# because checking for invalid tabbing is the parser's responsibility.
+	# It's fine that the tokenizer doesn't notice that these invalid files, because complex checking is the parser's responsibility.
 	test("invalid_tabbing", [
 		{ "type": "WORD", "content": "AddEffect" }, { "type": "EXTRA", "content": " " }, { "type": "EQUALS", "content": "=" }, { "type": "EXTRA", "content": " " }, { "type": "WORD", "content": "MOPixel" }, { "type": "NEWLINES", "content": "\n" },
 		{ "type": "TABS", "content": "\t\t" }, { "type": "WORD", "content": "Foo" }, { "type": "EXTRA", "content": " " }, { "type": "EQUALS", "content": "=" }, { "type": "EXTRA", "content": " " }, { "type": "WORD", "content": "Bar" },
 	])
+	test("invalid_immediate_tab", [
+		{ "type": "TABS", "content": "\t" }, { "type": "WORD", "content": "Foo" },
+	])
+
 	test("simple", [
 		{ "type": "WORD", "content": "AddEffect" }, { "type": "EXTRA", "content": " " }, { "type": "EQUALS", "content": "=" }, { "type": "EXTRA", "content": " " }, { "type": "WORD", "content": "MOPixel" },
 	])
@@ -108,7 +111,6 @@ def tokenizer_tests():
 		{ "type": "WORD", "content": "Foo" }, { "type": "EXTRA", "content": " " }, { "type": "EQUALS", "content": "=" }, { "type": "NEWLINES", "content": "\n" }, { "type": "WORD", "content": "Bar" },
 	])
 
-
 def test(filename, expected):
 	filepath = tests.get_test_path_from_filename(filename)