JS: return either (nil,err) or (ast,nil) from Parse

tdewolff · Feb 14, 2024 · 5d46320 · 5d46320
1 parent 11da24f
commit 5d46320
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/js/parse.go b/js/parse.go
@@ -75,16 +75,13 @@ func Parse(r *parse.Input, o Options) (*AST, error) {
  }
  }
 
- if p.err == nil {
- p.err = p.l.Err()
- } else {
+ if p.err != nil {
  offset := p.l.r.Offset() - len(p.data)
- p.err = parse.NewError(buffer.NewReader(p.l.r.Bytes()), offset, p.err.Error())
- }
- if p.err == io.EOF {
- p.err = nil
+ return nil, parse.NewError(buffer.NewReader(p.l.r.Bytes()), offset, p.err.Error())
+ } else if p.l.Err() != nil && p.l.Err() != io.EOF {
+ return nil, p.l.Err()
  }
- return ast, p.err
+ return ast, nil
 }
 
 ////////////////////////////////////////////////////////////////