1 files changed, 12 insertions, 38 deletions
diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index 6af995fc13..9326309ff6 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -5,57 +5,31 @@
 
 require 'erb'
 require 'optparse'
-require_relative 'lib/vpath'
-require_relative 'lib/colorize'
+require_relative 'lib/output'
 
-vpath = VPath.new
-timestamp = nil
-output = nil
-ifchange = nil
+out = Output.new
 source = false
-color = nil
 templates = []
 
 ARGV.options do |o|
-  o.on('-t', '--timestamp[=PATH]') {|v| timestamp = v || true}
   o.on('-i', '--input=PATH') {|v| template << v}
-  o.on('-o', '--output=PATH') {|v| output = v}
-  o.on('-c', '--[no-]if-change') {|v| ifchange = v}
   o.on('-x', '--source') {source = true}
-  o.on('--color') {color = true}
-  vpath.def_options(o)
+  out.def_options(o)
   o.order!(ARGV)
   templates << (ARGV.shift or abort o.to_s) if templates.empty?
 end
-color = Colorize.new(color)
-unchanged = color.pass("unchanged")
-updated = color.fail("updated")
+
+# Used in prelude.c.tmpl and unicode_norm_gen.tmpl
+output = out.path
+vpath = out.vpath
+
+# A hack to prevent "unused variable" warnings
+output, vpath = output, vpath
 
 result = templates.map do |template|
-  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-    erb = ERB.new(File.read(template), trim_mode: '%-')
-  else
-    erb = ERB.new(File.read(template), nil, '%-')
-  end
+  erb = ERB.new(File.read(template), trim_mode: '%-')
   erb.filename = template
   source ? erb.src : proc{erb.result(binding)}.call
 end
 result = result.size == 1 ? result[0] : result.join("")
-if output
-  if ifchange and (vpath.open(output, "rb") {|f| f.read} rescue nil) == result
-    puts "#{output} #{unchanged}"
-  else
-    open(output, "wb") {|f| f.print result}
-    puts "#{output} #{updated}"
-  end
-  if timestamp
-    if timestamp == true
-      dir, base = File.split(output)
-      timestamp = File.join(dir, ".time." + base)
-    end
-    File.open(timestamp, 'a') {}
-    File.utime(nil, nil, timestamp)
-  end
-else
-  print result
-end
+out.write(result)