added support for ints and floats in query

99designs · Oct 20, 2016 · c12a8ad · c12a8ad
1 parent 0f85412
commit c12a8ad
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/internal/lexer/lexer.go b/internal/lexer/lexer.go
@@ -71,13 +71,24 @@ func (l *Lexer) ConsumeKeyword(keyword string) {
 	l.Consume()
 }
 
+func (l *Lexer) ConsumeInt() int32 {
+	text := l.sc.TokenText()
+	l.ConsumeToken(scanner.Int)
+	value, _ := strconv.Atoi(text)
+	return int32(value)
+}
+
+func (l *Lexer) ConsumeFloat() float64 {
+	text := l.sc.TokenText()
+	l.ConsumeToken(scanner.Int)
+	value, _ := strconv.ParseFloat(text, 64)
+	return value
+}
+
 func (l *Lexer) ConsumeString() string {
 	text := l.sc.TokenText()
 	l.ConsumeToken(scanner.String)
-	value, err := strconv.Unquote(text)
-	if err != nil {
-		l.SyntaxError(err.Error())
-	}
+	value, _ := strconv.Unquote(text)
 	return value
 }
 

diff --git a/internal/query/query.go b/internal/query/query.go
@@ -95,7 +95,7 @@ func (Literal) isValue()  {}
 
 func Parse(queryString string) (doc *Document, err *errors.GraphQLError) {
 	sc := &scanner.Scanner{
-		Mode: scanner.ScanIdents | scanner.ScanFloats | scanner.ScanStrings,
+		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
 	}
 	sc.Init(strings.NewReader(queryString))
 
@@ -296,6 +296,14 @@ func parseValue(l *lexer.Lexer) Value {
 		return &Variable{
 			Name: l.ConsumeIdent(),
 		}
+	case scanner.Int:
+		return &Literal{
+			Value: l.ConsumeInt(),
+		}
+	case scanner.Float:
+		return &Literal{
+			Value: l.ConsumeFloat(),
+		}
 	case scanner.String:
 		return &Literal{
 			Value: l.ConsumeString(),

diff --git a/internal/schema/schema.go b/internal/schema/schema.go
@@ -82,7 +82,7 @@ type Parameter struct {
 
 func Parse(schemaString string) (s *Schema, err *errors.GraphQLError) {
 	sc := &scanner.Scanner{
-		Mode: scanner.ScanIdents | scanner.ScanFloats | scanner.ScanStrings,
+		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
 	}
 	sc.Init(strings.NewReader(schemaString))