gloss 0.0.4 → 0.1.2

data/ext/gloss/src/gloss.cr

@@ -4,14 +4,13 @@ require "./cr_ast"
 require "./rb_ast"
 require "./parser"
 
-def parse_string(self : CrRuby::VALUE, str : CrRuby::VALUE)
+def parse_string(_self : CrRuby::VALUE, str : CrRuby::VALUE)
   st = CrRuby.rb_str_to_str(str)
   string = String.new(CrRuby.rb_string_value_cstr(pointerof(st)))
 
   output = begin
              Gloss.parse_string(string)
            rescue e : Crystal::SyntaxException
-             pp e.backtrace
              e.to_s
            end
 

data/ext/gloss/src/rb_ast.cr

@@ -19,7 +19,7 @@ module Rb
     abstract class NodeWithChildren < Node
       @info : NamedTuple(type: String, children: Array(Node))
 
-      def initialize(@children : Array(Node))
+      def initialize(@children : Array(Node), location : Crystal::Location?)
         @info = {
           type:     self.class.name.split("::").last,
           children: @children,
@@ -32,7 +32,7 @@ module Rb
     abstract class NodeWithValue < Node
       @info : NamedTuple(type: String, value: String)
 
-      def initialize(@value : String)
+      def initialize(@value : String, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           value: @value,
@@ -43,13 +43,14 @@ module Rb
     end
 
     class Block < Node
-      @info : NamedTuple(type: String, args: Array(Var), body: Node)
+      @info : NamedTuple(type: String, positional_args: Array(Var), body: Node, rest_p_args: Node?)
 
-      def initialize(args, body)
+      def initialize(args, splat, body, location : Crystal::Location?)
         @info = {
           type: self.class.name.split("::").last,
           body: body,
-          args: args,
+          positional_args: args,
+          rest_p_args: splat
         }
       end
 
@@ -62,7 +63,7 @@ module Rb
     class ClassNode < Node
       @info : NamedTuple(type: String, name: Path, body: Node, superclass: Node?, type_vars: Array(String)?, abstract: Bool)
 
-      def initialize(name : Path, body : Node, superclass : Node?, type_vars : Array(String)?, abstr : Bool)
+      def initialize(name : Path, body : Node, superclass : Node?, type_vars : Array(String)?, abstr : Bool, location : Crystal::Location?)
         @info = {
           type:       self.class.name.split("::").last,
           name:       name,
@@ -80,7 +81,7 @@ module Rb
     class ModuleNode < Node
       @info : NamedTuple(type: String, name: Path, body: Node, type_vars: Array(String)?)
 
-      def initialize(name : Path, body : Node, type_vars : Array(String)?)
+      def initialize(name : Path, body : Node, type_vars : Array(String)?, location : Crystal::Location?)
         @info = {
           type:      self.class.name.split("::").last,
           name:      name,
@@ -106,7 +107,8 @@ module Rb
         body : Node,
         return_type : Node?,
         yields : Int32?,
-        block_arg : Node?
+        block_arg : Node?,
+        location : Crystal::Location?
       )
         @info = {
           type:            self.class.name.split("::").last,
@@ -129,7 +131,8 @@ module Rb
       @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?, value : Node?, keyword_arg)
+      def initialize(name : String, external_name : String, restriction : Node?, value : Node?,
+          keyword_arg, location : Crystal::Location?)
         @info = {
           type:          self.class.name.split("::").last,
           name:          name,
@@ -146,7 +149,7 @@ module Rb
     class LiteralNode < Node
       @info : NamedTuple(type: String, value: String | Int32 | Bool | Nil, rb_type: String)
 
-      def initialize(value, rb_type : RbLiteral)
+      def initialize(value, rb_type : RbLiteral, location : Crystal::Location?)
         val = case rb_type
               when Rb::AST::RbLiteral::TrueClass
                 true
@@ -172,7 +175,7 @@ module Rb
     class ArrayLiteral < Node
       @info : NamedTuple(type: String, elements: Array(Node), frozen: Bool)
 
-      def initialize(elems, frozen = false)
+      def initialize(elems, location : Crystal::Location?, frozen = false)
         @info = {
           type:     self.class.name.split("::").last,
           elements: elems,
@@ -186,7 +189,7 @@ module Rb
     class HashLiteral < Node
       @info : NamedTuple(type: String, elements: Array(Tuple(Node, Node)) | Array(Tuple(String, Node)), frozen: Bool)
 
-      def initialize(elems, frozen = false)
+      def initialize(elems, location : Crystal::Location?, frozen = false)
         @info = {
           type:     self.class.name.split("::").last,
           elements: elems,
@@ -200,7 +203,7 @@ module Rb
     class RangeLiteral < Node
       @info : NamedTuple(type: String, from: Node, to: Node, exclusive: Bool)
 
-      def initialize(from, to, exclusive)
+      def initialize(from, to, exclusive, location : Crystal::Location?)
         @info = {
           type:      self.class.name.split("::").last,
           from:      from,
@@ -215,7 +218,7 @@ module Rb
     class RegexLiteral < Node
       @info : NamedTuple(type: String, value: Node)
 
-      def initialize(value)
+      def initialize(value, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           value: value,
@@ -236,7 +239,7 @@ module Rb
     end
 
     class EmptyNode < Nop
-      def initialize(class_name : String)
+      def initialize(class_name : String, location : Crystal::Location?)
         STDERR.puts "Encountered a ruby EmptyNode class name: #{class_name}"
         @info = {
           type: self.class.name.split("::").last,
@@ -247,7 +250,7 @@ module Rb
     class Var < Node
       @info : NamedTuple(type: String, name: String)
 
-      def initialize(@name : String)
+      def initialize(@name : String, location : Crystal::Location?)
         @info = {
           type: self.class.name.split("::").last,
           name: @name,
@@ -266,7 +269,7 @@ module Rb
     abstract class Conditional < Node
       @info : NamedTuple(type: String, condition: Node, then: Node, else: Node)
 
-      def initialize(@condition : Node, @thn : Node, @els : Node)
+      def initialize(@condition : Node, @thn : Node, @els : Node, location : Crystal::Location?)
         @info = {
           type:      self.class.name.split("::").last,
           condition: @condition,
@@ -287,7 +290,7 @@ module Rb
     class Case < Node
       @info : NamedTuple(type: String, condition: Node?, whens: Array(When), else: Node?, exhaustive: Bool)
 
-      def initialize(cond : Node?, whens : Array(When), els : Node?, exhaustive : Bool)
+      def initialize(cond : Node?, whens : Array(When), els : Node?, exhaustive : Bool, location : Crystal::Location?)
         @info = {
           type:       self.class.name.split("::").last,
           condition:  cond,
@@ -303,7 +306,7 @@ module Rb
     class When < Node
       @info : NamedTuple(type: String, conditions: Array(Node), body: Node, exhaustive: Bool)
 
-      def initialize(conds : Array(Node), body : Node, exhaustive : Bool)
+      def initialize(conds : Array(Node), body : Node, exhaustive : Bool, location : Crystal::Location?)
         @info = {
           type:       self.class.name.split("::").last,
           conditions: conds,
@@ -318,7 +321,7 @@ module Rb
     class Enum < Node
       @info : NamedTuple(type: String, name: Crystal::Path, members: Array(Node))
 
-      def initialize(@name : Crystal::Path, @members : Array(Node))
+      def initialize(@name : Crystal::Path, @members : Array(Node), location : Crystal::Location?)
         @info = {
           type:    self.class.name.split("::").last,
           name:    @name,
@@ -332,8 +335,7 @@ module Rb
     class Call < Node
       @info : NamedTuple(type: String, name: String, args: Array(Node), object: Node?, block: Block?, block_arg: Node?, named_args: Array(Arg)?, has_parentheses: Bool)
 
-      def initialize(object : Node?, name : String, args : Array(Node), named_args, block,
-                     block_arg, has_parentheses)
+      def initialize(object : Node?, name : String, args : Array(Node), named_args, block, block_arg, has_parentheses, location : Crystal::Location?)
         @info = {
           type:            self.class.name.split("::").last,
           name:            name,
@@ -358,7 +360,7 @@ module Rb
     class StringInterpolation < Node
       @info : NamedTuple(type: String, contents: Array(Node))
 
-      def initialize(contents)
+      def initialize(contents, location : Crystal::Location?)
         @info = {
           type:     self.class.name.split("::").last,
           contents: contents,
@@ -371,7 +373,7 @@ module Rb
     class UnaryExpr < Node
       @info : NamedTuple(type: String, op: String, value: Node, with_parens: Bool)
 
-      def initialize(val, op, parens)
+      def initialize(val, op, parens, location : Crystal::Location?)
         @info = {
           type:        self.class.name.split("::").last,
           value:       val,
@@ -386,7 +388,7 @@ module Rb
     class BinaryOp < Node
       @info : NamedTuple(type: String, op: String, left: Node, right: Node)
 
-      def initialize(op, left, right)
+      def initialize(op, left, right, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           left:  left,
@@ -401,7 +403,7 @@ module Rb
     class Assign < Node
       @info : NamedTuple(type: String, op: String?, target: Node, value: Node)
 
-      def initialize(target, value, op = nil)
+      def initialize(target, value, op, location : Crystal::Location?)
         @info = {
           type:   self.class.name.split("::").last,
           target: target,
@@ -416,7 +418,7 @@ module Rb
     class MultiAssign < Node
       @info : NamedTuple(type: String, targets: Array(Node), values: Array(Node))
 
-      def initialize(targets, values)
+      def initialize(targets, values, location : Crystal::Location?)
         @info = {
           type:    self.class.name.split("::").last,
           targets: targets,
@@ -430,7 +432,7 @@ module Rb
     class TypeDeclaration < Node
       @info : NamedTuple(type: String, var: Node, declared_type: Node, value: Node?, var_type: String)
 
-      def initialize(@var : Node, @declared_type : Node, @value : Node?)
+      def initialize(@var : Node, @declared_type : Node, @value : Node?, location : Crystal::Location?)
         @info = {
           type:          self.class.name.split("::").last,
           var:           @var,
@@ -446,7 +448,7 @@ module Rb
     class MacroFor < Node
       @info : NamedTuple(type: String, vars: Array(Var), expr: Node, body: Node)
 
-      def initialize(vars, expr, body)
+      def initialize(vars, expr, body, location : Crystal::Location?)
         @info = {
           type: self.class.name.split("::").last,
           vars: vars,
@@ -467,7 +469,7 @@ module Rb
     class MacroExpression < Node
       @info : NamedTuple(type: String, expr: Node, output: Bool)
 
-      def initialize(expr, output)
+      def initialize(expr, output, location : Crystal::Location?)
         @info = {
           type:   self.class.name.split("::").last,
           expr:   expr,
@@ -481,7 +483,7 @@ module Rb
     class ControlExpression < Node
       @info : NamedTuple(type: String, value: Node?)
 
-      def initialize(value)
+      def initialize(value, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           value: value,
@@ -504,7 +506,7 @@ module Rb
       @info : NamedTuple(type: String, body: Node, rescues: Array(Rescue)?, else: Node?,
         ensure: Node?)
 
-      def initialize(body, rescues, else_node, ensure_node)
+      def initialize(body, rescues, else_node, ensure_node, location : Crystal::Location?)
         @info = {
           type:    self.class.name.split("::").last,
           body:    body,
@@ -520,7 +522,7 @@ module Rb
     class Rescue < Node
       @info : NamedTuple(type: String, body: Node, types: Array(Node)?, name: String?)
 
-      def initialize(body, types, name)
+      def initialize(body, types, name, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           body:  body,
@@ -535,7 +537,7 @@ module Rb
     class Union < Node
       @info : NamedTuple(type: String, types: Array(Node))
 
-      def initialize(types)
+      def initialize(types, location : Crystal::Location?)
         @info = {
           type:  self.class.name.split("::").last,
           types: types,
@@ -548,7 +550,7 @@ module Rb
     class Generic < Node
       @info : NamedTuple(type: String, name: Node, args: Array(Node))
 
-      def initialize(name, args)
+      def initialize(name, args, location : Crystal::Location?)
         @info = {
           type: self.class.name.split("::").last,
           name: name,
@@ -562,7 +564,7 @@ module Rb
     class Proc < Node
       @info : NamedTuple(type: String, function: DefNode)
 
-      def initialize(function)
+      def initialize(function, location : Crystal::Location?)
         @info = {
           type:     self.class.name.split("::").last,
           function: function,
@@ -575,7 +577,7 @@ module Rb
     class NodeWithNameNode < Node
       @info : NamedTuple(type: String, name: Node)
 
-      def initialize(name)
+      def initialize(name, location : Crystal::Location?)
         @info = {
           type: self.class.name.split("::").last,
           name: name,
@@ -594,7 +596,7 @@ module Rb
     class VisibilityModifier < Node
       @info : NamedTuple(type: String, visibility: String, exp: Node)
 
-      def initialize(visibility : Crystal::Visibility, exp : Node)
+      def initialize(visibility : Crystal::Visibility, exp : Node, location : Crystal::Location?)
         vis = case visibility
               when Crystal::Visibility::Public
                 "public"

data/lib/gloss.rb

@@ -1,10 +1,12 @@
-# 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
 
 require "rbs"
 require "json"
 require "steep"
 require "fast_blank"
-
 require "gloss/version"
 require "gloss/cli"
 require "gloss/watcher"
@@ -15,10 +17,16 @@ require "gloss/config"
 require "gloss/writer"
 require "gloss/source"
 require "gloss/scope"
-require "gloss/builder"
+require "gloss/visitor"
 require "gloss/errors"
-
-require "gls" unless ENV["CI"] # a bit of a hack for now
-
-EMPTY_ARRAY = [].freeze
+require "gloss/logger"
+require "gloss/prog_loader"
+require "gloss/utils"
+is_ci = ENV.fetch("CI") { ||
+false}
+unless is_ci
+  require "gls"
+end
+EMPTY_ARRAY = Array.new
+.freeze
 EMPTY_HASH = {}.freeze

data/lib/gloss/cli.rb

@@ -3,7 +3,7 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  require "optparse"
+require "optparse"
 module Gloss
   class CLI
     def initialize(argv)
@@ -11,43 +11,86 @@ module Gloss
     end
     def run()
       command = @argv.first
-      files = @argv.[]((1..-1))
+      files = @argv.[](((1)..(-1)))
+      err_msg = catch(:"error") { ||
 case command
-        when "watch"
-          Watcher.new
+          when "init"
+            force = false
+            OptionParser.new() { |opt|
+              opt.on("--force", "-f") { ||
+                force = true
+              }
+            }
+.parse(@argv)
+            Initializer.new(force)
+.run
+          when "version", "--version", "-v"
+            puts(Gloss::VERSION)
+          when "watch", "build"
+            type_checker = ProgLoader.new
+.run
+            (if command.==("watch")
+              files = files.map() { |f|
+                path = (if Pathname.new(f)
+.absolute?
+                  f
+                else
+                  File.join(Dir.pwd, f)
+                end)
+                (if Pathname.new(path)
+.exist?
+                  path
+                else
+                  throw(:"error", "Pathname #{f} does not exist")
+                end)
+              }
+              Watcher.new(files)
 .watch
-        when "build"
-          (if files.empty?
-            Dir.glob("#{Config.src_dir}/**/*.gl")
-          else
-            files
-          end)
-.each() { |fp|
-            puts("=====> Building #{fp}")
-            content = File.read(fp)
-            tree_hash = Parser.new(content)
+            else
+              (if command.==("build")
+                entry_tree = Parser.new(File.read(Config.entrypoint))
 .run
-            type_checker = TypeChecker.new
-            rb_output = Builder.new(tree_hash, type_checker)
+                Visitor.new(entry_tree, type_checker)
 .run
-            type_checker.run(rb_output)
-            puts("=====> Writing #{fp}")
-            Writer.new(rb_output, fp)
+                (if files.empty?
+                  files = Dir.glob("#{Config.src_dir}/**/*.gl")
+                end)
+                files.each() { |fp|
+                  fp = File.absolute_path(fp)
+                  preloaded_output = OUTPUT_BY_PATH.fetch(fp) { ||
+nil                  }
+                  (if preloaded_output
+                    rb_output = preloaded_output
+                  else
+                    Gloss.logger
+.info("Building #{fp}")
+                    content = File.read(fp)
+                    tree_hash = Parser.new(content)
 .run
-          }
-        when "init"
-          force = false
-          OptionParser.new() { |opt|
-            opt.on("--force", "-f") { ||
-              force = true
-            }
-          }
-.parse(@argv)
-          Initializer.new(force)
+                    rb_output = Visitor.new(tree_hash, type_checker)
 .run
-        else
-          abort("Gloss doesn't know how to #{command}")
-      end
+                  end)
+                  Gloss.logger
+.info("Type checking #{fp}")
+                  type_checker.run(fp, rb_output)
+                }
+                files.each() { |fp|
+                  fp = File.absolute_path(fp)
+                  rb_output = OUTPUT_BY_PATH.fetch(fp)
+                  Gloss.logger
+.info("Writing #{fp}")
+                  Writer.new(rb_output, fp)
+.run
+                }
+              end)
+            end)
+          else
+            throw(:"error", "Gloss doesn't know how to #{command}")
+        end
+nil      }
+      (if err_msg
+        abort(err_msg)
+      end)
     end
   end
 end