diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-03 04:13:00 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-03 04:13:00 +0000 |
| commit | 37330340833ddca9e542804fe64755ab8feb9eeb (patch) | |
| tree | db9974c675c3b73cae56a253386f716e83bc8b6f /lib/puppet/parser | |
| parent | a88799323a5779f002b65800ebb9d768bea27f05 (diff) | |
| download | puppet-37330340833ddca9e542804fe64755ab8feb9eeb.tar.gz puppet-37330340833ddca9e542804fe64755ab8feb9eeb.tar.xz puppet-37330340833ddca9e542804fe64755ab8feb9eeb.zip | |
Renaming parsedfile to loadedfile, which makes much more sense and reduces some naming conflicts
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1544 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 4 | ||||
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/parser.rb | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 535bf6e56..c4883deef 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -585,7 +585,7 @@ endcomma: # nothing end ---- header ---- require 'puppet' -require 'puppet/parsedfile' +require 'puppet/loadedfile' require 'puppet/parser/lexer' require 'puppet/parser/ast' #require 'puppet/parser/interpreter' @@ -648,7 +648,7 @@ def file=(file) if @files.detect { |f| f.file == file } raise Puppet::ImportError.new("Import loop detected") else - @files << Puppet::ParsedFile.new(file) + @files << Puppet::LoadedFile.new(file) @lexer.file = file end end diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 246bdce5b..ee770d02e 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -254,7 +254,7 @@ module Puppet # Add a new file to check for updateness. def newfile(file) unless @files.find { |f| f.file == file } - @files << Puppet::ParsedFile.new(file) + @files << Puppet::LoadedFile.new(file) end end diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 81f2aae8a..94ac1f6f1 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -8,7 +8,7 @@ require 'racc/parser' require 'puppet' -require 'puppet/parsedfile' +require 'puppet/loadedfile' require 'puppet/parser/lexer' require 'puppet/parser/ast' #require 'puppet/parser/interpreter' @@ -29,7 +29,7 @@ module Puppet class Parser < Racc::Parser -module_eval <<'..end grammar.ra modeval..id19f016e436', 'grammar.ra', 603 +module_eval <<'..end grammar.ra modeval..idaca07abf20', 'grammar.ra', 603 require 'puppet/parser/functions' attr_reader :file @@ -78,7 +78,7 @@ def file=(file) if @files.detect { |f| f.file == file } raise Puppet::ImportError.new("Import loop detected") else - @files << Puppet::ParsedFile.new(file) + @files << Puppet::LoadedFile.new(file) @lexer.file = file end end @@ -175,7 +175,7 @@ end # $Id$ -..end grammar.ra modeval..id19f016e436 +..end grammar.ra modeval..idaca07abf20 ##### racc 1.4.5 generates ### |
