diff options
Diffstat (limited to 'src/cmd/yacc/yacc.go')
| -rw-r--r-- | src/cmd/yacc/yacc.go | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/cmd/yacc/yacc.go b/src/cmd/yacc/yacc.go index 76b3aeac5..c53dc3b74 100644 --- a/src/cmd/yacc/yacc.go +++ b/src/cmd/yacc/yacc.go @@ -357,7 +357,7 @@ func main() { func setup() { var j, ty int - stderr = bufio.NewWriter(os.NewFile(2, "stderr")) + stderr = bufio.NewWriter(os.Stderr) foutput = nil flag.Parse() @@ -555,17 +555,18 @@ outer: // process a rule rlines[nprod] = lineno + ruleline := lineno if t == '|' { curprod[mem] = prdptr[nprod-1][0] mem++ } else if t == IDENTCOLON { curprod[mem] = chfind(1, tokname) if curprod[mem] < NTBASE { - errorf("token illegal on LHS of grammar rule") + lerrorf(ruleline, "token illegal on LHS of grammar rule") } mem++ } else { - errorf("illegal rule: missing semicolon or | ?") + lerrorf(ruleline, "illegal rule: missing semicolon or | ?") } // read rule body @@ -586,11 +587,11 @@ outer: } if t == PREC { if gettok() != IDENTIFIER { - errorf("illegal %%prec syntax") + lerrorf(ruleline, "illegal %%prec syntax") } j = chfind(2, tokname) if j >= NTBASE { - errorf("nonterminal " + nontrst[j-NTBASE].name + " illegal after %%prec") + lerrorf(ruleline, "nonterminal "+nontrst[j-NTBASE].name+" illegal after %%prec") } levprd[nprod] = toklev[j] t = gettok() @@ -646,7 +647,7 @@ outer: // no explicit action, LHS has value tempty := curprod[1] if tempty < 0 { - errorf("must return a value, since LHS has a type") + lerrorf(ruleline, "must return a value, since LHS has a type") } if tempty >= NTBASE { tempty = nontrst[tempty-NTBASE].value @@ -654,7 +655,7 @@ outer: tempty = TYPE(toklev[tempty]) } if tempty != nontrst[curprod[0]-NTBASE].value { - errorf("default action causes potential type clash") + lerrorf(ruleline, "default action causes potential type clash") } fmt.Fprintf(fcode, "\n\tcase %v:", nprod) fmt.Fprintf(fcode, "\n\t\t%sVAL.%v = %sS[%spt-0].%v", @@ -1130,7 +1131,9 @@ func emitcode(code []rune, lineno int) { writecode(line) if !fmtImported && isPackageClause(line) { fmt.Fprintln(ftable, `import __yyfmt__ "fmt"`) - fmt.Fprintf(ftable, "//line %v:%v\n\t\t", infile, lineno+i) + if !lflag { + fmt.Fprintf(ftable, "//line %v:%v\n\t\t", infile, lineno+i) + } fmtImported = true } } @@ -2193,8 +2196,10 @@ nextk: func output() { var c, u, v int - fmt.Fprintf(ftable, "\n//line yacctab:1\n") - fmt.Fprintf(ftable, "var %sExca = []int{\n", prefix) + if !lflag { + fmt.Fprintf(ftable, "\n//line yacctab:1") + } + fmt.Fprintf(ftable, "\nvar %sExca = []int{\n", prefix) noset := mkset() @@ -2963,7 +2968,9 @@ func others() { } // copy yaccpar - fmt.Fprintf(ftable, "\n//line yaccpar:1\n") + if !lflag { + fmt.Fprintf(ftable, "\n//line yaccpar:1\n") + } parts := strings.SplitN(yaccpar, prefix+"run()", 2) fmt.Fprintf(ftable, "%v", parts[0]) @@ -3187,7 +3194,7 @@ func create(s string) *bufio.Writer { // // write out error comment // -func errorf(s string, v ...interface{}) { +func lerrorf(lineno int, s string, v ...interface{}) { nerrors++ fmt.Fprintf(stderr, s, v...) fmt.Fprintf(stderr, ": %v:%v\n", infile, lineno) @@ -3197,6 +3204,10 @@ func errorf(s string, v ...interface{}) { } } +func errorf(s string, v ...interface{}) { + lerrorf(lineno, s, v...) +} + func exit(status int) { if ftable != nil { ftable.Flush() @@ -3275,7 +3286,7 @@ out: c = $$Tok2[1] /* unknown char */ } if $$Debug >= 3 { - __yyfmt__.Printf("lex %U %s\n", uint(char), $$Tokname(c)) + __yyfmt__.Printf("lex %s(%d)\n", $$Tokname(c), uint(char)) } return c } @@ -3372,7 +3383,7 @@ $$default: Nerrs++ if $$Debug >= 1 { __yyfmt__.Printf("%s", $$Statname($$state)) - __yyfmt__.Printf("saw %s\n", $$Tokname($$char)) + __yyfmt__.Printf(" saw %s\n", $$Tokname($$char)) } fallthrough |