gloss 0.0.1 → 0.0.2

data/ext/gloss/src/rb_ast.cr

@@ -114,15 +114,17 @@ module Rb
 
     class Arg < Node
       @info : NamedTuple(type: String, name: String, external_name: String, default_value: Node?,
-        restriction: Node?)
+        restriction: Node?, keyword_arg: Bool)
 
-      def initialize(name : String, external_name : String, restriction : Node?, default_value : Node?)
+      def initialize(name : String, external_name : String, restriction : Node?, default_value :
+          Node?, keyword_arg)
         @info = {
           type:          self.class.name.split("::").last,
           name:          name,
           restriction:   restriction,
           default_value: default_value,
           external_name: external_name,
+          keyword_arg: keyword_arg
         }
       end
 
@@ -236,6 +238,9 @@ module Rb
     class InstanceVar < Var
     end
 
+    class GlobalVar < Var
+    end
+
     abstract class Conditional < Node
       @info : NamedTuple(type: String, condition: Node, then: Node, else: Node)
 
@@ -487,5 +492,32 @@ module Rb
 
       delegate :to_json, to: @info
     end
+
+    class Union < Node
+      @info : NamedTuple(type: String, types: Array(Node))
+
+      def initialize(types)
+        @info = {
+          type:  self.class.name.split("::").last,
+          types: types
+        }
+      end
+
+      delegate :to_json, to: @info
+    end
+
+    class Generic < Node
+      @info : NamedTuple(type: String, name: Node, args: Array(Node))
+
+      def initialize(name, args)
+        @info = {
+          type:  self.class.name.split("::").last,
+          name: name,
+          args: args
+        }
+      end
+
+      delegate :to_json, to: @info
+    end
   end
 end

data/gloss.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "fast_blank"
   s.add_runtime_dependency "listen"
+  s.add_runtime_dependency "rbs"
   s.add_runtime_dependency "steep"
 
   s.add_development_dependency "rake-compiler"

data/lib/gloss.rb

@@ -8,6 +8,8 @@ require "fast_blank"
 require "gloss/version"
 require "gloss/cli"
 require "gloss/watcher"
+require "gloss/type_checker"
+require "gloss/parser"
 require "gloss/initializer"
 require "gloss/config"
 require "gloss/writer"
@@ -16,7 +18,7 @@ require "gloss/scope"
 require "gloss/builder"
 require "gloss/errors"
 
-require "gloss.bundle"
+require "gls" unless ENV["CI"] # a bit of a hack for now
 
 EMPTY_ARRAY = [].freeze
 EMPTY_HASH = {}.freeze

data/lib/gloss/builder.rb

@@ -4,87 +4,21 @@ module Gloss
   class Builder
     attr_reader :tree
 
-    def initialize(str)
+    def initialize(tree_hash, type_checker = nil)
       @indent_level = 0
       @inside_macro = false
       @eval_vars = false
-      tree_json = Gloss.parse_buffer str
-      begin
-        @tree = JSON.parse tree_json, symbolize_names: true
-      rescue JSON::ParserError
-        raise Errors::ParserError, tree_json
-      end
       @current_scope = nil
-      @steep_target = Steep::Project::Target.new(
-        name: "gloss",
-        options: Steep::Project::Options.new,
-        source_patterns: ["gloss"],
-        ignore_patterns: [],
-        signature_patterns: []
-      )
-      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
-      @top_level_decls = {}
+      @tree = tree_hash
+      @type_checker = type_checker
     end
 
     def run
       rb_output = visit_node(@tree)
       rb_output = "# frozen_string_literal: true\n#{rb_output}" if Config.frozen_string_literals
-
-      unless check_types(rb_output)
-        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
-
       rb_output
     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
-      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?
-    end
-
     def visit_node(node, scope = Scope.new)
       src = Source.new(@indent_level)
       case node[:type]
@@ -121,7 +55,9 @@ module Gloss
         src.write_ln "end"
 
         @current_scope = old_parent_scope
-        @top_level_decls[class_type.name.name] = class_type unless @current_scope
+        if @type_checker
+          @type_checker.top_level_decls[class_type.name.name] = class_type unless @current_scope
+        end
       when "ModuleNode"
         module_name = visit_node node[:name]
         src.write_ln "module #{module_name}"
@@ -146,7 +82,9 @@ module Gloss
         indented(src) { src.write_ln visit_node(node[:body]) if node[:body] }
 
         @current_scope = old_parent_scope
-        @top_level_decls[module_type.name.name] = module_type unless @current_scope
+        if @type_checker
+          @type_checker.top_level_decls[module_type.name.name] = module_type unless @current_scope
+        end
         src.write_ln "end"
       when "DefNode"
         args = render_args(node)
@@ -199,7 +137,7 @@ module Gloss
         if @current_scope
           @current_scope.members << method_definition
         else
-          @type_env << method_definition # should be new class declaration for Object with method_definition as private method
+          @type_checker.type_env << method_definition if @type_checker # should be new class declaration for Object with method_definition as private method
         end
 
         indented(src) { src.write_ln visit_node(node[:body]) if node[:body] }
@@ -278,9 +216,20 @@ module Gloss
 
         src.write node[:name]
 
+      when "GlobalVar"
+
+        src.write node[:name]
+
       when "Arg"
+        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])}"
+        end
 
-        src.write node[:external_name]
+        src.write val
 
       when "UnaryExpr"
 
@@ -386,6 +335,8 @@ module Gloss
           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 "EmptyNode"
         # pass
       else

data/lib/gloss/cli.rb

@@ -17,9 +17,12 @@ module Gloss
         (files.empty? ? Dir.glob("#{Config.src_dir}/**/*.rb") : 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)
 
           puts "=====> Writing #{fp}"
-          Writer.new(Builder.new(content).run, fp).run
+          Writer.new(rb_output, fp).run
         end
       when "init"
         force = false

data/lib/gloss/parser.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Gloss
+  class Parser
+    def initialize(str)
+      @str = str
+    end
+
+    def run
+      tree_json = Gloss.parse_buffer(@str)
+      begin
+        JSON.parse tree_json, symbolize_names: true
+      rescue JSON::ParserError
+        raise Errors::ParserError, tree_json
+      end
+    end
+  end
+end

data/lib/gloss/type_checker.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+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: []
+      )
+      @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")
+      end
+
+      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
+      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?
+    end
+  end
+end

data/lib/gloss/version.rb

@@ -1,3 +1,3 @@
 module Gloss
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -117,11 +131,14 @@ extensions:
 - ext/gloss/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/crystal.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gloss.yml"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -129,6 +146,8 @@ files:
 - ext/gloss/Makefile
 - ext/gloss/extconf.rb
 - ext/gloss/shard.yml
+- ext/gloss/spec/parser_spec.cr
+- ext/gloss/spec/spec_helper.cr
 - ext/gloss/src/cr_ast.cr
 - ext/gloss/src/gloss.cr
 - ext/gloss/src/lexer.cr
@@ -136,15 +155,16 @@ files:
 - ext/gloss/src/parser.cr
 - ext/gloss/src/rb_ast.cr
 - gloss.gemspec
-- lib/gloss.bundle.dwarf
 - lib/gloss.rb
 - lib/gloss/builder.rb
 - lib/gloss/cli.rb
 - lib/gloss/config.rb
 - lib/gloss/errors.rb
 - lib/gloss/initializer.rb
+- lib/gloss/parser.rb
 - lib/gloss/scope.rb
 - lib/gloss/source.rb
+- lib/gloss/type_checker.rb
 - lib/gloss/version.rb
 - lib/gloss/watcher.rb
 - lib/gloss/writer.rb