From 730e0936d4bbf45851e69f60e2b584b8c192cbb1 Mon Sep 17 00:00:00 2001
From: 1046102779 <cdh_cjx@163.com>
Date: Wed, 4 Apr 2018 16:05:49 +0800
Subject: [PATCH] unexpected method has a error

---
 language/parser/parser.go | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/language/parser/parser.go b/language/parser/parser.go
index 32beef37..3e51ba5d 100644
--- a/language/parser/parser.go
+++ b/language/parser/parser.go
@@ -158,9 +158,7 @@ func parseDocument(parser *Parser) (*ast.Document, error) {
 				}
 				nodes = append(nodes, node)
 			default:
-				if err := unexpected(parser, lexer.Token{}); err != nil {
-					return nil, err
-				}
+				return nil, unexpected(parser, lexer.Token{})
 			}
 		} else if peekDescription(parser) {
 			node, err := parseTypeSystemDefinition(parser)
@@ -169,9 +167,7 @@ func parseDocument(parser *Parser) (*ast.Document, error) {
 			}
 			nodes = append(nodes, node)
 		} else {
-			if err := unexpected(parser, lexer.Token{}); err != nil {
-				return nil, err
-			}
+			return nil, unexpected(parser, lexer.Token{})
 		}
 	}
 	return ast.NewDocument(&ast.Document{
@@ -640,10 +636,8 @@ func parseValueLiteral(parser *Parser, isConst bool) (ast.Value, error) {
 			return parseVariable(parser)
 		}
 	}
-	if err := unexpected(parser, lexer.Token{}); err != nil {
-		return nil, err
-	}
-	return nil, nil
+
+	return nil, unexpected(parser, lexer.Token{})
 }
 
 func parseConstValue(parser *Parser) (interface{}, error) {
@@ -1570,11 +1564,9 @@ func expectKeyWord(parser *Parser, value string) (lexer.Token, error) {
 // Helper function for creating an error when an unexpected lexed token
 // is encountered.
 func unexpected(parser *Parser, atToken lexer.Token) error {
-	var token lexer.Token
+	var token = atToken
 	if (atToken == lexer.Token{}) {
 		token = parser.Token
-	} else {
-		token = parser.Token
 	}
 	description := fmt.Sprintf("Unexpected %v", lexer.GetTokenDesc(token))
 	return gqlerrors.NewSyntaxError(parser.Source, token.Start, description)