scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 17:15:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename NUMBER -> INTEGER

Browse source
This commit is contained in:
Matt Jaffee 2017-03-08 14:03:21 -06:00
parent f47c3a4521
commit 69586ea074
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pql/parser.go
View file

@ -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

2
pql/scanner.go
View file

@ -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

2
pql/scanner_test.go
View file

@ -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`},

8
pql/token.go
View file

@ -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",