From 63419165dd809228a45875ed37a9db567b701bad Mon Sep 17 00:00:00 2001
From: Sasha Koshka <supergriffin64@gmail.com>
Date: Fri, 19 Aug 2022 02:08:18 -0400
Subject: [PATCH] Moved most of type section parsing into reusable type node
 parsing method

---
 parser/type.go | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/parser/type.go b/parser/type.go
index bc76c92..03ef8f1 100644
--- a/parser/type.go
+++ b/parser/type.go
@@ -14,24 +14,52 @@ func (parser *ParsingOperation) parseTypeSection () (
 	
 	section = &TypeSection { location: parser.token.Location() }
 
-	// get permission
-	err = parser.nextToken(lexer.TokenKindPermission)
+	// parse root node
+	err = parser.nextToken()
 	if err != nil { return }
-	section.root.permission = parser.token.Value().(types.Permission)
+	section.root, err = parser.parseTypeNode(true)
+
+	return
+}
+
+func (parser *ParsingOperation) parseTypeNode (
+	isRoot bool,
+) (
+	node TypeNode,
+	err  error,
+) {
+	node.children = make(map[string] TypeNode)
+
+	// determine the indent level of this type node. if this is the root
+	// node, assume the indent level is zero.
+	baseIndent := 0
+	if !isRoot {
+		err = parser.expect(lexer.TokenKindIndent)
+		if err != nil { return }
+		baseIndent = parser.token.Value().(int)
+		err = parser.nextToken()
+		if err != nil { return }
+	}
+
+	// get permission
+	err = parser.expect(lexer.TokenKindPermission)
+	if err != nil { return }
+	node.permission = parser.token.Value().(types.Permission)
 
 	// get name
 	err = parser.nextToken(lexer.TokenKindName)
 	if err != nil { return }
-	section.root.name = parser.token.Value().(string)
+	node.name = parser.token.Value().(string)
 
 	// get inherited type
 	err = parser.nextToken(lexer.TokenKindColon)
 	if err != nil { return }
 	err = parser.nextToken()
 	if err != nil { return }
-	section.root.what, err = parser.parseType()
+	node.what, err = parser.parseType()
 	if err != nil { return }
 
+	// get value, or child nodes
 	if parser.token.Is(lexer.TokenKindNewline) {
 		err = parser.nextToken()
 		if err != nil { return }
@@ -39,7 +67,7 @@ func (parser *ParsingOperation) parseTypeSection () (
 		// section.value, err = parser.parseInitializationValues(0)
 		// if err != nil { return }
 	} else {
-		section.root.defaultValue, err = parser.parseArgument()
+		node.defaultValue, err = parser.parseArgument()
 		if err != nil { return }
 
 		err = parser.expect(lexer.TokenKindNewline)