Tester works, yay Marius!

Author: MyNameIsTrez

Python/ini_converting/ini_parser.py

@@ -1,4 +1,4 @@
-def get_parsed_tokens(tokens, parsed, token_idx, depth=-1):
+def get_parsed_tokens(tokens, parsed, token_idx, depth=0):
 	"""
 	start -> tabs -> property -> equals -> value -> newline
     ^   v            ^                              v
@@ -10,46 +10,40 @@ def get_parsed_tokens(tokens, parsed, token_idx, depth=-1):
 	while token_idx[0] < len(tokens):
 		token = tokens[token_idx[0]]
 
-		if depth == -1:
-			parsed.append([])
-			get_parsed_tokens(tokens, parsed[-1], token_idx, depth + 1)
-
-		elif state == "start" and token["type"] == "TABS" and is_deeper(depth, token):
-			parsed.append(
-			{ "type": "lines_tokens", "content": [
-				[
-
-				]
-			]}
-			)
-			get_parsed_tokens(tokens, parsed[-1]["content"][0], token_idx, depth + 1)
+		if state == "start" and token["type"] == "TABS" and is_deeper(depth, token):
+			children = { "type": "children", "content": [] }
+			parsed[-1].append(children)
+			get_parsed_tokens(tokens, children["content"], token_idx, depth + 1)
+		elif state == "start" and is_less_deep(depth, token):
+			return
 
-		elif state == "start" and token["type"] == "TABS":
-			parsed.append( { "type": "extra", "content": token["content"] } )
+		elif state == "start":
+			parsed.append([])
+			state = "not-start"
+		elif state == "not-start" and token["type"] == "TABS":
+			parsed[-1].append( { "type": "extra", "content": token["content"] } )
 			state = "tabs"
 			token_idx[0] += 1
-		elif (state == "start" or state == "tabs") and token["type"] == "WORD":
-			parsed.append( { "type": "property", "content": token["content"] } )
+		elif (state == "not-start" or state == "tabs") and token["type"] == "WORD":
+			parsed[-1].append( { "type": "property", "content": token["content"] } )
 			state = "property"
 			token_idx[0] += 1
-		elif state == "start" and is_less_deep(depth, token):
-			return
 
 		elif state == "property" and token["type"] == "EQUALS":
-			parsed.append( { "type": "extra", "content": token["content"] } )
+			parsed[-1].append( { "type": "extra", "content": token["content"] } )
 			state = "equals"
 			token_idx[0] += 1
 		elif state == "equals" and token["type"] == "WORD":
-			parsed.append( { "type": "value", "content": token["content"] } )
+			parsed[-1].append( { "type": "value", "content": token["content"] } )
 			state = "value"
 			token_idx[0] += 1
 		elif state == "value" and token["type"] == "NEWLINES":
-			parsed.append( { "type": "extra", "content": token["content"] } )
+			parsed[-1].append( { "type": "extra", "content": token["content"] } )
 			state = "start"
 			token_idx[0] += 1
 
 		else:
-			parsed.append( { "type": "extra", "content": token["content"] } )
+			parsed[-1].append( { "type": "extra", "content": token["content"] } )
 			token_idx[0] += 1
 
 	return parsed
@@ -65,4 +59,4 @@ def is_deeper(depth, token):
 
 
 def get_depth(token):
-	return len(token["content"])
+	return len(token["content"]) if token["type"] == "TABS" else 0