Skip to content

Add proper error handling semantics to FileStream. #1844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2017
Merged

Add proper error handling semantics to FileStream. #1844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions runtime/Go/antlr/file_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,19 @@ type FileStream struct {
filename string
}

func NewFileStream(fileName string) *FileStream {
func NewFileStream(fileName string) (*FileStream, error) {

buf := bytes.NewBuffer(nil)

f, _ := os.Open(fileName) // Error handling elided for brevity.
io.Copy(buf, f) // Error handling elided for brevity.
f.Close()
f, err := os.Open(fileName)
if err != nil {
return nil, err
}
defer f.Close()
err = io.Copy(buf, f)
if err != nil {
return nil, er
}

fs := new(FileStream)

Expand All @@ -34,7 +40,7 @@ func NewFileStream(fileName string) *FileStream {

fs.InputStream = NewInputStream(s)

return fs
return fs, nil

}

Expand Down