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

various: fix miscellaneous typos #93

Merged
merged 1 commit into from Feb 16, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Contributing.md
Expand Up @@ -41,7 +41,7 @@ will permit you to do:
$ bundle install
```

to get the development dependencies. If you aleady have `hoe` installed, you
to get the development dependencies. If you already have `hoe` installed, you
can accomplish the same thing with:

```sh
Expand Down Expand Up @@ -106,6 +106,7 @@ Thanks to everyone else who has contributed code or bug reports to Diff::LCS:
- Myron Marston
- Nicolas Leger
- Oleg Orlov
- Patrick Linnane
- Paul Kunysch
- Pete Higgins
- Peter Goldstein
Expand Down
3 changes: 3 additions & 0 deletions History.md
Expand Up @@ -2,6 +2,8 @@

## NEXT / YYYY-MM-DD

- Patrick Linnane fixed various minor typos. [#93][]

- Mark Young added a Changelog link to the RubyGems metadata. [#92][]

## 1.5.1 / 2024-01-31
Expand Down Expand Up @@ -427,6 +429,7 @@
[#90]: https://github.com/halostatue/diff-lcs/pull/90
[#91]: https://github.com/halostatue/diff-lcs/issues/91
[#92]: https://github.com/halostatue/diff-lcs/pull/92
[#93]: https://github.com/halostatue/diff-lcs/pull/93
[rspec/rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
[rspec/rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
[rspec/rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
Expand Down
6 changes: 3 additions & 3 deletions lib/diff/lcs.rb
Expand Up @@ -256,7 +256,7 @@ def sdiff(seq1, seq2, callbacks = nil, &block) # :yields: diff changes
#
# The methods for <tt>callbacks#match</tt>, <tt>callbacks#discard_a</tt>, and
# <tt>callbacks#discard_b</tt> are invoked with an event comprising the
# action ("=", "+", or "-", respectively), the indicies +i+ and +j+, and the
# action ("=", "+", or "-", respectively), the indexes +i+ and +j+, and the
# elements <tt>A[i]</tt> and <tt>B[j]</tt>. Return values are discarded by
# #traverse_sequences.
#
Expand Down Expand Up @@ -465,7 +465,7 @@ def traverse_sequences(seq1, seq2, callbacks = Diff::LCS::SequenceCallbacks) # :
# The methods for <tt>callbacks#match</tt>, <tt>callbacks#discard_a</tt>,
# <tt>callbacks#discard_b</tt>, and <tt>callbacks#change</tt> are invoked
# with an event comprising the action ("=", "+", "-", or "!", respectively),
# the indicies +i+ and +j+, and the elements <tt>A[i]</tt> and <tt>B[j]</tt>.
# the indexes +i+ and +j+, and the elements <tt>A[i]</tt> and <tt>B[j]</tt>.
# Return values are discarded by #traverse_balanced.
#
# === Context
Expand All @@ -482,7 +482,7 @@ def traverse_balanced(seq1, seq2, callbacks = Diff::LCS::BalancedCallbacks)

# Process all the lines in the match vector.
loop do
# Find next match indices +ma+ and +mb+
# Find next match indexes +ma+ and +mb+
loop do
ma += 1
break unless ma < matches.size && matches[ma].nil?
Expand Down