Grammar fixes (#647)

README.md

@@ -234,7 +234,7 @@ Parser implements the MacRuby 0.12 and RubyMotion mid-2015 parsers precisely. Ho
 
 ## Known issues
 
-Adding support for the following Ruby MRI features in Parser would needlessly complicate it, and as they all are very specific and rarely occuring corner cases, this is not done.
+Adding support for the following Ruby MRI features in Parser would needlessly complicate it, and as they all are very specific and rarely occurring corner cases, this is not done.
 
 Parser has been extensively tested; in particular, it parses almost entire [Rubygems][rg] corpus. For every issue, a breakdown of affected gems is offered.
 

lib/parser/source/tree_rewriter/action.rb

@@ -56,11 +56,11 @@ def do_combine(action)
         if action.range == @range
           merge(action)
         else
-          place_in_hierachy(action)
+          place_in_hierarchy(action)
         end
       end
 
-      def place_in_hierachy(action)
+      def place_in_hierarchy(action)
         family = @children.group_by { |child| child.relationship_with(action) }
 
         if family[:fusible]

test/test_source_comment_associator.rb

@@ -31,16 +31,16 @@ def test_associate
     ast, associations = associate(<<-END)
 #!/usr/bin/env ruby
 # coding: utf-8
-# class preceeding
-# another class preceeding
+# class preceding
+# another class preceding
 class Foo # class keyword line
-  # method foo preceeding
+  # method foo preceding
   def foo
     puts 'foo'
   end # method foo decorating
-  # method bar preceeding
+  # method bar preceding
   def bar
-    # expression preceeding
+    # expression preceding
     1 + # 1 decorating
       2
     # method bar sparse
@@ -58,25 +58,25 @@ def bar
 
     assert_equal 6, associations.size
     assert_equal [
-      '# class preceeding',
-      '# another class preceeding',
+      '# class preceding',
+      '# another class preceding',
       '# class sparse',
       '# class decorating'
     ], associations[klass_node].map(&:text)
     assert_equal [
       '# class keyword line'
     ], associations[klass_name_node].map(&:text)
     assert_equal [
-      '# method foo preceeding',
+      '# method foo preceding',
       '# method foo decorating'
     ], associations[foo_node].map(&:text)
     assert_equal [
-      '# method bar preceeding',
+      '# method bar preceding',
       '# method bar sparse',
       '# method bar decorating'
     ], associations[bar_node].map(&:text)
     assert_equal [
-      '# expression preceeding'
+      '# expression preceding'
     ], associations[expr_node].map(&:text)
     assert_equal [
       '# 1 decorating'
@@ -112,16 +112,16 @@ def test_associate_locations
     ast, associations = associate_locations(<<-END)
 #!/usr/bin/env ruby
 # coding: utf-8
-# class preceeding
-# another class preceeding
+# class preceding
+# another class preceding
 class Foo # class keyword line
-  # method foo preceeding
+  # method foo preceding
   def foo
     puts 'foo'
   end # method foo decorating
-  # method bar preceeding
+  # method bar preceding
   def bar
-    # expression preceeding
+    # expression preceding
     1 + # 1 decorating
       2
     # method bar sparse
@@ -139,25 +139,25 @@ def bar
 
     assert_equal 6, associations.size
     assert_equal [
-      '# class preceeding',
-      '# another class preceeding',
+      '# class preceding',
+      '# another class preceding',
       '# class sparse',
       '# class decorating'
     ], associations[klass_node.loc].map(&:text)
     assert_equal [
       '# class keyword line'
     ], associations[klass_name_node.loc].map(&:text)
     assert_equal [
-      '# method foo preceeding',
+      '# method foo preceding',
       '# method foo decorating'
     ], associations[foo_node.loc].map(&:text)
     assert_equal [
-      '# method bar preceeding',
+      '# method bar preceding',
       '# method bar sparse',
       '# method bar decorating'
     ], associations[bar_node.loc].map(&:text)
     assert_equal [
-      '# expression preceeding'
+      '# expression preceding'
     ], associations[expr_node.loc].map(&:text)
     assert_equal [
       '# 1 decorating'