lib/review/preprocessor.rb in review-1.2.0 vs lib/review/preprocessor.rb in review-1.3.0

@@ -22,26 +22,26 @@
       @errutils_file = f
       @errutils_err = false
     end
 
     def warn(msg)
-      if @param["outencoding"] =~ /^EUC$/
+      if @config["outencoding"] =~ /^EUC$/
         msg = NKF.nkf("-W -e", msg)
-      elsif @param["outencoding"] =~ /^SJIS$/
+      elsif @config["outencoding"] =~ /^SJIS$/
         msg = NKF.nkf("-W -s", msg)
-      elsif @param["outencoding"] =~ /^JIS$/
+      elsif @config["outencoding"] =~ /^JIS$/
         msg = NKF.nkf("-W -j", msg)
       end
       $stderr.puts "#{location()}: warning: #{msg}"
     end
 
     def error(msg)
-      if @param["outencoding"] =~ /^EUC$/
+      if @config["outencoding"] =~ /^EUC$/
         msg = NKF.nkf("-W -e", msg)
-      elsif @param["outencoding"] =~ /^SJIS$/
+      elsif @config["outencoding"] =~ /^SJIS$/
         msg = NKF.nkf("-W -s", msg)
-      elsif @param["outencoding"] =~ /^JIS$/
+      elsif @config["outencoding"] =~ /^JIS$/
         msg = NKF.nkf("-W -j", msg)
       end
       @errutils_err = true
       raise ApplicationError, "#{location()}: #{msg}"
     end
@@ -104,11 +104,11 @@
       end
     end
 
     def initialize(repo, param)
       @repository = repo
-      @param = param
+      @config = param
     end
 
     def process(inf, outf)
       init_ErrorUtils inf
       @f = outf
@@ -140,11 +140,11 @@
           @f.print line
           get_output(expand(direc.arg), direc['stderr']).each do |out|
             @f.print out.string
           end
           skip_list f
-        
+
         when /\A\#@mapfile/
           direc = parse_directive(line, 1, 'eval')
           path = expand(direc.arg)
           ent = @repository.fetch_file(path)
           ent = evaluate(path, ent) if direc['eval']
@@ -164,11 +164,11 @@
         when /\A\#@/
           op = line.slice(/@(\w+)/, 1)
           #error "unkown directive: #{line.strip}" unless known_directive?(op)
           warn "unkown directive: #{line.strip}" unless known_directive?(op)
           @f.print line
-        
+
         when /\A\s*\z/   # empty line
           @f.puts
         else
           @f.print line
         end
@@ -183,25 +183,25 @@
       KNOWN_DIRECTIVES.index(op)
     end
 
     def convert_outencoding(*s)
       ine = ""
-      if @param["inencoding"] =~ /^EUC$/i
+      if @config["inencoding"] =~ /^EUC$/i
         ine = "-E,"
-      elsif @param["inencoding"] =~ /^SJIS$/i
+      elsif @config["inencoding"] =~ /^SJIS$/i
         ine = "-S,"
-      elsif @param["inencoding"] =~ /^JIS$/i
+      elsif @config["inencoding"] =~ /^JIS$/i
         ine = "-J,"
-      elsif @param["inencoding"] =~ /^UTF\-8$/i
+      elsif @config["inencoding"] =~ /^UTF\-8$/i
         ine = "-W,"
       end
 
-      if @param["outencoding"] =~ /^EUC$/i
+      if @config["outencoding"] =~ /^EUC$/i
         NKF.nkf("#{ine} -m0x -e", *s)
-      elsif @param["outencoding"] =~ /^SJIS$/i
+      elsif @config["outencoding"] =~ /^SJIS$/i
         NKF.nkf("#{ine} -m0x -s", *s)
-      elsif @param["outencoding"] =~ /^JIS$/i
+      elsif @config["outencoding"] =~ /^JIS$/i
         NKF.nkf("#{ine} -m0x -j", *s)
       else
         NKF.nkf("#{ine} -m0x -w", *s)
       end
     end
@@ -393,11 +393,11 @@
       @string = string
     end
 
     attr_reader :number
     attr_reader :string
-    alias to_s string
+    alias_method :to_s, :string
 
     def edit
       self.class.new(@number, yield(@string))
     end
 
@@ -416,11 +416,11 @@
     include TextUtils
     include ErrorUtils
 
     def initialize(param)
       @repository = {}
-      @param = param
+      @config = param
     end
 
     def fetch_file(file)
       file_descripter(file)['file']
     end
@@ -536,11 +536,11 @@
       repo
     end
 
     def canonical(line)
       tabwidth = 8
-      if @param['tabwidth']
-        tabwidth = @param['tabwidth']
+      if @config['tabwidth']
+        tabwidth = @config['tabwidth']
       end
       if tabwidth > 0
         detab(line, tabwidth).rstrip + "\n"
       else
         line