From 69586ea07423a0ff375107408f8073c7235cec90 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <jaffee@umbel.com>
Date: Wed, 8 Mar 2017 14:03:21 -0600
Subject: [PATCH] rename NUMBER -> INTEGER

---
 pql/parser.go       | 4 ++--
 pql/scanner.go      | 2 +-
 pql/scanner_test.go | 2 +-
 pql/token.go        | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pql/parser.go b/pql/parser.go
index a5a72a0f7..346a47ccb 100644
--- a/pql/parser.go
+++ b/pql/parser.go
@@ -168,7 +168,7 @@ func (p *Parser) parseArgs() (map[string]interface{}, error) {
 			}
 		case STRING:
 			value = lit
-		case NUMBER:
+		case INTEGER:
 			v, err := strconv.ParseUint(lit, 10, 64)
 			if err != nil {
 				return nil, err
@@ -225,7 +225,7 @@ func (p *Parser) parseList() ([]interface{}, error) {
 			}
 		case STRING:
 			values = append(values, lit)
-		case NUMBER:
+		case INTEGER:
 			v, err := strconv.ParseUint(lit, 10, 64)
 			if err != nil {
 				return nil, err
diff --git a/pql/scanner.go b/pql/scanner.go
index 6fa0da377..e51f0ab52 100644
--- a/pql/scanner.go
+++ b/pql/scanner.go
@@ -143,7 +143,7 @@ func (s *Scanner) scanIdent() (tok Token, pos Pos, lit string) {
 // scanNumber consumes consecutive digits and up to one '.' character.
 func (s *Scanner) scanNumber() (tok Token, pos Pos, lit string) {
 	pos = s.pos
-	tok = NUMBER
+	tok = INTEGER
 
 	var buf bytes.Buffer
 	var seenDot bool
diff --git a/pql/scanner_test.go b/pql/scanner_test.go
index bc0cdd2f5..4dc2f4d8f 100644
--- a/pql/scanner_test.go
+++ b/pql/scanner_test.go
@@ -29,7 +29,7 @@ func TestScanner_Scan(t *testing.T) {
 		{s: `]`, tok: pql.RBRACK, lit: `]`},
 
 		{s: `foo`, tok: pql.IDENT, lit: `foo`},
-		{s: `100`, tok: pql.NUMBER, lit: `100`},
+		{s: `100`, tok: pql.INTEGER, lit: `100`},
 		{s: `100.3`, tok: pql.FLOAT, lit: `100.3`},
 
 		{s: `all`, tok: pql.ALL, lit: `all`},
diff --git a/pql/token.go b/pql/token.go
index 2fd263119..2ffc84400 100644
--- a/pql/token.go
+++ b/pql/token.go
@@ -15,7 +15,7 @@ const (
 	IDENT     // main
 	STRING    // "foo"
 	BADSTRING // bad escape or unclosed string
-	NUMBER    // 12345
+	INTEGER   // 12345
 	FLOAT     // 100.2
 	literal_end
 
@@ -36,9 +36,9 @@ var tokens = [...]string{
 	EOF:     "EOF",
 	WS:      "WS",
 
-	IDENT:  "IDENT",
-	NUMBER: "NUMBER",
-	FLOAT:  "FLOAT",
+	IDENT:   "IDENT",
+	INTEGER: "INTEGER",
+	FLOAT:   "FLOAT",
 
 	ALL: "ALL",