gloss 0.1.1 → 0.1.6

data/lib/gloss/parser.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   class Parser

data/lib/gloss/prog_loader.rb

@@ -1,42 +1,58 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "rubygems/gem_runner"
 module Gloss
   OUTPUT_BY_PATH = Hash.new
   class ProgLoader
-    def initialize()
-      entrypoint = Config.entrypoint
-      (if entrypoint.==(nil) || entrypoint.==("")
+    attr_reader(:"type_checker")
+    def initialize(entrypoint_path = nil, entrypoint_contents = nil)
+      entrypoint_path ||= Config.entrypoint
+      (if entrypoint_path.==(nil) || entrypoint_path.==("")
         throw(:"error", "Entrypoint is not yet set in .gloss.yml")
       end)
-      @files_to_process = [Utils.absolute_path(Config.entrypoint), Utils.absolute_path(File.join(__dir__ || "", "..", "..", "sig", "core.rbs"))]
+      entrypoint = (if entrypoint_path && entrypoint_contents
+        ep = (if entrypoint_path.==(Runtime::NON_EXISTENT_FILEPATH)
+          entrypoint_path
+        else
+          Utils.absolute_path(entrypoint_path)
+        end)
+[ep, entrypoint_contents]
+      else
+        Utils.abs_path_with_contents(entrypoint_path)
+      end)
+      core_types = Utils.abs_path_with_contents(File.join(__dir__ || "", "..", "..", "sig", "core.rbs"))
+      @files_to_process = [entrypoint, core_types]
       @processed_files = Set.new
       @type_checker = TypeChecker.new
     end
     def run()
-      @files_to_process.each() { |path_string|
-        unless @processed_files.member?(path_string) || OUTPUT_BY_PATH.[](path_string)
-          Gloss.logger
+      @files_to_process.each() { |__arg0|
+        path_string = __arg0.[](0)
+        file_contents = __arg0.[](1)
+        (if path_string.end_with?(".rbs")
+          @type_checker.load_sig_path(path_string)
+        else
+          (if !@processed_files.member?(path_string) || !OUTPUT_BY_PATH.[](path_string)
+            Gloss.logger
 .debug("Loading #{path_string}")
-          path = Utils.absolute_path(path_string)
-          file_contents = File.open(path)
-.read
-          contents_tree = Parser.new(file_contents)
+            contents_tree = Parser.new(file_contents)
 .run
-          on_new_file_referenced = proc() { |pa, relative|
-            (if relative
-              handle_require_relative(pa)
-            else
-              handle_require(pa)
-            end)
-          }
-          OUTPUT_BY_PATH.[]=(path_string, Visitor.new(contents_tree, @type_checker, on_new_file_referenced)
+            on_new_file_referenced = proc() { |ps, relative|
+              ps.each() { |pa|
+                (if relative
+                  handle_require_relative(pa, path_string)
+                else
+                  handle_require(pa)
+                end)
+              }
+            }
+            OUTPUT_BY_PATH.[]=(path_string, Visitor.new(contents_tree, @type_checker, on_new_file_referenced)
 .run)
-          @processed_files.add(path_string)
-        end
+            @processed_files.add(path_string)
+          end)
+        end)
       }
 @type_checker
     end
@@ -48,19 +64,19 @@ module Gloss
         base = File.join(Dir.pwd, path)
         fp = base.+(".gl")
         (if File.exist?(fp)
-          @files_to_process.<<(fp)
+          @files_to_process.<<(Utils.abs_path_with_contents(fp))
         end)
 return
       end)
       full = File.absolute_path("#{File.join(Config.src_dir, "lib", path)}.gl")
       pathn = Pathname.new(full)
       (if pathn.file?
-        @files_to_process.<<(pathn.to_s)
+        @files_to_process.<<(Utils.abs_path_with_contents(pathn.to_s))
       else
         pathn = Pathname.new("#{File.join(Dir.pwd, "sig", path)}.rbs")
         gem_path = Utils.gem_path_for(path)
         (if gem_path
-          sig_files = Dir.glob(File.absolute_path(File.join(gem_path, "..", "..", "sig", "**", "*.rbs")))
+          sig_files = Dir.glob(File.absolute_path(File.join(gem_path, "..", "sig", "**", "*.rbs")))
           (if sig_files.length
 .positive?
             sig_files.each() { |fp|
@@ -81,7 +97,7 @@ return
           @type_checker.load_sig_path(pathn.to_s)
           @processed_files.add(pathn.to_s)
         else
-          rbs_stdlib_dir = File.absolute_path(File.join(@type_checker.rbs_gem_dir, "..", "..", "stdlib", path))
+          rbs_stdlib_dir = File.absolute_path(File.join(@type_checker.rbs_gem_dir, "..", "stdlib", path))
           (if Pathname.new(rbs_stdlib_dir)
 .exist?
             load_rbs_from_require_path(path)
@@ -103,24 +119,27 @@ nil            }
         end)
       end)
     end
-    private     def handle_require_relative(path)
-      base = File.join(@filepath, "..", path)
+    private     def handle_require_relative(path, source_file)
+      base = File.join(source_file, "..", path)
       # @type var pn: String?
       pn = nil
-      Gem.suffixes
-.each() { |ext|
+      exts = [".gl"].concat(Gem.suffixes)
+      exts.each() { |ext|
         full = File.absolute_path(base.+(ext))
         (if File.exist?(full)
           pn = full
         end)
       }
       (if pn
-        unless         @files_to_process.include?(pn)
-          @files_to_process.<<(pn)
+        unless         @files_to_process.any?() { |__arg1|
+          fp = __arg1.[](0)
+          fp.==(pn)
+        }
+          @files_to_process.<<(Utils.abs_path_with_contents(pn))
         end
       else
         (if Config.strict_require
-          throw(:"error", "Cannot resolve require path for #{pn}")
+          throw(:"error", "Cannot resolve relative path for #{path}")
         else
           Gloss.logger
 .debug("No path found for #{path}")
@@ -128,7 +147,7 @@ nil            }
       end)
     end
     private     def rbs_stdlib_path_for(libr)
-      File.absolute_path(File.join(@type_checker.rbs_gem_dir, "..", "..", "stdlib", libr))
+      File.absolute_path(File.join(@type_checker.rbs_gem_dir, "..", "stdlib", libr))
     end
     private     def load_rbs_from_require_path(path)
       Dir.glob(File.join(rbs_stdlib_path_for(path), "**", "*.rbs"))

data/lib/gloss/runtime.rb

@@ -0,0 +1,25 @@
+  
+  ##### This file was generated by Gloss; any changes made here will be overwritten.
+  ##### See / to make changes
+
+require "stringio"
+module Gloss
+  class Runtime
+    NON_EXISTENT_FILEPATH = "__string__"
+    def self.process_string(str, options = Config.default_config)
+      out_io = StringIO.new
+      error_msg = catch(:"error") { ||
+        tree = Parser.new(str)
+.run
+        tc = ProgLoader.new(NON_EXISTENT_FILEPATH, str)
+.run
+        rb_output = Visitor.new(tree, tc)
+.run
+        tc.run(NON_EXISTENT_FILEPATH, rb_output)
+        Writer.new(rb_output, NON_EXISTENT_FILEPATH, out_io)
+.run
+nil      }
+return [out_io.string, error_msg].freeze
+    end
+  end
+end

data/lib/gloss/scope.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   class Scope < Hash

data/lib/gloss/source.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   class Source < String

data/lib/gloss/type_checker.rb

@@ -1,18 +1,27 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "set"
 module Gloss
   class TypeChecker
-    Project = Struct.new(:"targets")
     attr_reader(:"steep_target", :"top_level_decls", :"env", :"rbs_gem_dir")
+    module Strictness
+      Strict = "strict"
+      Lenient = "lenient"
+      Default = "default"
+    end
     def initialize()
-      @steep_target = Steep::Project::Target.new(name: "gloss", options:       Steep::Project::Options.new
-.tap() { |o|
-        o.allow_unknown_constant_assignment=(true)
-      }, source_patterns: ["**/*.rb"], ignore_patterns:       Array.new, signature_patterns: ["sig"])
+      options = Steep::Project::Options.new
+case Config.type_checking_strictness
+        when Strictness::Strict
+          options.apply_strict_typing_options!
+        when Strictness::Lenient
+          options.apply_lenient_typing_options!
+        else
+          options.apply_default_typing_options!
+      end
+      @steep_target = Steep::Project::Target.new(name: "gloss", options: options, source_patterns: ["**/*.rb"], ignore_patterns:       Array.new, signature_patterns: ["sig"])
       @top_level_decls = Set.new
       @rbs_gem_dir = Utils.gem_path_for("rbs")
       env_loader = RBS::EnvironmentLoader.new
@@ -51,7 +60,7 @@ case e
             when Steep::Diagnostic::Ruby::UnexpectedBlockGiven
               "Unexpected block given"
             else
-              "#{e.header_line}\n#{e.inspect}"
+              "#{e.header_line}\n#{e}"
           end
         }
 .join("\n")

data/lib/gloss/utils.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "rubygems"
 module Gloss
@@ -21,17 +20,11 @@ module Gloss
       end)
     end
     def gem_path_for(gem_name)
-      begin
-        Gem.ui
-.instance_variable_set(:"@outs", StringIO.new)
-        Gem::GemRunner.new
-.run(["which", gem_name])
-        Gem.ui
-.outs
-.string
-      rescue SystemExit => e
-        nil
-      end
+      spec = Gem::Specification.find_by_path(gem_name)
+      (if spec
+        spec.full_require_paths
+.first
+      end)
     end
     def with_file_header(str)
       "#{Visitor::FILE_HEADER}\n\n#{str}"
@@ -40,5 +33,10 @@ module Gloss
       src_path.sub("#{Config.src_dir}/", "")
 .sub(/\.gl$/, ".rb")
     end
+    def abs_path_with_contents(path)
+      abs_path = absolute_path(path)
+return [abs_path, File.open(abs_path)
+.read].freeze
+    end
   end
 end

data/lib/gloss/version.rb

@@ -1,8 +1,7 @@
-# frozen_string_literal: true
-
-##### This file was generated by Gloss; any changes made here will be overwritten.
-##### See src/ to make changes
+  
+  ##### This file was generated by Gloss; any changes made here will be overwritten.
+  ##### See / to make changes
 
 module Gloss
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

data/lib/gloss/visitor.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   class Visitor
@@ -123,7 +122,7 @@ case node.[](:"type")
           else
             RBS::Types::Bases::Any.new(location:             build_location(node))
           end)
-          method_types = [RBS::MethodType.new(type_params: EMPTY_ARRAY, type:           RBS::Types::Function.new(required_positionals:           args.dig(:"types", :"required_positionals"), optional_positionals:           args.dig(:"types", :"optional_positionals"), rest_positionals:           args.dig(:"types", :"rest_positionals"), trailing_positionals:           args.dig(:"types", :"trailing_positionals"), required_keywords:           args.dig(:"types", :"required_keywords"), optional_keywords:           args.dig(:"types", :"optional_keywords"), rest_keywords:           args.dig(:"types", :"rest_keywords"), return_type: return_type), block:           (if node.[](:"yield_arg_count")
+          method_types = [RBS::MethodType.new(type_params: EMPTY_ARRAY, type:           RBS::Types::Function.new(required_positionals:           args.dig(:"types", :"required_positionals"), optional_positionals:           args.dig(:"types", :"optional_positionals"), rest_positionals:           args.dig(:"types", :"rest_positionals"), trailing_positionals:           args.dig(:"types", :"trailing_positionals"), required_keywords:           args.dig(:"types", :"required_keywords"), optional_keywords:           args.dig(:"types", :"optional_keywords"), rest_keywords:           args.dig(:"types", :"rest_keywords"), return_type: return_type), block:           (if node.[](:"yield_arg_count") || args.dig(:"types", :"block_arg")
             RBS::Types::Block.new(type:             RBS::Types::Function.new(required_positionals:             Array.new, optional_positionals:             Array.new, rest_positionals: nil, trailing_positionals:             Array.new, required_keywords:             Hash.new, optional_keywords:             Hash.new, rest_keywords: nil, return_type:             RBS::Types::Bases::Any.new(location:             build_location(node))), required: !!node.[](:"block_arg") || node.[](:"yield_arg_count"))
           else
             nil
@@ -184,6 +183,7 @@ EMPTY_ARRAY          }
           else
             nil
           end)
+          name = node.[](:"name")
           block = (if node.[](:"block")
             " #{visit_node(node.[](:"block"))}"
           else
@@ -195,14 +195,21 @@ EMPTY_ARRAY          }
           else
             nil
           end)
-          name = node.[](:"name")
           call = "#{obj}#{name}#{opening_delimiter}#{args}#{(if has_parens
             ")"
           end)}#{block}"
 case name
             when "require_relative"
               (if @on_new_file_referenced
-                @on_new_file_referenced.call(name, true)
+                paths = arg_arr.map() { |a|
+                  unless                   a.[](:"type")
+.==("LiteralNode")
+                    throw(:"error", "Dynamic file paths are not allowed in require_relative")
+                  end
+                  eval(visit_node(a, scope)
+.strip)
+                }
+                @on_new_file_referenced.call(paths, true)
               end)
             when "module_function"
               @after_module_function = true
@@ -254,7 +261,7 @@ case name
           path = node.[](:"value")
           src.write_ln("require \"#{path}\"")
           (if @on_new_file_referenced
-            @on_new_file_referenced.call(path, false)
+            @on_new_file_referenced.call([path], false)
           end)
         when "Assign", "OpAssign"
           src.write_ln("#{visit_node(node.[](:"target"))} #{node.[](:"op")}= #{visit_node(node.[](:"value"))
@@ -608,7 +615,9 @@ EMPTY_HASH      }
       end)
       # @type var rest_kw: Hash[Symbol, Any]?
       rest_kw =       node.[](:"rest_kw_args")
-      (if [rp, op, rkw, okw, rest_p, rest_kw].all?() { |a|
+      # @type var block_arg: Hash[Symbol, Any]?
+      block_arg =       node.[](:"block_arg")
+      (if [rp, op, rkw, okw, rest_p, rest_kw, block_arg].all?() { |a|
 a && a.empty?      }
         return nil
       end)
@@ -626,6 +635,10 @@ a && a.empty?      }
         "**#{visit_node(rest_kw)}"
       else
         ""
+      end), (if block_arg
+        "&#{visit_node(block_arg)}"
+      else
+        ""
       end)].reject(&:"empty?")
 .flatten
 .join(", ")
@@ -650,6 +663,7 @@ a && a.empty?      }
 :trailing_positionals => EMPTY_ARRAY,
 :required_keywords => node.[](:"req_kw_args") || EMPTY_HASH,
 :optional_keywords => node.[](:"opt_kw_args") || EMPTY_HASH,
+:block_arg => true,
 :rest_keywords =>       (if node.[](:"rest_kw_args")
         RBS::Types::Function::Param.new(name:         visit_node(node.[](:"rest_kw_args"))
 .to_sym, type:         RBS::Types::Bases::Any.new(location:         build_location(node)))

data/lib/gloss/watcher.rb

@@ -1,11 +1,12 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "listen"
 module Gloss
   class Watcher
+    # @type var @listener: Listen?
+    @listener
     def initialize(paths)
       @paths = paths
       (if @paths.empty?
@@ -32,7 +33,7 @@ module Gloss
     def watch()
       Gloss.logger
 .info("Now listening for changes in #{@paths.join(", ")}")
-      listener = Listen.to(*@paths, latency: 2, only: @only) { |modified, added, removed|
+      @listener ||= Listen.to(*@paths, latency: 2, only: @only) { |modified, added, removed|
         modified.+(added)
 .each() { |f|
           Gloss.logger
@@ -64,13 +65,18 @@ nil          }
         }
       }
       begin
-        listener.start
+        @listener.start
         sleep
       rescue Interrupt
-        Gloss.logger
-.info("Interrupt signal received, shutting down")
-        exit(0)
+        kill
       end
     end
+    def kill()
+      Gloss.logger
+.info("Interrupt signal received, shutting down")
+      (if @listener
+        @listener.stop
+      end)
+    end
   end
 end