Have parser keep track of file name and line number.

bin/test.oh

@@ -18,6 +18,6 @@ while (define $path: readline) {
 	sed -e "s/^#[+-]     //g" |
 	prefix-lines $file
 
-	$path | prefix-lines $file
+	dynamic $stderr = $stdout; $path | prefix-lines $file
 } | sort | uniq -u
 

lib/boot.oh

@@ -189,9 +189,6 @@ define source: syntax e (name) as {
 
 	define f: open r- name
 
-	set-line-number: integer 0
-	set-source-file name
-
         define r: cons () ()
         define c = r
 	while (define l: f::read) {

pkg/boot/generated.go

@@ -196,9 +196,6 @@ define source: syntax e (name) as {
 
 	define f: open r- name
 
-	set-line-number: integer 0
-	set-source-file name
-
         define r: cons () ()
         define c = r
 	while (define l: f::read) {

pkg/parser/parser.go

@@ -17,7 +17,8 @@ type scanner struct {
 	task    *task.Task
 
 	cursor   int
-	indent   int
+	lineno   int
+	filename string
 	previous rune
 	start    int
 	state    int
@@ -93,9 +94,9 @@ main:
 				break
 			}
 
-			if s.task != nil {
-				s.task.Line++
-			}
+			s.lineno++
+			s.task.File = s.filename
+			s.task.Line = s.lineno
 
 			runes := []rune(line)
 			last := len(runes) - 2
@@ -285,19 +286,21 @@ main:
 }
 
 func (s *scanner) Error(msg string) {
-	s.task.PrintError(msg)
+	task.PrintError(s.filename, s.lineno, msg)
 }
 
 func Parse(t *task.Task,
 	r common.ReadStringer,
+	f string,
 	d func(string, uintptr) Cell,
-	p func(Cell)) {
+	c func(Cell)) {
 
 	s := new(scanner)
 
 	s.deref = d
+	s.filename = f
 	s.input = r
-	s.process = p
+	s.process = c
 	s.task = t
 
 restart:

pkg/task/task.go

@@ -25,7 +25,7 @@ type ui interface {
 	ReadString(delim byte) (line string, err error)
 }
 
-type reader func(*Task, common.ReadStringer,
+type reader func(*Task, common.ReadStringer, string,
 	func(string, uintptr) Cell, func(Cell))
 
 const (
@@ -788,6 +788,11 @@ func Pgid() int {
 	return pgid
 }
 
+func PrintError(file string, line int, msg string) {
+	file = path.Base(file)
+	fmt.Fprintf(os.Stderr, "%s: %d: %v\n", file, line, msg)
+}
+
 func Resolve(s Context, e *Env, k *Symbol) (v Reference) {
 	v = nil
 
@@ -811,9 +816,8 @@ func Start(parser reader, cli ui) {
 		<-task0.Done
 	}
 
-	task0.File = "boot.oh"
 	b := bufio.NewReader(strings.NewReader(boot.Script))
-	parse(task0, b, deref, eval)
+	parse(task0, b, "boot.oh", deref, eval)
 
 	/* Command-line arguments */
 	args := Null
@@ -856,8 +860,7 @@ func Start(parser reader, cli ui) {
 
 		pgid = BecomeProcessGroupLeader()
 
-		task0.File = "oh"
-		parse(task0, cli, deref, evaluate)
+		parse(task0, cli, "oh", deref, evaluate)
 
 		fmt.Printf("\n")
 		cli.Close()

pkg/task/types.go

@@ -10,7 +10,6 @@ import (
 	. "github.com/michaelmacinnis/oh/pkg/cell"
 	"math/big"
 	"os"
-	"path"
 	"runtime"
 	"strconv"
 	"strings"
@@ -647,7 +646,11 @@ func IsPipe(c Cell) bool {
 func NewPipe(l Context, r *os.File, w *os.File) Context {
 	p := &Pipe{
 		Scope: NewScope(l.Expose(), conduitEnv()),
-		b:     nil, c: nil, d: nil, r: r, w: w,
+		b:     nil,
+		c:     nil,
+		d:     nil,
+		r:     r,
+		w:     w,
 	}
 
 	if r == nil && w == nil {
@@ -709,7 +712,7 @@ func (p *Pipe) Read(t *Task) Cell {
 		p.c = make(chan Cell)
 		p.d = make(chan bool)
 		go func() {
-			parse(t, p.reader(), deref, func(c Cell) {
+			parse(t, p.reader(), p.r.Name(), deref, func(c Cell) {
 				p.c <- c
 				<-p.d
 			})
@@ -1475,27 +1478,6 @@ func (t *Task) Lookup(sym *Symbol, simple bool) (bool, string) {
 	return true, ""
 }
 
-func (t *Task) PrintError(msg string) {
-	file := "oh"
-	line := 0
-
-	if t != nil {
-		file = path.Base(t.File)
-		line = t.Line
-
-		t.File = "oh"
-		t.Line = 0
-	}
-
-	if line != 0 {
-		msg = fmt.Sprintf("%s: %d: %v\n", file, line, msg)
-	} else {
-		msg = fmt.Sprintf("%s: %v\n", file, msg)
-	}
-
-	fmt.Print(msg)
-}
-
 func (t *Task) Run(end Cell) (successful bool) {
 	successful = true
 
@@ -1505,7 +1487,7 @@ func (t *Task) Run(end Cell) (successful bool) {
 			return
 		}
 
-		t.PrintError(fmt.Sprintf("%v", r))
+		PrintError(t.File, t.Line, fmt.Sprintf("%v", r))
 
 		successful = false
 	}()