Skip to content

Commit

Permalink
Fix accidental renames, build breakage
Browse files Browse the repository at this point in the history
  • Loading branch information
leebyron committed Aug 11, 2015
1 parent a623fc6 commit 7bb34be
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions src/language/parser.js
Expand Up @@ -172,37 +172,37 @@ function parseOperationDefinition(parser): OperationDefinition {
kind: OPERATION_DEFINITION,
operation,
name: parseName(parser),
variableDefinitions: parseValueDefinitions(parser),
variableDefinitions: parseVariableDefinitions(parser),
directives: parseDirectives(parser),
selectionSet: parseSelectionSet(parser),
loc: loc(parser, start)
};
}

function parseValueDefinitions(parser): Array<VariableDefinition> {
function parseVariableDefinitions(parser): Array<VariableDefinition> {
return peek(parser, TokenKind.PAREN_L) ?
many(
parser,
TokenKind.PAREN_L,
parseValueDefinition,
parseVariableDefinition,
TokenKind.PAREN_R
) :
[];
}

function parseValueDefinition(parser): VariableDefinition {
function parseVariableDefinition(parser): VariableDefinition {
var start = parser.token.start;
return {
kind: VARIABLE_DEFINITION,
variable: parseValue(parser),
variable: parseVariable(parser),
type: (expect(parser, TokenKind.COLON), parseType(parser)),
defaultValue:
skip(parser, TokenKind.EQUALS) ? parseValueLiteral(parser, true) : null,
loc: loc(parser, start)
};
}

function parseValue(parser): Variable {
function parseVariable(parser): Variable {
var start = parser.token.start;
expect(parser, TokenKind.DOLLAR);
return {
Expand Down Expand Up @@ -378,7 +378,7 @@ function parseValueLiteral(parser, isConst: boolean): Value {
break;
case TokenKind.DOLLAR:
if (!isConst) {
return parseValue(parser);
return parseVariable(parser);
}
break;
}
Expand Down
6 changes: 3 additions & 3 deletions src/type/definition.js
Expand Up @@ -197,7 +197,7 @@ export class GraphQLScalarType/* <T> */ {

parseLiteral(valueAST: Value): ?any/* T */ {
var parser = this._scalarConfig.parseLiteral;
return parser ? parser(value) : null;
return parser ? parser(valueAST) : null;
}

toString(): string {
Expand Down Expand Up @@ -655,8 +655,8 @@ export class GraphQLEnumType/* <T> */ {
}

parseLiteral(valueAST: Value): ?any/* T */ {
if (value.kind === ENUM) {
var enumValue = this._getNameLookup().get(value.value);
if (valueAST.kind === ENUM) {
var enumValue = this._getNameLookup().get(valueAST.value);
if (enumValue) {
return enumValue.value;
}
Expand Down

0 comments on commit 7bb34be

Please sign in to comment.