From: ChaiShushan <chaishushan@gmail.com>
Date: Thu, 19 Dec 2013 17:14:07 +0000 (-0500)
Subject: cmd/yacc: expr example support windows
X-Git-Tag: go1.3beta1~1141
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0b26ba8af340c1ef5de8622c067b31b0d3fc4f1f;p=gostls13.git

cmd/yacc: expr example support windows

1. expr append executable extension.
2. support '\r' character.

Fixes #6851.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/35330043
---

diff --git a/src/cmd/yacc/Makefile b/src/cmd/yacc/Makefile
index 480844805f..f8c8169bd1 100644
--- a/src/cmd/yacc/Makefile
+++ b/src/cmd/yacc/Makefile
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-expr: yacc.go expr.y
+TARG=expr$(shell go env GOEXE)
+
+$(TARG): yacc.go expr.y
 	go run yacc.go -p expr expr.y
-	go build -o expr y.go
+	go build -o $(TARG) y.go
 
 clean:
-	rm -f y.go y.output expr
+	rm -f y.go y.output $(TARG)
diff --git a/src/cmd/yacc/expr.y b/src/cmd/yacc/expr.y
index 3afffe7ee8..77e9259dae 100644
--- a/src/cmd/yacc/expr.y
+++ b/src/cmd/yacc/expr.y
@@ -125,7 +125,7 @@ func (x *exprLex) Lex(yylval *exprSymType) int {
 		case '÷':
 			return '/'
 
-		case ' ', '\t', '\n':
+		case ' ', '\t', '\n', '\r':
 		default:
 			log.Printf("unrecognized character %q", c)
 		}