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

Replaced references to file.Error with infoerr.Error

Browse Source
This commit is contained in:
Sasha Koshka
2022-08-18 00:58:40 -04:00
parent d42d0c5b34
commit 39e4fbe844
9 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/argument.go
View File

@@ -1,7 +1,7 @@
package parser
import "git.tebibyte.media/sashakoshka/arf/file"
import "git.tebibyte.media/sashakoshka/arf/lexer"
import "git.tebibyte.media/sashakoshka/arf/infoerr"
var validArgumentStartTokens = []lexer.TokenKind {
lexer.TokenKindName,
@@ -37,7 +37,7 @@ func (parser *ParsingOperation) parseArgument () (argument Argument, err error)
err = parser.token.NewError (
"cannot use member selection in " +
"a variable definition",
file.ErrorKindError)
infoerr.ErrorKindError)
return
}

4
parser/body.go
View File

@@ -1,7 +1,7 @@
package parser
import "git.tebibyte.media/sashakoshka/arf/file"
import "git.tebibyte.media/sashakoshka/arf/lexer"
import "git.tebibyte.media/sashakoshka/arf/infoerr"
// parse body parses the body of an arf file, after the metadata header.
func (parser *ParsingOperation) parseBody () (err error) {
@@ -27,7 +27,7 @@ func (parser *ParsingOperation) parseBody () (err error) {
default:
err = parser.token.NewError (
"unknown section type \"" + sectionType + "\"",
file.ErrorKindError)
infoerr.ErrorKindError)
return
}
}

6
parser/data.go
View File

@@ -1,8 +1,8 @@
package parser
import "git.tebibyte.media/sashakoshka/arf/file"
import "git.tebibyte.media/sashakoshka/arf/types"
import "git.tebibyte.media/sashakoshka/arf/lexer"
import "git.tebibyte.media/sashakoshka/arf/infoerr"
// parseData parses a data section.
func (parser *ParsingOperation) parseDataSection () (
@@ -132,7 +132,7 @@ func (parser *ParsingOperation) parseObjectInitializationValues () (
err = parser.token.NewError (
"duplicate member \"" + name + "\" in object " +
"member initialization",
file.ErrorKindError)
infoerr.ErrorKindError)
return
}
@@ -273,7 +273,7 @@ func (parser *ParsingOperation) parseType () (what Type, err error) {
default:
err = parser.token.NewError (
"unknown type qualifier \"" + qualifier + "\"",
file.ErrorKindError)
infoerr.ErrorKindError)
return
}

4
parser/meta.go
View File

@@ -1,7 +1,7 @@
package parser
import "git.tebibyte.media/sashakoshka/arf/file"
import "git.tebibyte.media/sashakoshka/arf/lexer"
import "git.tebibyte.media/sashakoshka/arf/infoerr"
// parseMeta parsese the metadata header at the top of an arf file.
func (parser *ParsingOperation) parseMeta () (err error) {
@@ -35,7 +35,7 @@ func (parser *ParsingOperation) parseMeta () (err error) {
default:
parser.token.NewError (
"unrecognized metadata field: " + field,
file.ErrorKindError)
infoerr.ErrorKindError)
}
err = parser.nextToken(lexer.TokenKindNewline)

5
parser/parser.go
View File

@@ -5,6 +5,7 @@ import "os"
import "path/filepath"
import "git.tebibyte.media/sashakoshka/arf/file"
import "git.tebibyte.media/sashakoshka/arf/lexer"
import "git.tebibyte.media/sashakoshka/arf/infoerr"
// ParsingOperation holds information about an ongoing parsing operation.
type ParsingOperation struct {
@@ -96,9 +97,9 @@ func (parser *ParsingOperation) expect (allowed ...lexer.TokenKind) (err error)
message += allowedItem.Describe()
}
err = file.NewError (
err = infoerr.NewError (
parser.token.Location(),
message, file.ErrorKindError)
message, infoerr.ErrorKindError)
return
}