Location is now included in structs via composition

parser/argument.go

@@ -16,7 +16,7 @@ var validArgumentStartTokens = []lexer.TokenKind {
 }
 
 func (parser *ParsingOperation) parseArgument () (argument Argument, err error) {
-	argument.location = parser.token.Location()
+	argument.setLocation(parser.token.Location())
 
 	err = parser.expect(validArgumentStartTokens...)
 	if err != nil { return }
@@ -44,9 +44,8 @@ func (parser *ParsingOperation) parseArgument () (argument Argument, err error)
 
 			argument.kind  = ArgumentKindDeclaration
 			argument.value = Declaration {
-				location: argument.location,
+				name: identifier.trail[0],
-				name:     identifier.trail[0],
+				what: what,
-				what:     what,
 			}
 		} else {
 			argument.kind  = ArgumentKindIdentifier

parser/data.go

@@ -11,7 +11,8 @@ func (parser *ParsingOperation) parseDataSection () (
 	err = parser.expect(lexer.TokenKindName)
 	if err != nil { return }
 	
-	section = &DataSection { location: parser.token.Location() }
+	section = &DataSection { }
+	section.setLocation(parser.token.Location())
 
 	err = parser.nextToken(lexer.TokenKindPermission)
 	if err != nil { return }

parser/enum.go

@@ -11,7 +11,8 @@ func (parser *ParsingOperation) parseEnumSection () (
 	err = parser.expect(lexer.TokenKindName)
 	if err != nil { return }
 	
-	section = &EnumSection { location: parser.token.Location() }
+	section = &EnumSection { }
+	section.setLocation(parser.token.Location())
 
 	// get permission
 	err = parser.nextToken(lexer.TokenKindPermission)

parser/face.go

@@ -13,9 +13,9 @@ func (parser *ParsingOperation) parseFaceSection () (
 	if err != nil { return }
 	
 	section = &FaceSection {
-		location: parser.token.Location(),
 		behaviors:  make(map[string] FaceBehavior),
 	}
+	section.setLocation(parser.token.Location())
 
 	// get permission
 	err = parser.nextToken(lexer.TokenKindPermission)

parser/func.go

@@ -12,7 +12,8 @@ func (parser *ParsingOperation) parseFuncSection () (
 	err = parser.expect(lexer.TokenKindName)
 	if err != nil { return }
 	
-	section = &FuncSection { location: parser.token.Location() }
+	section = &FuncSection { }
+	section.setLocation(parser.token.Location())
 
 	// get permission
 	err = parser.nextToken(lexer.TokenKindPermission)

parser/node-traits.go

@@ -0,0 +1,30 @@
+package parser
+
+import "git.tebibyte.media/arf/arf/file"
+import "git.tebibyte.media/arf/arf/infoerr"
+
+// locatable allows a tree node to have a location.
+type locatable struct {
+	location file.Location
+}
+
+// Location returns the location of the node.
+func (trait locatable) Location (location file.Location) {
+	location = trait.location
+	return
+}
+
+// setLocation sets the location of the node.
+func (trait locatable) setLocation (location file.Location) {
+	trait.location = location
+}
+
+// NewError creates a new error at the node's location.
+func (trait locatable) NewError (
+	message string,
+	kind    infoerr.ErrorKind,
+) (
+	err infoerr.Error,
+) {
+	return infoerr.NewError(trait.location, message, kind)
+}

parser/objt.go

@@ -13,7 +13,8 @@ func (parser *ParsingOperation) parseObjtSection () (
 	err = parser.expect(lexer.TokenKindName)
 	if err != nil { return }
 	
-	section = &ObjtSection { location: parser.token.Location() }
+	section = &ObjtSection { }
+	section.setLocation(parser.token.Location())
 
 	// get permission
 	err = parser.nextToken(lexer.TokenKindPermission)

parser/tree.go

@@ -21,8 +21,8 @@ type SyntaxTree struct {
 
 // Identifier represents a chain of arguments separated by a dot.
 type Identifier struct {
-	location file.Location
+	locatable
-	trail    []string
+	trail []string
 }
 
 // TypeKind represents what kind of type a type is