Add append() and token_error() for fixing wrong tabbing

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": [] }
-			parsed[-1].append(children)
+			children = { "type": "children", "content": [], "index": token["index"], "filepath": token["filepath"] }
+			append(children, parsed)
 			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,39 +30,50 @@ def get_parsed_tokens(tokens, parsed=None, token_idx=None, depth=0):
 			state = "start"
 
 		elif state == "start" and token["type"] == "WORD":
-			parsed[-1].append( { "type": "property", "content": token["content"] } )
+			append( { "type": "property", "content": token["content"] }, parsed )
 			state = "property"
 			token_idx[0] += 1
 		elif state == "property" and token["type"] == "EQUALS":
-			parsed[-1].append( { "type": "extra", "content": token["content"] } )
+			append( { "type": "extra", "content": token["content"] }, parsed )
 			state = "equals"
 			token_idx[0] += 1
 		elif state == "property" and token["type"] == "NEWLINES":
-			parsed[-1].append( { "type": "extra", "content": token["content"] } )
+			append( { "type": "extra", "content": token["content"] }, parsed )
 			state = "newline"
 			token_idx[0] += 1
 		elif state == "equals" and token["type"] == "WORD":
-			parsed[-1].append( { "type": "value", "content": token["content"] } )
+			append( { "type": "value", "content": token["content"] }, parsed )
 			state = "value"
 			token_idx[0] += 1
 		elif state == "value" and token["type"] == "NEWLINES":
-			parsed[-1].append( { "type": "extra", "content": token["content"] } )
+			append( { "type": "extra", "content": token["content"] }, parsed )
 			state = "newline"
 			token_idx[0] += 1
 
 		else:
-			parsed[-1].append( { "type": "extra", "content": token["content"] } )
+			append( { "type": "extra", "content": token["content"] }, parsed )
 			token_idx[0] += 1
 
 	return parsed
 
 
+def append(token, parsed):
+	if len(parsed) == 0:
+		token_error(token, "Incorrect tabbing at {line}, column {column} in {filepath}")
+
+	parsed[-1].append(token)
+
+
+def token_error(token, message):
+	line, column = get_token_position(token)
+	raise ValueError(message.format(line=line, column=column, filepath=token["filepath"]))
+
+
 def is_deeper(depth, token, tokens, next_token_idx):
 	new_depth = get_depth(token, tokens, next_token_idx)
 
 	if new_depth > depth + 1:
-		line, column = get_token_position(token)
-		raise ValueError(f"Too many tabs found at line {line}, column {column} in {token['filepath']}")
+		token_error(token, "Too many tabs found at line {line}, column {column} in {filepath}")
 
 	return new_depth > depth