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

Object sections now parse properly

Browse Source
This commit is contained in:
Sasha Koshka 2022-08-20 13:43:10 -04:00
parent 0ceaedbcd8
commit 617d76fc46
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parser/objt.go
View File

@ -13,7 +13,10 @@ func (parser *ParsingOperation) parseObjtSection () (
err = parser.expect(lexer.TokenKindName) err = parser.expect(lexer.TokenKindName)
if err != nil { return } if err != nil { return }
section = &ObjtSection { location: parser.token.Location() } section = &ObjtSection {
location: parser.token.Location(),
members: make(map[string] ObjtMember),
}
// get permission // get permission
err = parser.nextToken(lexer.TokenKindPermission) err = parser.nextToken(lexer.TokenKindPermission)
@ -32,7 +35,9 @@ func (parser *ParsingOperation) parseObjtSection () (
if err != nil { return } if err != nil { return }
section.inherits, err = parser.parseType() section.inherits, err = parser.parseType()
if err != nil { return } if err != nil { return }
err = parser.nextToken(lexer.TokenKindNewline) err = parser.expect(lexer.TokenKindNewline)
if err != nil { return }
err = parser.nextToken()
if err != nil { return } if err != nil { return }
// parse members // parse members
@ -94,10 +99,7 @@ func (parser *ParsingOperation) parseObjtMembers (
if err != nil { return } if err != nil { return }
} }
// go onto the next line // add member to object section
err = parser.nextToken(lexer.TokenKindNewline) into.members[member.name] = member
if err != nil { return }
err = parser.nextToken()
if err != nil { return }
} }
} }