lrama 0.7.0 → 0.7.1

data/lib/lrama/options.rb

@@ -1,28 +1,46 @@
+# rbs_inline: enabled
 # frozen_string_literal: true
 
 module Lrama
   # Command line options.
   class Options
-    attr_accessor :skeleton, :header, :header_file,
-                  :report_file, :outfile,
-                  :error_recovery, :grammar_file,
-                  :trace_opts, :report_opts,
-                  :diagnostic, :y, :debug, :define
+    attr_accessor :skeleton #: String
+    attr_accessor :locations #: bool
+    attr_accessor :header #: bool
+    attr_accessor :header_file #: String?
+    attr_accessor :report_file #: String?
+    attr_accessor :outfile #: String
+    attr_accessor :error_recovery #: bool
+    attr_accessor :grammar_file #: String
+    attr_accessor :trace_opts #: Hash[Symbol, bool]?
+    attr_accessor :report_opts #: Hash[Symbol, bool]?
+    attr_accessor :warnings #: bool
+    attr_accessor :y #: IO
+    attr_accessor :debug #: bool
+    attr_accessor :define #: Hash[String, String]
+    attr_accessor :diagram #: bool
+    attr_accessor :diagram_file #: String
+    attr_accessor :profile_opts #: Hash[Symbol, bool]?
 
+    # @rbs () -> void
     def initialize
       @skeleton = "bison/yacc.c"
+      @locations = false
       @define = {}
       @header = false
       @header_file = nil
       @report_file = nil
       @outfile = "y.tab.c"
       @error_recovery = false
-      @grammar_file = nil
+      @grammar_file = ''
       @trace_opts = nil
       @report_opts = nil
-      @diagnostic = false
+      @warnings = false
       @y = STDIN
       @debug = false
+      @diagram = false
+      @diagram_file = "diagram.html"
+      @profile_opts = nil
     end
   end
 end

data/lib/lrama/output.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require "erb"
 require "forwardable"
-require_relative "report/duration"
+require_relative "tracer/duration"
 
 module Lrama
   class Output
     extend Forwardable
-    include Report::Duration
+    include Tracer::Duration
 
     attr_reader :grammar_file_path, :context, :grammar, :error_recovery, :include_header
 
@@ -43,7 +42,7 @@ module Lrama
     end
 
     def render_partial(file)
-      render_template(partial_file(file))
+      ERB.render(partial_file(file), context: @context, output: self)
     end
 
     def render
@@ -405,16 +404,10 @@ module Lrama
     private
 
     def eval_template(file, path)
-      tmp = render_template(file)
+      tmp = ERB.render(file, context: @context, output: self)
       replace_special_variables(tmp, path)
     end
 
-    def render_template(file)
-      erb = self.class.erb(File.read(file))
-      erb.filename = file
-      erb.result_with_hash(context: @context, output: self)
-    end
-
     def template_file
       File.join(template_dir, @template_name)
     end