renamed lexer.Literal to lexer.BasicLit

99designs · May 23, 2017 · a9de617 · a9de617
1 parent 88c492b
commit a9de617
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/internal/common/stringify.go b/internal/common/stringify.go
@@ -10,7 +10,7 @@ import (
 
 func Stringify(v interface{}) string {
 	switch v := v.(type) {
-	case *lexer.Literal:
+	case *lexer.BasicLit:
 		return v.Text
 
 	case []interface{}:

diff --git a/internal/common/values.go b/internal/common/values.go
@@ -127,7 +127,7 @@ func parseValue(l *lexer.Lexer, constOnly bool) interface{} {
 	}
 }
 
-func UnmarshalLiteral(lit *lexer.Literal) interface{} {
+func UnmarshalLiteral(lit *lexer.BasicLit) interface{} {
 	switch lit.Type {
 	case scanner.Int, scanner.Float:
 		value, err := strconv.ParseFloat(lit.Text, 64)

diff --git a/internal/exec/resolvable/packer.go b/internal/exec/resolvable/packer.go
@@ -262,7 +262,7 @@ func (p *ValuePacker) Pack(r *Request, value interface{}) (reflect.Value, error)
 		return reflect.Value{}, errors.Errorf("got null for non-null")
 	}
 
-	if lit, ok := value.(*lexer.Literal); ok {
+	if lit, ok := value.(*lexer.BasicLit); ok {
 		value = common.UnmarshalLiteral(lit)
 	}
 
@@ -282,7 +282,7 @@ func (p *unmarshalerPacker) Pack(r *Request, value interface{}) (reflect.Value,
 		return reflect.Value{}, errors.Errorf("got null for non-null")
 	}
 
-	if lit, ok := value.(*lexer.Literal); ok {
+	if lit, ok := value.(*lexer.BasicLit); ok {
 		value = common.UnmarshalLiteral(lit)
 	}
 

diff --git a/internal/lexer/lexer.go b/internal/lexer/lexer.go
@@ -15,7 +15,7 @@ type Lexer struct {
 	descComment string
 }
 
-type Literal struct {
+type BasicLit struct {
 	Type rune
 	Text string
 }
@@ -106,7 +106,7 @@ func (l *Lexer) ConsumeVariable() Variable {
 }
 
 func (l *Lexer) ConsumeLiteral() interface{} {
-	lit := &Literal{Type: l.next, Text: l.sc.TokenText()}
+	lit := &BasicLit{Type: l.next, Text: l.sc.TokenText()}
 	l.Consume()
 	if lit.Type == scanner.Ident && lit.Text == "null" {
 		return nil

diff --git a/internal/validation/validation.go b/internal/validation/validation.go
@@ -422,7 +422,7 @@ func validateValue(v interface{}, t common.Type) (bool, string) {
 		return true, ""
 	}
 
-	if v, ok := v.(*lexer.Literal); ok {
+	if v, ok := v.(*lexer.BasicLit); ok {
 		if validateLiteral(v, t) {
 			return true, ""
 		}
@@ -467,7 +467,7 @@ func validateValue(v interface{}, t common.Type) (bool, string) {
 	return false, fmt.Sprintf("Expected type %q, found %s.", t, common.Stringify(v))
 }
 
-func validateLiteral(v *lexer.Literal, t common.Type) bool {
+func validateLiteral(v *lexer.BasicLit, t common.Type) bool {
 	switch t := t.(type) {
 	case *schema.Scalar:
 		switch t.Name {

diff --git a/introspection/introspection.go b/introspection/introspection.go
@@ -227,7 +227,7 @@ func (r *Field) DeprecationReason() *string {
 	if d == nil {
 		return nil
 	}
-	reason := common.UnmarshalLiteral(d.Args.MustGet("reason").Value.(*lexer.Literal)).(string)
+	reason := common.UnmarshalLiteral(d.Args.MustGet("reason").Value.(*lexer.BasicLit)).(string)
 	return &reason
 }
 
@@ -282,7 +282,7 @@ func (r *EnumValue) DeprecationReason() *string {
 	if d == nil {
 		return nil
 	}
-	reason := common.UnmarshalLiteral(d.Args.MustGet("reason").Value.(*lexer.Literal)).(string)
+	reason := common.UnmarshalLiteral(d.Args.MustGet("reason").Value.(*lexer.BasicLit)).(string)
 	return &reason
 }