fixups

Makefile

@@ -769,23 +769,23 @@ COCKROACHSHORT := ./cockroachshort$(SUFFIX)
 COCKROACHSQL   := ./cockroach-sql$(SUFFIX)
 
 LOG_TARGETS = \
-        pkg/util/log/severity/severity_generated.go \
-        pkg/util/log/channel/channel_generated.go \
-        pkg/util/log/eventpb/eventlog_channels_generated.go \
-        pkg/util/log/eventpb/json_encode_generated.go \
-        pkg/util/log/log_channels_generated.go
+	pkg/util/log/severity/severity_generated.go \
+	pkg/util/log/channel/channel_generated.go \
+	pkg/util/log/eventpb/eventlog_channels_generated.go \
+	pkg/util/log/eventpb/json_encode_generated.go \
+	pkg/util/log/log_channels_generated.go
 
 SQLPARSER_TARGETS = \
-        pkg/sql/parser/sql.go \
-        pkg/sql/parser/helpmap_test.go \
-        pkg/sql/parser/help_messages.go \
-        pkg/sql/lexbase/tokens.go \
-        pkg/sql/lexbase/keywords.go \
-        pkg/sql/lexbase/reserved_keywords.go \
-        pkg/sql/plpgsql/parser/plpgsql.go \
-        pkg/sql/plpgsql/parser/lexbase/tokens.go \
-        pkg/sql/plpgsql/parser/lexbase/keywords.go \
-        pkg/sql/scanner/token_names_test.go
+	pkg/sql/parser/sql.go \
+	pkg/sql/parser/helpmap_test.go \
+	pkg/sql/parser/help_messages.go \
+	pkg/sql/lexbase/tokens.go \
+	pkg/sql/lexbase/keywords.go \
+	pkg/sql/lexbase/reserved_keywords.go \
+	pkg/sql/plpgsql/parser/plpgsql.go \
+	pkg/sql/plpgsql/parser/lexbase/tokens.go \
+	pkg/sql/plpgsql/parser/lexbase/keywords.go \
+	pkg/sql/scanner/token_names_test.go
 
 PROTOBUF_TARGETS := bin/.go_protobuf_sources bin/.gw_protobuf_sources
 $(PROTOBUF_TARGETS): fake-protobufs
@@ -1498,6 +1498,7 @@ pkg/sql/lexbase/tokens.go: pkg/sql/parser/gen/sql.go.tmp
 	 echo; \
 	 grep '^const [A-Z][_A-Z0-9]* ' $^) > $@.tmp || rm $@.tmp
 	mv -f $@.tmp $@
+
 # The lex package is now the primary source for the token constant
 # definitions. Modify the code generated by goyacc here to refer to
 # the definitions in the lex package.

pkg/sql/plpgsql/parser/.gitignore

@@ -2,3 +2,5 @@
 # for reasoning and alternatives).
 
 plpgsql.go
+y.output
+gen

pkg/sql/plpgsql/parser/plpgsql.y

@@ -4,6 +4,7 @@ package parser
 import (
   "fmt"
 
+  "github.com/cockroachdb/cockroach/pkg/sql/plpgsql/parser/lexbase"
   "github.com/cockroachdb/cockroach/pkg/sql/scanner"
   "github.com/cockroachdb/cockroach/pkg/sql/sem/plpgsqltree"
   "github.com/cockroachdb/errors"