gloss 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0bcae87434234732f58cc6d0bb9a1408a72fae1f51b9fe0c1dcf86249784fe2
-  data.tar.gz: d3db73f4c6e907a0b11eaba71f4428680372b56df1e3e6d8df973e80c8346e26
+  metadata.gz: 3a1461d26e97ea9693ee00d63016e0fa1e34ea719de672ae0d4c303e4efb5144
+  data.tar.gz: 2370827768056a2575c1987d661a140d7247b68629e049aa58b0bc9d1de0bc31
 SHA512:
-  metadata.gz: d58d4583ec2c703c023741bc6fd211fd146d81e3e90b3c882b5c4e37aa4cb12de2ad8cf46f6c26a7bf392cfd6accc1372cbaa01be8eb763468918d0a60d05eba
-  data.tar.gz: ab6244066db5797def1d7225598c87e5bd9cde3385b303854e176332a96c16f8fbbe6f4a531dadb6fe6e22e9d860152daab4b5d4282af79646f7421ce4cde0e3
+  metadata.gz: 17d5c598e8199b375599112a4365cb14691e651783a86880844dd35ff312dc2ca2ed0bb632e0a51897dcd3ba774231ae9c547710f19ed134318a39e098224a37
+  data.tar.gz: 6626ff60cab24dacfc6e6780368a719e04c45c80c1f4e8b89db76bfdc0848f725e33d907058b6c9991fc80c1b97b518503eb42a47435c733f43a4e0d0d49eb0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloss (0.0.2)
+    gloss (0.0.3)
       fast_blank
       listen
       rbs
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.0)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -26,14 +26,14 @@ GEM
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
     ffi (1.14.2)
-    i18n (1.8.6)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
-    listen (3.4.0)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -44,40 +44,40 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rake-compiler (1.1.1)
       rake
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (1.0.0)
-    regexp_parser (2.0.0)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.5.1)
+    rspec-support (3.10.1)
+    rubocop (1.7.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     steep (0.39.0)
       activesupport (>= 5.1)
       ast_utils (~> 0.3.0)
@@ -103,4 +103,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/ext/gloss/spec/parser_spec.cr

@@ -88,4 +88,37 @@ module Gloss
       hsh : Hash[String, String] = { "hello" => "world" }
     GLS
   end
+
+  it "parses method calls in case statements" do
+    expected =
+      %q|{"type":"Case","condition":{"type":"LiteralNode","value":"\"abc\"","rb_type":"String"},"whens":[{"type":"When","conditions":[{"type":"Proc","function":{"type":"DefNode","name":"->","body":{"type":"Call","name":"start_with?","args":[{"type":"LiteralNode","value":"\"a\"","rb_type":"String"}],"object":{"type":"Var","name":"x"},"block":null,"block_arg":null},"rp_args":[{"type":"Arg","name":"x","external_name":"x","default_value":null,"restriction":null,"keyword_arg":false}],"receiver":null,"return_type":null,"rest_kw_args":null}}],"body":{"type":"LiteralNode","value":"1","rb_type":"Integer"},"exhaustive":false}],"else":{"type":"LiteralNode","value":"0","rb_type":"Integer"},"exhaustive":false}|
+    Gloss.parse_string(<<-GLS).should eq expected
+      case "abc"
+      when .start_with? 'a'
+        1
+      else
+        0
+      end
+    GLS
+  end
+
+  it "allows constant methods" do
+    Gloss.parse_string(<<-GLS).should be_truthy
+      def Hello(arg = nil)
+      end
+
+      Hello()
+
+      Hello("a")
+    GLS
+  end
+
+  it "requires constant methods to be called with ()" do
+    Gloss.parse_string(<<-GLS).should be_falsey
+      def Hello(arg = nil)
+      end
+
+      Hello
+    GLS
+  end
 end

data/ext/gloss/src/cr_ast.cr

@@ -62,7 +62,7 @@ module Crystal
 
   class SymbolLiteral < ASTNode
     def to_rb
-      Rb::AST::LiteralNode.new(":#{@value.to_s}", Rb::AST::RbLiteral::Symbol)
+      Rb::AST::LiteralNode.new(%{:"#{@value.to_s}"}, Rb::AST::RbLiteral::Symbol)
     end
   end
 
@@ -74,13 +74,13 @@ module Crystal
 
   class HashLiteral < ASTNode
     def to_rb
-      Rb::AST::HashLiteral.new(@entries.map { |e| { e.key.to_rb, e.value.to_rb }})
+      Rb::AST::HashLiteral.new(@entries.map { |e| {e.key.to_rb, e.value.to_rb} })
     end
   end
 
   class NamedTupleLiteral < ASTNode
     def to_rb
-      Rb::AST::HashLiteral.new(@entries.map { |e| { e.key, e.value.to_rb }}, frozen: true)
+      Rb::AST::HashLiteral.new(@entries.map { |e| {e.key, e.value.to_rb} }, frozen: true)
     end
   end
 
@@ -92,7 +92,7 @@ module Crystal
 
   class RegexLiteral < ASTNode
     def to_rb
-      Rb::AST::RegexLiteral.new("//")
+      Rb::AST::RegexLiteral.new(@value.to_rb)
     end
   end
 
@@ -105,7 +105,7 @@ module Crystal
   class Def < ASTNode
     def to_rb
       Rb::AST::DefNode.new(@name, @args.map(&.to_rb), @body.to_rb, receiver.try(&.to_rb),
-                           return_type.try(&.to_rb), @double_splat.try(&.to_rb))
+        return_type.try(&.to_rb), @double_splat.try(&.to_rb))
     end
   end
 
@@ -135,8 +135,14 @@ module Crystal
 
   class Call < ASTNode
     def to_rb
-      Rb::AST::Call.new(@obj.try(&.to_rb), @name, @args.map(&.to_rb), @block.try(&.to_rb),
-                        @block_arg.try(&.to_rb))
+      Rb::AST::Call.new(
+        @obj.try(&.to_rb),
+        @name,
+        @args.map(&.to_rb),
+        @named_args.try(&.map(&.to_rb.as(Rb::AST::Arg))),
+        @block.try(&.to_rb),
+        @block_arg.try(&.to_rb)
+      )
     end
   end
 
@@ -145,13 +151,13 @@ module Crystal
 
     def to_rb
       Rb::AST::Arg.new(@name, @external_name, @restriction.try(&.to_rb),
-                       @default_value.try(&.to_rb), @keyword_arg)
+        @default_value.try(&.to_rb), @keyword_arg)
     end
   end
 
   class NamedArgument < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::Arg.new(@name, @name, nil, @value.to_rb, true)
     end
   end
 
@@ -161,6 +167,12 @@ module Crystal
     end
   end
 
+  class Unless < ASTNode
+    def to_rb
+      Rb::AST::Unless.new(@cond.to_rb, @then.to_rb, @else.to_rb)
+    end
+  end
+
   class Assign < ASTNode
     def to_rb
       Rb::AST::Assign.new(@target.to_rb, @value.to_rb)
@@ -295,7 +307,20 @@ module Crystal
   class When < ASTNode
     def to_rb
       Rb::AST::When.new(
-        @conds.map(&.to_rb),
+        @conds.map do |c|
+          if c.is_a? Call
+            arg_name = "x"
+            ProcLiteral.new(
+              Def.new(
+                "->",
+                [Arg.new(arg_name)],
+                c.tap { |call| call.obj = Var.new(arg_name) }
+              )
+            ).to_rb
+          else
+            c.to_rb
+          end
+        end,
         @body.to_rb,
         @exhaustive
       )
@@ -351,7 +376,7 @@ module Crystal
   class ExceptionHandler < ASTNode
     def to_rb
       Rb::AST::ExceptionHandler.new(@body.to_rb, @rescues.try(&.map(&.to_rb)), @else.try(&.to_rb),
-                                    @ensure.try(&.to_rb))
+        @ensure.try(&.to_rb))
     end
   end
 
@@ -373,11 +398,41 @@ module Crystal
     end
   end
 
-  {% for class_name in %w[ProcNotation Macro OffsetOf VisibilityModifier IsA RespondsTo
+  class ProcLiteral < ASTNode
+    def to_rb
+      Rb::AST::Proc.new(@def.to_rb)
+    end
+  end
+
+  class Include < ASTNode
+    def to_rb
+      Rb::AST::Include.new(@name.to_rb)
+    end
+  end
+
+  class Extend < ASTNode
+    def to_rb
+      Rb::AST::Extend.new(@name.to_rb)
+    end
+  end
+
+  class IsA < ASTNode
+    def to_rb
+      Rb::AST::Call.new(
+        @obj.to_rb,
+        "is_a?",
+        [@const.to_rb],
+        nil,
+        nil,
+        nil
+      )
+    end
+  end
+
+  {% for class_name in %w[ProcNotation Macro OffsetOf VisibilityModifier  RespondsTo
                          Select ImplicitObj AnnotationDef While Until UninitializedVar
-                         ProcLiteral ProcPointer Self Yield Include
-                         Extend LibDef FunDef TypeDef CStructOrUnionDef ExternalVar Alias
-                         Metaclass Cast NilableCast TypeOf Annotation
+                         ProcPointer Self Yield LibDef FunDef TypeDef CStructOrUnionDef
+                         ExternalVar Alias Metaclass Cast NilableCast TypeOf Annotation
                          Underscore MagicConstant Asm AsmOperand] %}
     class {{class_name.id}} < ASTNode
       def to_rb

data/ext/gloss/src/parser.cr

@@ -17,10 +17,10 @@ module Gloss
       line = @line_number
       column = @token.column_number
 
-      # next_token_skip_space
-      # next_token_skip_space_or_newline
-      # of = nil
-      Crystal::ArrayLiteral.new([] of Crystal::ASTNode) # .at_end(of)
+      next_token_skip_space
+      next_token_skip_space_or_newline
+      of = nil
+      Crystal::ArrayLiteral.new([] of Crystal::ASTNode).at_end(of)
     end
 
     def new_hash_literal(entries, line, column, end_location, allow_of = true)

data/ext/gloss/src/rb_ast.cr

@@ -113,16 +113,16 @@ module Rb
     end
 
     class Arg < Node
-      @info : NamedTuple(type: String, name: String, external_name: String, default_value: Node?,
+      @info : NamedTuple(type: String, name: String, external_name: String, value: Node?,
         restriction: Node?, keyword_arg: Bool)
 
-      def initialize(name : String, external_name : String, restriction : Node?, default_value :
+      def initialize(name : String, external_name : String, restriction : Node?, value :
           Node?, keyword_arg)
         @info = {
           type:          self.class.name.split("::").last,
           name:          name,
           restriction:   restriction,
-          default_value: default_value,
+          value: value,
           external_name: external_name,
           keyword_arg: keyword_arg
         }
@@ -200,7 +200,17 @@ module Rb
       delegate :to_json, to: @info
     end
 
-    class RegexLiteral < NodeWithValue
+    class RegexLiteral < Node
+      @info : NamedTuple(type: String, value: Node)
+
+      def initialize(value)
+        @info = {
+          type:  self.class.name.split("::").last,
+          value: value,
+        }
+      end
+
+      delegate :to_json, to: @info
     end
 
     class Nop < Node
@@ -308,9 +318,10 @@ module Rb
     end
 
     class Call < Node
-      @info : NamedTuple(type: String, name: String, args: Array(Node), object: Node?, block: Block?, block_arg: Node?)
+      @info : NamedTuple(type: String, name: String, args: Array(Node), object: Node?, block:
+      Block?, block_arg: Node?, named_args: Array(Arg)?)
 
-      def initialize(object : Node?, name : String, args : Array(Node), block, block_arg)
+      def initialize(object : Node?, name : String, args : Array(Node), named_args, block, block_arg)
         @info = {
           type:      self.class.name.split("::").last,
           name:      name,
@@ -318,6 +329,7 @@ module Rb
           object:    object,
           block:     block,
           block_arg: block_arg,
+          named_args: named_args,
         }
       end
 
@@ -519,5 +531,37 @@ module Rb
 
       delegate :to_json, to: @info
     end
+
+    class Proc < Node
+      @info : NamedTuple(type: String, function: DefNode)
+
+      def initialize(function)
+        @info = {
+          type:  self.class.name.split("::").last,
+          function: function
+        }
+      end
+
+      delegate :to_json, to: @info
+    end
+
+    class NodeWithNameNode < Node
+      @info : NamedTuple(type: String, name: Node)
+
+      def initialize(name)
+        @info = {
+          type:  self.class.name.split("::").last,
+          name: name
+        }
+      end
+
+      delegate :to_json, to: @info
+    end
+
+    class Extend < NodeWithNameNode
+    end
+
+    class Include < NodeWithNameNode
+    end
   end
 end

data/lib/gloss/builder.rb

@@ -15,8 +15,13 @@ module Gloss
 
     def run
       rb_output = visit_node(@tree)
-      rb_output = "# frozen_string_literal: true\n#{rb_output}" if Config.frozen_string_literals
-      rb_output
+      <<~RUBY
+        #{"# frozen_string_literal: true\n" if Config.frozen_string_literals}
+        ##### This file was generated by Gloss; any changes made here will be overwritten.
+        ##### See #{Config.src_dir}/ to make changes
+
+        #{rb_output}
+      RUBY
     end
 
     def visit_node(node, scope = Scope.new)
@@ -24,24 +29,39 @@ module Gloss
       case node[:type]
       when "ClassNode"
         class_name = visit_node(node[:name])
-        superclass = if node[:superclass]
-                       @eval_vars = true
-                       visit_node(node[:superclass])
-                       @eval_vars = false
-                     else
-                       nil
-                     end
+        current_namespace = @current_scope ? @current_scope.name.to_namespace : RBS::Namespace.root
+        superclass_type = nil
+        superclass_output = nil
+        if node[:superclass]
+          @eval_vars = true
+          superclass_output = visit_node(node[:superclass])
+          @eval_vars = false
+          ns = if superclass_output.start_with? '::'
+                 RBS::Namespace.root
+               elsif superclass_output.include? '::'
+                 current_namespace
+               else
+                 RBS::Namespace.empty
+               end
+          superclass_type = RBS::AST::Declarations::Class::Super.new(
+            name: RBS::TypeName.new(
+              name: superclass_output.to_sym,
+              namespace: ns
+            ),
+            args: [],
+            location: nil
+          )
+        end
 
-        src.write_ln "class #{class_name}#{" < #{superclass}" if superclass}"
+        src.write_ln "class #{class_name}#{" < #{superclass_output}" if superclass_output}"
 
-        current_namespace = @current_scope ? @current_scope.name.to_namespace : RBS::Namespace.root
         class_type = RBS::AST::Declarations::Class.new(
           name: RBS::TypeName.new(
             namespace: current_namespace,
             name: class_name.to_sym
           ),
           type_params: RBS::AST::Declarations::ModuleTypeParams.new, # responds to #add to add params
-          super_class: superclass ? RBS::AST::Declarations::Class::Super.new(name: RBS::Typename.new(name: super_class.to_sym, namespace: RBS::Namespace.root), args: [], location: nil) : nil,
+          super_class: superclass_type,
           members: [],
           annotations: [],
           location: node[:location],
@@ -55,6 +75,9 @@ module Gloss
         src.write_ln "end"
 
         @current_scope = old_parent_scope
+
+        @current_scope.members << class_type if @current_scope
+
         if @type_checker
           @type_checker.top_level_decls[class_type.name.name] = class_type unless @current_scope
         end
@@ -62,7 +85,7 @@ module Gloss
         module_name = visit_node node[:name]
         src.write_ln "module #{module_name}"
 
-        current_namespace = RBS::Namespace.root # RBS::Namespace.new(path: [module_name.to_sym], absolute: false)
+        current_namespace = @current_scope ? @current_scope.name.to_namespace : RBS::Namespace.root
 
         module_type = RBS::AST::Declarations::Module.new(
           name: RBS::TypeName.new(
@@ -82,6 +105,9 @@ module Gloss
         indented(src) { src.write_ln visit_node(node[:body]) if node[:body] }
 
         @current_scope = old_parent_scope
+
+        @current_scope.members << module_type if @current_scope
+
         if @type_checker
           @type_checker.top_level_decls[module_type.name.name] = module_type unless @current_scope
         end
@@ -107,12 +133,17 @@ module Gloss
           RBS::MethodType.new(
             type_params: [],
             type: RBS::Types::Function.new(
-              required_positionals: [],
-              optional_positionals: [],
-              rest_positionals: nil,
+              required_positionals: node[:rp_args]&.map do |a|
+                RBS::Types::Function::Param.new(
+                  name: visit_node(a).to_sym,
+                  type: RBS::Types::Bases::Any.new(location: nil)
+                )
+              end || EMPTY_ARRAY,
+              optional_positionals: node[:op_args] || EMPTY_ARRAY,
+              rest_positionals: node[:rest_p_args],
               trailing_positionals: [],
-              required_keywords: {},
-              optional_keywords: {},
+              required_keywords: node[:req_kw_args] || EMPTY_HASH,
+              optional_keywords: node[:opt_kw_args] || EMPTY_HASH,
               rest_keywords: node[:rest_kw_args] ?
                 RBS::Types::Function::Param.new(
                   name: visit_node(node[:rest_kw_args]).to_sym,
@@ -148,6 +179,7 @@ module Gloss
       when "Call"
         obj = node[:object] ? "#{visit_node(node[:object], scope)}." : ""
         args = node[:args] || EMPTY_ARRAY
+        args += node[:named_args] if node[:named_args]
         args = if !args.empty? || node[:block_arg]
                  "(#{args.map { |a| visit_node(a, scope).strip }.reject(&:blank?).join(", ")}#{"&#{visit_node(node[:block_arg]).strip}" if node[:block_arg]})"
                else
@@ -224,9 +256,9 @@ module Gloss
         val = node[:external_name]
         if node[:keyword_arg]
           val += ":"
-          val += " #{visit_node(node[:default_value])}" if node[:default_value]
-        elsif node[:default_value]
-          val += " = #{visit_node(node[:default_value])}"
+          val += " #{visit_node(node[:value])}" if node[:value]
+        elsif node[:value]
+          val += " = #{visit_node(node[:value])}"
         end
 
         src.write val
@@ -272,6 +304,16 @@ module Gloss
         end
 
         src.write_ln "end)"
+      when "Unless"
+        src.write_ln "unless #{visit_node node[:condition]}"
+        indented(src) { src.write_ln visit_node(node[:then]) }
+
+        if node[:else]
+          src.write_ln "else"
+          indented(src) { src.write_ln visit_node(node[:else]) }
+        end
+
+        src.write_ln "end"
       when "Case"
         src.write "case"
         src.write " #{visit_node(node[:condition]).strip}\n" if node[:condition]
@@ -321,22 +363,34 @@ module Gloss
         src.write_ln "#{visit_node(node[:var])} = #{visit_node(node[:value])}"
       when "ExceptionHandler"
         src.write_ln "begin"
-        src.write_ln visit_node(node[:body])
-        node[:rescues]&.each do |r|
-          src.write_ln "rescue #{r[:types].map { |n| visit_node n }.join(", ") if r[:types]}#{" => #{r[:name]}" if r[:name]}"
-          src.write_ln visit_node(r[:body]) if r[:body]
-        end
-        if node[:else]
-          src.write_ln "else"
-          src.write_ln visit_node(node[:else])
-        end
-        if node[:ensure]
-          src.write_ln "ensure"
-          src.write_ln visit_node(node[:ensure])
+        indented src do
+          src.write_ln visit_node(node[:body])
         end
+          node[:rescues]&.each do |r|
+            src.write_ln "rescue #{r[:types].map { |n| visit_node n }.join(", ") if r[:types]}#{" => #{r[:name]}" if r[:name]}"
+            indented(src) { src.write_ln visit_node(r[:body]) } if r[:body]
+          end
+          if node[:else]
+            src.write_ln "else"
+            indented(src) { src.write_ln visit_node(node[:else]) }
+          end
+          if node[:ensure]
+            src.write_ln "ensure"
+            intended(src) { src.write_ln visit_node(node[:ensure]) }
+          end
         src.write_ln "end"
       when "Generic"
         src.write "#{node[:name]}[#{node[:args].map { |a| visit_node a }.join(", ")}]"
+      when "Proc"
+        fn = node[:function]
+        src.write "->#{render_args(fn)} { #{visit_node fn[:body]} }"
+      when "Include"
+        src.write_ln "include #{visit_node node[:name]}"
+      when "Extend"
+        src.write_ln "extend #{visit_node node[:name]}"
+      when "RegexLiteral"
+        contents = visit_node node[:value]
+        src.write Regexp.new(contents.undump).inspect
       when "EmptyNode"
         # pass
       else

data/lib/gloss/cli.rb

@@ -14,12 +14,13 @@ module Gloss
       when "watch"
         Watcher.new.watch
       when "build"
-        (files.empty? ? Dir.glob("#{Config.src_dir}/**/*.rb") : files).each do |fp|
+        (files.empty? ? Dir.glob("#{Config.src_dir}/**/*.gl") : files).each do |fp|
           puts "=====> Building #{fp}"
           content = File.read(fp)
           tree_hash = Parser.new(content).run
           type_checker = TypeChecker.new
-          rb_output = Builder.new(tree_hash, type_checker)
+          rb_output = Builder.new(tree_hash, type_checker).run
+          type_checker.run(rb_output)
 
           puts "=====> Writing #{fp}"
           Writer.new(rb_output, fp).run

data/lib/gloss/config.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
+
 require "ostruct"
 require "yaml"
-
 module Gloss
   user_config = YAML.safe_load(File.read(".gloss.yml"))
-  Config = OpenStruct.new(
-    default_config: {
-      frozen_string_literals: true,
-      src_dir: "src",
-    }.freeze
-  )
-  Config.default_config.each { |k, v| Config.send(:"#{k}=", user_config[k.to_s] || v) }
+  Config = OpenStruct.new(default_config: {:frozen_string_literals => true,
+:src_dir => "src"}.freeze)
+  Config.default_config
+.each { |k, v|
+    Config.send(:"#{k}=", user_config.[](k.to_s) || v)
+  }
 end
+

data/lib/gloss/errors.rb

@@ -1,11 +1,18 @@
-module Gloss
-  module Errors
-    class BaseGlossError < StandardError; end
-
-    class TypeValidationError < BaseGlossError; end
+# frozen_string_literal: true
 
-    class TypeError < BaseGlossError; end
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
 
-    class ParserError < BaseGlossError; end
+module Gloss
+  module Errors
+    class BaseGlossError < StandardError
+    end
+    class TypeValidationError < BaseGlossError
+    end
+    class TypeError < BaseGlossError
+    end
+    class ParserError < BaseGlossError
+    end
   end
 end
+

data/lib/gloss/initializer.rb

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
+
 require "yaml"
 module Gloss
   class Initializer
@@ -18,3 +22,4 @@ module Gloss
     end
   end
 end
+

data/lib/gloss/parser.rb

@@ -1,18 +1,21 @@
 # frozen_string_literal: true
 
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
+
 module Gloss
   class Parser
     def initialize(str)
       @str = str
     end
-
-    def run
+    def run()
       tree_json = Gloss.parse_buffer(@str)
       begin
-        JSON.parse tree_json, symbolize_names: true
+        JSON.parse(tree_json, symbolize_names: true)
       rescue JSON::ParserError
-        raise Errors::ParserError, tree_json
+        raise(Errors::ParserError, tree_json)
       end
     end
   end
 end
+

data/lib/gloss/type_checker.rb

@@ -1,75 +1,61 @@
 # frozen_string_literal: true
 
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
+
 module Gloss
   class TypeChecker
-    attr_reader :steep_target, :top_level_decls
-
-    def initialize
-      @steep_target = Steep::Project::Target.new(
-        name: "gloss",
-        options: Steep::Project::Options.new,
-        source_patterns: ["gloss"],
-        ignore_patterns: [],
-        signature_patterns: []
-      )
+    Project = Struct.new(:targets)
+    attr_reader(:steep_target, :top_level_decls)
+    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: ["gloss.rb"], ignore_patterns:       Array.new, signature_patterns: ["sig"])
       @top_level_decls = {}
-      Dir.glob("sig/**/*.rbs").each do |fp|
-        next if !@steep_target.possible_signature_file?(fp) || @steep_target.signature_file?(fp)
-
-        Steep.logger.info { "Adding signature file: #{fp}" }
-        @steep_target.add_signature path, (Pathname(".") + fp).cleanpath.read
-      end
     end
-
     def run(rb_str)
-      unless check_types(rb_str)
-        raise Errors::TypeError,
-              @steep_target.errors.map { |e|
-                case e
-                when Steep::Errors::NoMethod
-                  "Unknown method :#{e.method}, location: #{e.type.location.inspect}"
-                when Steep::Errors::MethodBodyTypeMismatch
-                  "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
-                when Steep::Errors::IncompatibleArguments
-                  "Invalid argmuents - method type: #{e.method_type}, receiver type: #{e.receiver_type}"
-                when Steep::Errors::ReturnTypeMismatch
-                  "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
-                when Steep::Errors::IncompatibleAssignment
-                  "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
-                else
-                  e.inspect
-                end
-              }.join("\n")
+      unless       check_types(rb_str)
+        raise(Errors::TypeError, @steep_target.errors
+.map { |e|
+case e
+            when Steep::Errors::NoMethod
+              "Unknown method :#{e.method}, location: #{e.type
+.location
+.inspect}"
+            when Steep::Errors::MethodBodyTypeMismatch
+              "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
+            when Steep::Errors::IncompatibleArguments
+              "Invalid argmuents - method type: #{e.method_type}, receiver type: #{e.receiver_type}"
+            when Steep::Errors::ReturnTypeMismatch
+              "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
+            when Steep::Errors::IncompatibleAssignment
+              "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
+          end
+        }
+.join("\n"))
       end
-
-      true
+true
     end
-
     def check_types(rb_str)
       env_loader = RBS::EnvironmentLoader.new
       env = RBS::Environment.from_loader(env_loader)
-
-      @top_level_decls.each do |_, decl|
-        env << decl
-      end
+      project = Steep::Project.new(steepfile_path:       Pathname.new(Config.src_dir)
+.realpath)
+      project.targets
+.<<(@steep_target)
+      loader = Steep::Project::FileLoader.new(project: project)
+      loader.load_signatures
+      @steep_target.add_source("gloss.rb", rb_str)
+      @top_level_decls.each { |_, decl|
+        env.<<(decl)
+      }
       env = env.resolve_type_names
-
       @steep_target.instance_variable_set("@environment", env)
-      @steep_target.add_source("gloss", rb_str)
-
-      definition_builder = RBS::DefinitionBuilder.new(env: env)
-      factory = Steep::AST::Types::Factory.new(builder: definition_builder)
-      check = Steep::Subtyping::Check.new(factory: factory)
-      validator = Steep::Signature::Validator.new(checker: check)
-      validator.validate
-
-      raise Errors::TypeValidationError, validator.each_error.to_a.join("\n") unless validator.no_error?
-
-      @steep_target.run_type_check(env, check, Time.now)
-
-      @steep_target.status.is_a?(Steep::Project::Target::TypeCheckStatus) &&
-        @steep_target.no_error? &&
-        @steep_target.errors.empty?
+      @steep_target.type_check
+@steep_target.status
+.is_a?(Steep::Project::Target::TypeCheckStatus) && @steep_target.no_error? && @steep_target.errors
+.empty?
     end
   end
 end

data/lib/gloss/version.rb

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

data/lib/gloss/watcher.rb

@@ -1,32 +1,41 @@
 # frozen_string_literal: true
 
-require "listen"
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
 
+require "listen"
 module Gloss
   class Watcher
-    def initialize
-      @paths = %w[src/]
+    def initialize()
+      @paths = ["src/"]
     end
-
-    def watch
-      puts "=====> Now listening for changes in #{@paths.join(', ')}"
-      listener = Listen.to(*@paths, latency: 2) do |modified, added, removed|
-        (modified + added).each do |f|
+    def watch()
+      puts("=====> Now listening for changes in #{@paths.join(", ")}")
+      listener = Listen.to(*@paths, latency: 2) { |modified, added, removed|
+        modified.+(added)
+.each { |f|
           content = File.read(f)
-          Writer.new(Builder.new(content).run, f).run
-        end
-        removed.each do |f|
+          Writer.new(Builder.new(content)
+.run, f)
+.run
+        }
+        removed.each { |f|
           out_path = Utils.src_path_to_output_path(f)
-          File.delete out_path if File.exist? out_path
-        end
-      end
+          (if File.exist?(out_path)
+            File.delete(out_path)
+          end)
+        }
+      }
       listener.start
       begin
-        loop { sleep 10 }
+        loop { ||
+          sleep(10)
+        }
       rescue Interrupt
-        puts "=====> Interrupt signal received, shutting down"
-        exit 0
+        puts("=====> Interrupt signal received, shutting down")
+        exit(0)
       end
     end
   end
 end
+

data/lib/gloss/writer.rb

@@ -1,26 +1,34 @@
 # frozen_string_literal: true
 
+##### This file was generated by Gloss; any changes made here will be overwritten.
+##### See src/ to make changes
+
+require "pathname"
+require "fileutils"
 module Gloss
   module Utils
     module_function
-
     def src_path_to_output_path(src_path)
-      src_path.sub(%r{\A(?:\./)?#{Config.src_dir}/?}, "")
+      src_path.sub(/\A(?:\.\/)?#{Config.src_dir}\/?/, "")
+.sub(/\.gl$/, ".rb")
     end
   end
-
   class Writer
     include Utils
-
-    def initialize(content, src_path, output_path = nil)
-      @content, @src_path = content, src_path
-      @output_path = output_path || src_path_to_output_path(src_path)
+    def initialize(content, src_path, output_path =     Pathname.new(src_path_to_output_path(src_path))
+)
+      @content = content
+      @output_path = output_path
     end
-
-    def run
-      File.open(@output_path, "wb") do |file|
-        file << @content
+    def run()
+      unless       @output_path.parent
+.exist?
+        FileUtils.mkdir_p(@output_path.parent)
       end
+      File.open(@output_path, "wb") { |file|
+        file.<<(@content)
+      }
     end
   end
 end
+

data/sig/gloss.rbs

@@ -0,0 +1,3 @@
+module Gloss
+  def self.parse_buffer: (String) -> String
+end

data/src/lib/gloss/config.gl

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "ostruct"
+require "yaml"
+
+module Gloss
+  user_config = YAML.safe_load(File.read(".gloss.yml"))
+  Config = OpenStruct.new(
+    default_config: {
+      frozen_string_literals: true,
+      src_dir: "src",
+    }
+  )
+  Config.default_config.each { |k, v| Config.send(:"#{k}=", user_config[k.to_s] || v) }
+end

data/src/lib/gloss/errors.gl

@@ -0,0 +1,11 @@
+module Gloss
+  module Errors
+    abstract class BaseGlossError < StandardError; end
+
+    class TypeValidationError < BaseGlossError; end
+
+    class TypeError < BaseGlossError; end
+
+    class ParserError < BaseGlossError; end
+  end
+end

data/src/lib/gloss/parser.gl

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gloss
+  class Parser
+    def initialize(@str : String)
+    end
+
+    def run : String
+      tree_json = Gloss.parse_buffer(@str)
+      begin
+        JSON.parse tree_json, symbolize_names: true
+      rescue JSON::ParserError
+        # if parsing fails then tree is invalid and most likely an error message from the parser in
+        # crystal
+        raise Errors::ParserError, tree_json
+      end
+    end
+  end
+end

data/src/lib/gloss/type_checker.gl

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Gloss
+  class TypeChecker
+    Project = Struct.new :targets
+
+    attr_reader :steep_target, :top_level_decls
+
+    def initialize
+      @steep_target = Steep::Project::Target.new(
+        name: "gloss",
+        options: Steep::Project::Options.new.tap do |o|
+          o.allow_unknown_constant_assignment = true
+        end,
+        source_patterns: ["gloss.rb"],
+        ignore_patterns: Array.new,
+        signature_patterns: ["sig"]
+      )
+      @top_level_decls = {}
+    end
+
+    def run(rb_str)
+      unless check_types(rb_str)
+        raise Errors::TypeError,
+              @steep_target.errors.map { |e|
+                case e
+                when Steep::Errors::NoMethod
+                  "Unknown method :#{e.method}, location: #{e.type.location.inspect}"
+                when Steep::Errors::MethodBodyTypeMismatch
+                  "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
+                when Steep::Errors::IncompatibleArguments
+                  "Invalid argmuents - method type: #{e.method_type}, receiver type: #{e.receiver_type}"
+                when Steep::Errors::ReturnTypeMismatch
+                  "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
+                when Steep::Errors::IncompatibleAssignment
+                  "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
+                else
+                  e.inspect
+                end
+              }.join("\n")
+      end
+
+      true
+    end
+
+    def check_types(rb_str)
+      env_loader = RBS::EnvironmentLoader.new
+      env = RBS::Environment.from_loader(env_loader)
+      project = Steep::Project.new(steepfile_path: Pathname.new(Config.src_dir).realpath)
+      project.targets << @steep_target
+      loader = Steep::Project::FileLoader.new(project: project)
+      loader.load_signatures
+
+      @steep_target.add_source("gloss.rb", rb_str)
+
+      @top_level_decls.each do |_, decl|
+        env << decl
+      end
+      env = env.resolve_type_names
+
+      @steep_target.instance_variable_set("@environment", env)
+
+      @steep_target.type_check
+
+      @steep_target.status.is_a?(Steep::Project::Target::TypeCheckStatus) &&
+        @steep_target.no_error? &&
+        @steep_target.errors.empty?
+    end
+  end
+end

data/src/lib/gloss/version.gl

@@ -0,0 +1,3 @@
+module Gloss
+  VERSION = "0.0.3"
+end

data/src/lib/gloss/writer.gl

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "fileutils"
+
+module Gloss
+  module Utils
+    module_function
+
+    def src_path_to_output_path(src_path)
+      src_path.sub(%r{\A(?:\./)?#{Config.src_dir}/?}, "")
+              .sub(/\.gl$/, ".rb")
+    end
+  end
+
+  class Writer
+    include Utils
+
+    def initialize(
+      @content,
+      src_path : String?,
+      @output_path : Pathname = Pathname.new(src_path_to_output_path(src_path))
+    )
+    end
+
+    def run
+      FileUtils.mkdir_p(@output_path.parent) unless @output_path.parent.exist?
+      File.open(@output_path, "wb") do |file|
+        file << @content
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -168,9 +168,16 @@ files:
 - lib/gloss/version.rb
 - lib/gloss/watcher.rb
 - lib/gloss/writer.rb
+- sig/gloss.rbs
 - sig/listen.rbs
-- src/lib/hrb/initializer.gl
-- src/lib/hrb/watcher.gl
+- src/lib/gloss/config.gl
+- src/lib/gloss/errors.gl
+- src/lib/gloss/initializer.gl
+- src/lib/gloss/parser.gl
+- src/lib/gloss/type_checker.gl
+- src/lib/gloss/version.gl
+- src/lib/gloss/watcher.gl
+- src/lib/gloss/writer.gl
 homepage:
 licenses:
 - MIT
@@ -190,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A superset of ruby