Renaming some ast resource classes and files so they make a lot more sense.

5 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb
index 2a8f4d4c1..9a2dc286c 100644
--- a/lib/puppet/parser/ast/astarray.rb
+++ b/lib/puppet/parser/ast/astarray.rb
@@ -71,5 +71,5 @@ class Puppet::Parser::AST
     # Used for abstracting the grammar declarations.  Basically unnecessary
     # except that I kept finding bugs because I had too many arrays that
     # meant completely different things.
-    class ResourceInst < ASTArray; end
+    class ResourceInstance < ASTArray; end
 end
diff --git a/lib/puppet/parser/ast/resourcedef.rb b/lib/puppet/parser/ast/resource.rb
index a432268f1..c53ab0a68 100644
--- a/lib/puppet/parser/ast/resourcedef.rb
+++ b/lib/puppet/parser/ast/resource.rb
@@ -1,9 +1,9 @@
-require 'puppet/parser/ast/resourceref'
+require 'puppet/parser/ast/resource_reference'
 
 # Any normal puppet resource declaration.  Can point to a definition or a
 # builtin type.
 class Puppet::Parser::AST
-class ResourceDef < AST::ResourceRef
+class Resource < AST::ResourceReference
     attr_accessor :title, :type, :exported, :virtual
     attr_reader :params
 
diff --git a/lib/puppet/parser/ast/resourcedefaults.rb b/lib/puppet/parser/ast/resource_defaults.rb
index 44ec146b0..44ec146b0 100644
--- a/lib/puppet/parser/ast/resourcedefaults.rb
+++ b/lib/puppet/parser/ast/resource_defaults.rb
diff --git a/lib/puppet/parser/ast/resourceoverride.rb b/lib/puppet/parser/ast/resource_override.rb
index 4232737fc..46c930902 100644
--- a/lib/puppet/parser/ast/resourceoverride.rb
+++ b/lib/puppet/parser/ast/resource_override.rb
@@ -1,9 +1,9 @@
-require 'puppet/parser/ast/resourcedef'
+require 'puppet/parser/ast/resource'
 
 class Puppet::Parser::AST
     # Set a parameter on a resource specification created somewhere else in the
     # configuration.  The object is responsible for verifying that this is allowed.
-    class ResourceOverride < ResourceDef
+    class ResourceOverride < Resource
         attr_accessor :object
         attr_reader :params
 
diff --git a/lib/puppet/parser/ast/resourceref.rb b/lib/puppet/parser/ast/resource_reference.rb
index 02a19d88d..b8edff8f1 100644
--- a/lib/puppet/parser/ast/resourceref.rb
+++ b/lib/puppet/parser/ast/resource_reference.rb
@@ -2,7 +2,7 @@ require 'puppet/parser/ast/branch'
 
 class Puppet::Parser::AST
     # A reference to an object.  Only valid as an rvalue.
-    class ResourceRef < AST::Branch
+    class ResourceReference < AST::Branch
         attr_accessor :title, :type
         # Is the type a builtin type?
         def builtintype?(type)