Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix misspellings #4289

Merged
merged 1 commit into from
Jul 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coffee-script.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ parser.yy = require './nodes'

# Override Jison's default error handling function.
parser.yy.parseError = (message, {token}) ->
# Disregard Jison's message, it contains redundant line numer information.
# Disregard Jison's message, it contains redundant line number information.
# Disregard the token, we take its value directly from the lexer in case
# the error is caused by a generated token which might refer to its origin.
{errorToken, tokens} = parser
Expand Down
2 changes: 1 addition & 1 deletion src/nodes.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ exports.Code = class Code extends Base

#### Param

# A parameter in a function definition. Beyond a typical Javascript parameter,
# A parameter in a function definition. Beyond a typical JavaScript parameter,
# these parameters can also attach themselves to the context of the function,
# as well as be a splat, gathering up a group of parameters into an array.
exports.Param = class Param extends Base
Expand Down
8 changes: 4 additions & 4 deletions test/error_messages.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Error Formating
# ---------------
# Error Formatting
# ----------------

# Ensure that errors of different kinds (lexer, parser and compiler) are shown
# in a consistent way.
Expand All @@ -10,7 +10,7 @@ assertErrorFormat = (code, expectedErrorFormat) ->
eq expectedErrorFormat, "#{err}"
yes

test "lexer errors formating", ->
test "lexer errors formatting", ->
assertErrorFormat '''
normalObject = {}
insideOutObject = }{
Expand All @@ -21,7 +21,7 @@ test "lexer errors formating", ->
^
'''

test "parser error formating", ->
test "parser error formatting", ->
assertErrorFormat '''
foo in bar or in baz
''',
Expand Down