fspl/arf
fspl/arf
Archived
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Implemented parseObjectNewMember

Browse Source
This commit is contained in:
Sasha Koshka 2022-09-15 14:54:13 -04:00
parent fe57f5e0ee
commit 28312f1c7f
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
parser/type-notation.go
View File

@ -2,6 +2,7 @@ package parser
import "git.tebibyte.media/arf/arf/lexer" import "git.tebibyte.media/arf/arf/lexer"
import "git.tebibyte.media/arf/arf/infoerr" import "git.tebibyte.media/arf/arf/infoerr"
import "git.tebibyte.media/arf/arf/types"
// parseType parses a type notation of the form Name, {Name}, etc. // parseType parses a type notation of the form Name, {Name}, etc.
func (parser *ParsingOperation) parseType () (what Type, err error) { func (parser *ParsingOperation) parseType () (what Type, err error) {
@ -153,7 +154,7 @@ func (parser *ParsingOperation) parseObjectDefaultValueAndMembers () (
var memberValue Argument var memberValue Argument
memberName, memberName,
memberValue, err = parser.parseObjectMemberDefinition() memberValue, err = parser.parseObjectInheritedMember()
if err != nil { return } if err != nil { return }
if value.kind == ArgumentKindNil { if value.kind == ArgumentKindNil {
@ -173,8 +174,9 @@ func (parser *ParsingOperation) parseObjectDefaultValueAndMembers () (
// parsing a member declaration // parsing a member declaration
var member TypeMember var member TypeMember
member, member,
err = parser.parseObjectMemberDeclaration() err = parser.parseObjectNewMember()
// TODO: error on duplicate
members = append(members, member) members = append(members, member)
} }
} }
@ -216,7 +218,7 @@ func (parser *ParsingOperation) parseObjectDefaultValue () (
var memberName string var memberName string
var memberValue Argument var memberValue Argument
memberName, memberName,
memberValue, err = parser.parseObjectMemberDefinition() memberValue, err = parser.parseObjectInheritedMember()
attributes[memberName] = memberValue attributes[memberName] = memberValue
} }
@ -224,22 +226,22 @@ func (parser *ParsingOperation) parseObjectDefaultValue () (
return return
} }
// .ro name:Type:qualifier:<value> // .name:<value>
// parseObjectMemberDefinition parses a new default value for an inherited // parseObjectInheritedMember parses a new default value for an inherited
// member. // member.
func (parser *ParsingOperation) parseObjectMemberDefinition () ( func (parser *ParsingOperation) parseObjectInheritedMember () (
name string, name string,
value Argument, value Argument,
err error, err error,
) { ) {
// get the name of the inherited member // get the name of the inherited member
err = parser.expect(lexer.TokenKindName) err = parser.expect(lexer.TokenKindName)
value.location = parser.token.Location()
if err != nil { return } if err != nil { return }
name = parser.token.Value().(string) name = parser.token.Value().(string)
// we require a default value, or else why would this structure even be // we require a default value to be present
// present?
err = parser.nextToken(lexer.TokenKindColon) err = parser.nextToken(lexer.TokenKindColon)
if err != nil { return } if err != nil { return }
err = parser.nextToken(lexer.TokenKindLParen, lexer.TokenKindLessThan) err = parser.nextToken(lexer.TokenKindLParen, lexer.TokenKindLessThan)
@ -259,15 +261,29 @@ func (parser *ParsingOperation) parseObjectMemberDefinition () (
return return
} }
// .name:<value> // .ro name:Type:qualifier:<value>
// parseObjectMemberDeclaration parses an object member declaration, and its // parseObjectNewMember parses an object member declaration, and its
// default value if it exists. // default value if it exists.
func (parser *ParsingOperation) parseObjectMemberDeclaration () ( func (parser *ParsingOperation) parseObjectNewMember () (
member TypeMember, member TypeMember,
err error, err error,
) { ) {
// get member permission
err = parser.expect(lexer.TokenKindPermission) err = parser.expect(lexer.TokenKindPermission)
member.location = parser.token.Location()
if err != nil { return }
member.permission = parser.token.Value().(types.Permission)
// get member name
err = parser.nextToken(lexer.TokenKindName)
if err != nil { return }
member.name = parser.token.Value().(string)
// get type
err = parser.nextToken(lexer.TokenKindColon)
if err != nil { return }
member.what, err = parser.parseType()
if err != nil { return } if err != nil { return }
return return