From 2d4d22af7e8482054a6f802ec798f4af4d37596f Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Mon, 31 Oct 2016 16:42:30 -0700 Subject: [PATCH] cmd/compile: move parser.go remnants into noder.go Change-Id: I54f8788a4703283b9aa3904e2e610097ac3e3586 Reviewed-on: https://go-review.googlesource.com/32471 Run-TryBot: Matthew Dempsky Reviewed-by: Robert Griesemer --- src/cmd/compile/internal/gc/noder.go | 15 ++++++++++++++ src/cmd/compile/internal/gc/parser.go | 28 --------------------------- 2 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 src/cmd/compile/internal/gc/parser.go diff --git a/src/cmd/compile/internal/gc/noder.go b/src/cmd/compile/internal/gc/noder.go index 5e3206d6e67..4f1c883b5a1 100644 --- a/src/cmd/compile/internal/gc/noder.go +++ b/src/cmd/compile/internal/gc/noder.go @@ -1150,3 +1150,18 @@ func (p *noder) pragma(pos, line int, text string) syntax.Pragma { return 0 } + +func mkname(sym *Sym) *Node { + n := oldname(sym) + if n.Name != nil && n.Name.Pack != nil { + n.Name.Pack.Used = true + } + return n +} + +func unparen(x *Node) *Node { + for x.Op == OPAREN { + x = x.Left + } + return x +} diff --git a/src/cmd/compile/internal/gc/parser.go b/src/cmd/compile/internal/gc/parser.go deleted file mode 100644 index 8f630183ef5..00000000000 --- a/src/cmd/compile/internal/gc/parser.go +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package gc - -// The recursive-descent parser is built around a slighty modified grammar -// of Go to accommodate for the constraints imposed by strict one token look- -// ahead, and for better error handling. Subsequent checks of the constructed -// syntax tree restrict the language accepted by the compiler to proper Go. -// -// Semicolons are inserted by the lexer. The parser uses one-token look-ahead -// to handle optional commas and semicolons before a closing ) or } . - -func mkname(sym *Sym) *Node { - n := oldname(sym) - if n.Name != nil && n.Name.Pack != nil { - n.Name.Pack.Used = true - } - return n -} - -func unparen(x *Node) *Node { - for x.Op == OPAREN { - x = x.Left - } - return x -}