Skip to content
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 lib/elixir/lib/module/types/descr.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6081,7 +6081,7 @@ defmodule Module.Types.Descr do

# When doing BDD1 v BDD2, BDD2 is likely stored as a lazy union.
# However, if BDD2 appears in the constrained or dual nodes of BDD1,
# we want to remove them, to avoid carrying unecessary information.
# we want to remove them, to avoid carrying unnecessary information.
# This function does precisely so.
defp bdd_remove(_bdd, :bdd_top), do: :bdd_bot
defp bdd_remove(bdd, :bdd_bot), do: bdd
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/module/types/expr.ex
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ defmodule Module.Types.Expr do
context

# If there is a single clause, we assume it is always evaluated
# by doing reverse arrows and incorporting all variables into the context.
# by doing reverse arrows and incorporating all variables into the context.
# We have to evaluate the head again but it might have been preferred
# if we could somehow merge a previously computed context.
{_, [{arg_type, _body_type, {:->, meta, [head, body]}}]} ->
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/module/types/helpers.ex
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defmodule Module.Types.Helpers do
## Warnings

@doc """
Converts an itneger into ordinal.
Converts an integer into ordinal.
"""
def integer_to_ordinal(i) do
case rem(i, 10) do
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/module/types/of.ex
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ defmodule Module.Types.Of do
@doc """
Marks a variable with error.
This purposedly deletes all traces of the variable,
This purposely deletes all traces of the variable,
as it is often invoked when the cause for error is elsewhere.
"""
def error_var({_, meta, _}, context) do
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/src/elixir_rewrite.erl
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ inner_inline(_, _, _, _) -> false.
%%
%% Rewrite rules are more complex than regular inlining code
%% as they may change the number of arguments. However, they
%% cannot change tha argument order, as that can change the
%% cannot change the argument order, as that can change the
%% code semantics.
rewrite(?string_chars, DotMeta, to_string, Meta, [Arg]) ->
case is_always_string(Arg) of
Expand Down
4 changes: 2 additions & 2 deletions lib/elixir/src/elixir_tokenizer.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1918,13 +1918,13 @@ add_cursor(_Line, Column, noprune, Tokens) ->
{Column, Tokens};

add_cursor(Line, Column, {prune_and_cursor, true},
[{sigil, {_, _, {Line, Column}} = Location, Name, Parts, Modifier, Identation, Delimiter} | Rest]) ->
[{sigil, {_, _, {Line, Column}} = Location, Name, Parts, Modifier, Indentation, Delimiter} | Rest]) ->
Cursor = {'__cursor__', [{line, Line}, {column, Column}], []},
CursorModifier = case Modifier of
false -> Cursor;
List -> List ++ [Cursor]
end,
{Column + 12, [{sigil, Location, Name, Parts, CursorModifier, Identation, Delimiter} | Rest]};
{Column + 12, [{sigil, Location, Name, Parts, CursorModifier, Indentation, Delimiter} | Rest]};

add_cursor(Line, Column, {prune_and_cursor, _}, Tokens) ->
PrePrunedTokens = prune_identifier(Tokens),
Expand Down
Loading