gloss 0.0.5 → 0.1.3

data/lib/gloss/version.rb

@@ -1,8 +1,8 @@
-  # frozen_string_literal: true
+# 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 src/ to make changes
 
 module Gloss
-  VERSION = "0.0.5"
+  VERSION = "0.1.3"
 end

data/lib/gloss/{builder.rb → visitor.rb}

@@ -4,29 +4,24 @@
   ##### See src/ to make changes
 
 module Gloss
-  module Utils
-    module_function
-    def with_file_header(str)
-      "#{Builder::FILE_HEADER}\n\n#{str}"
-    end
-  end
-  class Builder
+  class Visitor
     FILE_HEADER = "  #{(if Config.frozen_string_literals
       "# frozen_string_literal: true\n"
     end)}\n  ##### This file was generated by Gloss; any changes made here will be overwritten.\n  ##### See #{Config.src_dir}/ to make changes"
-    include Utils
     attr_reader(:"tree")
-    def initialize(tree_hash, type_checker = nil)
+    def initialize(tree_hash, type_checker = nil, on_new_file_referenced = nil)
+      @on_new_file_referenced = on_new_file_referenced
       @indent_level = 0
       @inside_macro = false
       @eval_vars = false
       @current_scope = nil
       @tree = tree_hash
       @type_checker = type_checker
+      @after_module_function = false
     end
     def run()
       rb_output = visit_node(@tree)
-      with_file_header(rb_output)
+      Utils.with_file_header(rb_output)
     end
     def visit_node(node, scope = Scope.new)
       src = Source.new(@indent_level)
@@ -40,21 +35,30 @@ case node.[](:"type")
             RBS::Namespace.root
           end)
           superclass_type = nil
-          superclass_output = nil
+          superclass_output = ""
           (if node.[](:"superclass")
             @eval_vars = true
             superclass_output = visit_node(node.[](:"superclass"))
             @eval_vars = false
-            superclass_type = RBS::Parser.parse_type(superclass_output)
+            args = Array.new
             (if node.dig(:"superclass", :"type")
 .==("Generic")
-              superclass_output = superclass_output.[](/^[^\[]+/)
+              superclass_output = superclass_output.[](/^[^\[]+/) || superclass_output
+              args = node.dig(:"superclass", :"args")
+.map() { |n|
+                RBS::Parser.parse_type(visit_node(n))
+              }
             end)
+            class_name_index = superclass_output.index(/[^(?:::)]+\z/) || 0
+            namespace = superclass_output.[](0, class_name_index)
+            superclass_name = superclass_output.[](/[^(?:::)]+\z/) || superclass_output
+            superclass_type = RBS::AST::Declarations::Class::Super.new(name:             RBS::TypeName.new(namespace:             method(:"Namespace")
+.call(namespace), name:             superclass_name.to_sym), args: args, location:             build_location(node))
           end)
-          src.write_ln("class #{class_name}#{(if superclass_output
+          src.write_ln("class #{class_name}#{unless           superclass_output.blank?
             " < #{superclass_output}"
-          end)}")
-          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, super_class: superclass_type, members:           Array.new, annotations:           Array.new, location:           node.[](:"location"), comment:           node.[](:"comment"))
+          end}")
+          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, super_class: superclass_type, members:           Array.new, annotations:           Array.new, location:           build_location(node), comment:           node.[](:"comment"))
           old_parent_scope = @current_scope
           @current_scope = class_type
           indented(src) { ||
@@ -68,14 +72,13 @@ case node.[](:"type")
             @current_scope.members
 .<<(class_type)
           end)
-          (if @type_checker
-            unless @current_scope
-              @type_checker.top_level_decls
-.[]=(class_type.name
-.name, class_type)
-            end
+          (if @type_checker && !@current_scope
+            @type_checker.top_level_decls
+.add(class_type)
           end)
         when "ModuleNode"
+          existing_module_function_state = @after_module_function.dup
+          @after_module_function = false
           module_name = visit_node(node.[](:"name"))
           src.write_ln("module #{module_name}")
           current_namespace = (if @current_scope
@@ -84,7 +87,7 @@ case node.[](:"type")
           else
             RBS::Namespace.root
           end)
-          module_type = RBS::AST::Declarations::Module.new(name:           RBS::TypeName.new(namespace: current_namespace, name:           module_name.to_sym), type_params:           RBS::AST::Declarations::ModuleTypeParams.new, self_types:           Array.new, members:           Array.new, annotations:           Array.new, location:           node.[](:"location"), comment:           node.[](:"comment"))
+          module_type = RBS::AST::Declarations::Module.new(name:           RBS::TypeName.new(namespace: current_namespace, name:           module_name.to_sym), type_params:           RBS::AST::Declarations::ModuleTypeParams.new, self_types:           Array.new, members:           Array.new, annotations:           Array.new, location:           build_location(node), comment:           node.[](:"comment"))
           old_parent_scope = @current_scope
           @current_scope = module_type
           indented(src) { ||
@@ -97,31 +100,44 @@ case node.[](:"type")
             @current_scope.members
 .<<(module_type)
           end)
-          (if @type_checker
-            unless @current_scope
-              @type_checker.top_level_decls
-.[]=(module_type.name
-.name, module_type)
-            end
+          (if @type_checker && !@current_scope
+            @type_checker.top_level_decls
+.add(module_type)
           end)
           src.write_ln("end")
+          @after_module_function = existing_module_function_state
         when "DefNode"
           args = render_args(node)
-          src.write_ln("def #{node.[](:"name")}#{args.[](:"representation")}")
+          receiver = (if node.[](:"receiver")
+            visit_node(node.[](:"receiver"))
+          else
+            nil
+          end)
+          src.write_ln("def #{(if receiver
+            "#{receiver}."
+          end)}#{node.[](:"name")}#{args.[](:"representation")}")
           return_type = (if node.[](:"return_type")
             RBS::Types::ClassInstance.new(name:             RBS::TypeName.new(name:             eval(visit_node(node.[](:"return_type")))
 .to_s
-.to_sym, namespace:             RBS::Namespace.root), args: EMPTY_ARRAY, location:             node.[](:"location"))
+.to_sym, namespace:             RBS::Namespace.root), args: EMPTY_ARRAY, location:             build_location(node))
           else
-            RBS::Types::Bases::Any.new(location:             node.[](:"location"))
+            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")
-            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:             node.[](:"location"))), required: !!node.[](:"block_arg") || node.[](:"yield_arg_count"))
+            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
-          end), location:           node.[](:"location"))]
+          end), location:           build_location(node))]
           method_definition = RBS::AST::Members::MethodDefinition.new(name:           node.[](:"name")
-.to_sym, kind: :"instance", types: method_types, annotations: EMPTY_ARRAY, location:           node.[](:"location"), comment:           node.[](:"comment"), overload: false)
+.to_sym, kind:           (if @after_module_function
+            :"singleton_instance"
+          else
+            (if receiver
+              :"singleton"
+            else
+              :"instance"
+            end)
+          end), types: method_types, annotations: EMPTY_ARRAY, location:           build_location(node), comment:           node.[](:"comment"), overload: false)
           (if @current_scope
             @current_scope.members
 .<<(method_definition)
@@ -179,9 +195,18 @@ EMPTY_ARRAY          }
           else
             nil
           end)
-          call = "#{obj}#{node.[](:"name")}#{opening_delimiter}#{args}#{(if has_parens
+          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)
+              end)
+            when "module_function"
+              @after_module_function = true
+          end
           src.write_ln(call)
         when "Block"
           args = render_args(node)
@@ -197,7 +222,7 @@ EMPTY_ARRAY          }
           else
             ".."
           end)
-          src.write("(", visit_node(node.[](:"from")), dots, visit_node(node.[](:"to")), ")")
+          src.write("(", "(", visit_node(node.[](:"from")), ")", dots, "(", visit_node(node.[](:"to")), ")", ")")
         when "LiteralNode"
           src.write(node.[](:"value"))
         when "ArrayLiteral"
@@ -216,7 +241,7 @@ EMPTY_ARRAY          }
             str.<<(case c.[](:"type")
               when "LiteralNode"
                 c.[](:"value")
-.[]((1...-1))
+.[](((1)...(-1)))
               else
                 ["\#{", visit_node(c)
 .strip, "}"].join
@@ -226,7 +251,11 @@ EMPTY_ARRAY          }
         when "Path"
           src.write(node.[](:"value"))
         when "Require"
-          src.write_ln("require \"#{node.[](:"value")}\"")
+          path = node.[](:"value")
+          src.write_ln("require \"#{path}\"")
+          (if @on_new_file_referenced
+            @on_new_file_referenced.call(path, false)
+          end)
         when "Assign", "OpAssign"
           src.write_ln("#{visit_node(node.[](:"target"))} #{node.[](:"op")}= #{visit_node(node.[](:"value"))
 .strip}")
@@ -278,11 +307,12 @@ EMPTY_ARRAY          }
             key = case k
               when String
                 k.to_sym
+.inspect
               else
                 visit_node(k)
             end
             value = visit_node(v)
-"#{key.inspect} => #{value}"          }
+"#{key} => #{value}"          }
           src.write("{#{contents.join(",\n")}}")
           (if node.[](:"frozen")
             src.write(".freeze")
@@ -414,7 +444,12 @@ EMPTY_ARRAY          }
           src.write("return#{val}")
         when "TypeDeclaration"
           src.write_ln("# @type var #{visit_node(node.[](:"var"))}: #{visit_node(node.[](:"declared_type"))}")
-          src.write_ln("#{visit_node(node.[](:"var"))} = #{visit_node(node.[](:"value"))}")
+          value = (if node.[](:"value")
+            " = #{visit_node(node.[](:"value"))}"
+          else
+            nil
+          end)
+          src.write_ln("#{visit_node(node.[](:"var"))}#{value}")
         when "ExceptionHandler"
           src.write_ln("begin")
           indented(src) { ||
@@ -471,7 +506,7 @@ EMPTY_ARRAY          }
           name = visit_node(node.[](:"name"))
           src.write_ln("include #{name}")
           type = RBS::AST::Members::Include.new(name:           method(:"TypeName")
-.call(name), args:           Array.new, annotations:           Array.new, location:           node.[](:"location"), comment:           node.[](:"comment"))
+.call(name), args:           Array.new, annotations:           Array.new, location:           build_location(node), comment:           node.[](:"comment"))
           (if @current_scope
             @current_scope.members
 .<<(type)
@@ -489,7 +524,7 @@ EMPTY_ARRAY          }
           name = visit_node(node.[](:"name"))
           src.write_ln("extend #{name}")
           type = RBS::AST::Members::Extend.new(name:           method(:"TypeName")
-.call(name), args:           Array.new, annotations:           Array.new, location:           node.[](:"location"), comment:           node.[](:"comment"))
+.call(name), args:           Array.new, annotations:           Array.new, location:           build_location(node), comment:           node.[](:"comment"))
           (if @current_scope
             @current_scope.members
 .<<(type)
@@ -595,34 +630,38 @@ a && a.empty?      }
 .flatten
 .join(", ")
       representation = "(#{contents})"
-      rp.map!() { |a|
+      rp_args = rp.map() { |a|
         RBS::Types::Function::Param.new(name:         visit_node(a)
-.to_sym, type:         RBS::Types::Bases::Any.new(location:         a.[](:"location")))
+.to_sym, type:         RBS::Types::Bases::Any.new(location:         build_location(a)))
       }
-      op.map!() { |a|
+      op_args = op.map() { |a|
         RBS::Types::Function::Param.new(name:         visit_node(a)
-.to_sym, type:         RBS::Types::Bases::Any.new(location:         a.[](:"location")))
+.to_sym, type:         RBS::Types::Bases::Any.new(location:         build_location(a)))
       }
-      rest_p = (if rpa = node.[](:"rest_p_args")
-        RBS::Types::Function::Param.new(name:         visit_node(rpa)
-.to_sym, type:         RBS::Types::Bases::Any.new(location:         node.[](:"location")))
+      rpa = (if rest_p
+        RBS::Types::Function::Param.new(name:         rest_p.to_sym, type:         RBS::Types::Bases::Any.new(location:         build_location(node)))
       else
         nil
       end)
 {:representation => representation,
-:types => {:required_positionals => rp,
-:optional_positionals => op,
-:rest_positionals => rest_p,
+:types => {:required_positionals => rp_args,
+:optional_positionals => op_args,
+:rest_positionals => rpa,
 :trailing_positionals => EMPTY_ARRAY,
 :required_keywords => node.[](:"req_kw_args") || EMPTY_HASH,
 :optional_keywords => node.[](:"opt_kw_args") || EMPTY_HASH,
 :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:         node.[](:"location")))
+.to_sym, type:         RBS::Types::Bases::Any.new(location:         build_location(node)))
       else
         nil
       end)
 }.freeze}.freeze
     end
+    def build_location(node)
+      unless       node.[](:"location")
+        return nil
+      end
+    end
   end
 end

data/lib/gloss/watcher.rb

@@ -3,50 +3,72 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  require "listen"
+require "listen"
 module Gloss
   class Watcher
     def initialize(paths)
       @paths = paths
       (if @paths.empty?
         @paths = [File.join(Dir.pwd, Config.src_dir)]
+        @only = /(?:(\.gl|(?:(?<=\/)[^\.\/]+))\z|\A[^\.\/]+\z)/
+      else
+        file_names = Array.new
+        paths = Array.new
+        @paths.each() { |pa|
+          pn = Pathname.new(pa)
+          paths.<<(pn.parent
+.to_s)
+          file_names.<<((if pn.file?
+            pn.basename
+.to_s
+          else
+            pa
+          end))
+        }
+        @paths = paths.uniq
+        @only = /#{Regexp.union(file_names)}/
       end)
     end
     def watch()
-      puts("=====> Now listening for changes in #{@paths.join(", ")}")
-      listener = Listen.to(*@paths, latency: 2) { |modified, added, removed|
+      Gloss.logger
+.info("Now listening for changes in #{@paths.join(", ")}")
+      listener = Listen.to(*@paths, latency: 2, only: @only) { |modified, added, removed|
         modified.+(added)
 .each() { |f|
-          unless           f.end_with?(".gl")
-            next
-          end
-          puts("====> Rewriting #{f}")
+          Gloss.logger
+.info("Rewriting #{f}")
           content = File.read(f)
-          Writer.new(Builder.new(Parser.new(content)
+          err = catch(:"error") { ||
+            Writer.new(Visitor.new(Parser.new(content)
 .run)
 .run, f)
 .run
-          puts("====> Done")
+nil          }
+          (if err
+            Gloss.logger
+.error(err)
+          else
+            Gloss.logger
+.info("Done")
+          end)
         }
         removed.each() { |f|
-          unless           f.end_with?(".gl")
-            next
-          end
           out_path = Utils.src_path_to_output_path(f)
-          puts("====> Removing #{out_path}")
+          Gloss.logger
+.info("Removing #{out_path}")
           (if File.exist?(out_path)
             File.delete(out_path)
           end)
-          puts("====> Done")
+          Gloss.logger
+.info("Done")
         }
       }
-      listener.start
       begin
-        loop() { ||
-          sleep(10)
-        }
+        listener.start
+        sleep
       rescue Interrupt
-        puts("=====> Interrupt signal received, shutting down")
+        Gloss.logger
+.info("Interrupt signal received, shutting down")
         exit(0)
       end
     end

data/lib/gloss/writer.rb

@@ -3,20 +3,13 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  require "pathname"
+require "pathname"
 require "fileutils"
 module Gloss
-  module Utils
-    module_function
-    def src_path_to_output_path(src_path)
-      src_path.sub("#{Config.src_dir}/", "")
-.sub(/\.gl$/, ".rb")
-    end
-  end
   class Writer
-    include Utils
-    def initialize(content, src_path, output_path = Pathname.new(src_path_to_output_path(src_path)))
+    def initialize(content, src_path, output_path = Pathname.new(Utils.src_path_to_output_path(src_path)))
       @content = content
+      @src_path = src_path
       @output_path = output_path
     end
     def run()
@@ -25,8 +18,26 @@ module Gloss
         FileUtils.mkdir_p(@output_path.parent)
       end
       File.open(@output_path, "wb") { |file|
+        sb = shebang
+        (if sb
+          file.puts(sb)
+        end)
         file.puts(@content)
       }
     end
+    private     def shebang()
+      (if @output_path.executable?
+        first_line = File.open(@src_path) { |f|
+          f.readline
+        }
+        (if first_line.start_with?("#!")
+          first_line
+        else
+          nil
+        end)
+      else
+        nil
+      end)
+    end
   end
 end