diff options
| author | Rob Pike <r@golang.org> | 2015-09-17 13:46:46 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2015-09-18 18:09:15 +0000 |
| commit | 49065cbfe41877747f4e0bb67e2dd0833ec01b7a (patch) | |
| tree | 0aba1029583e27609d5bf0b698d9d60e1756f072 /src/cmd/asm/internal/lex/input.go | |
| parent | 49580db149b177b0bbebb9fc61094b1e6c5a38d2 (diff) | |
| download | go-49065cbfe41877747f4e0bb67e2dd0833ec01b7a.tar.xz | |
asm: handle EOF better
Add some error catches to prevent looping at EOF.
Also give better diagnostics.
Also add tests for these cases.
Fixes #12656.
Change-Id: I1355fc149b71c868e740bfa53de29c25d160777d
Reviewed-on: https://go-review.googlesource.com/14710
Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'src/cmd/asm/internal/lex/input.go')
| -rw-r--r-- | src/cmd/asm/internal/lex/input.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cmd/asm/internal/lex/input.go b/src/cmd/asm/internal/lex/input.go index cd9168064d..e5a33013e1 100644 --- a/src/cmd/asm/internal/lex/input.go +++ b/src/cmd/asm/internal/lex/input.go @@ -63,7 +63,12 @@ func predefine(defines flags.MultiFlag) map[string]*Macro { return macros } +var panicOnError bool // For testing. + func (in *Input) Error(args ...interface{}) { + if panicOnError { + panic(fmt.Errorf("%s:%d: %s", in.File(), in.Line(), fmt.Sprintln(args...))) + } fmt.Fprintf(os.Stderr, "%s:%d: %s", in.File(), in.Line(), fmt.Sprintln(args...)) os.Exit(1) } @@ -113,6 +118,10 @@ func (in *Input) Next() ScanToken { } fallthrough default: + if tok == scanner.EOF && len(in.ifdefStack) > 0 { + // We're skipping text but have run out of input with no #endif. + in.Error("unclosed #ifdef or #ifndef") + } in.beginningOfLine = tok == '\n' if in.enabled() { in.text = in.Stack.Text() @@ -251,6 +260,9 @@ func (in *Input) macroDefinition(name string) ([]string, []Token) { var tokens []Token // Scan to newline. Backslashes escape newlines. for tok != '\n' { + if tok == scanner.EOF { + in.Error("missing newline in macro definition for %q\n", name) + } if tok == '\\' { tok = in.Stack.Next() if tok != '\n' && tok != '\\' { |