gloss 0.0.6 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9315ca2d8d487ca5729f7665abcba9e922ec4e0ee85ac54787248d07b54b7ed5
-  data.tar.gz: 78928faa1a7e77e0184594a31786c0befdc796a4a9b46c5f509adb95c39d37c3
+  metadata.gz: 0cb01614c6e4395edaf5600dd39e958b2ca86ae6c2650c2028519659c813ff64
+  data.tar.gz: a1ee0171851a7463113c4e12dff9dd81bb2c003e080896171060dfc439a18499
 SHA512:
-  metadata.gz: c3178c5cf74e3946e327cbe97b5c5f421090e7b678d331c34ce5c8a45aea137cdc9628f91481425e18f66cf3245983d1e5bf965feaae211d619d8d9f5ed55647
-  data.tar.gz: 9d9b5ef709cffe8efb6b0124762bbe025948caa51772cf33a38143862003048f15ee83198c2fd0f6a05128f14da65a9feb22b45205563b686bacb70d51dd5741
+  metadata.gz: 781f7dc53f12231f843947aa619521fbd99deca1bf15a7a5263a279e7a030683c4da2d72722beb30d4a35beba8e98e86085eabd3046d1567be1c37c7d577c6d7
+  data.tar.gz: b3a63fbcb5c81a8c0d4336dcfdb64d46a2ebf624fd804942ba8243c04b43fab05a881ba6386e6f6a5c7fb76b416ca8677212e7993ea8ea22cdca981bff2645fd

data/.github/workflows/tests.yml

@@ -0,0 +1,41 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+env:
+  ImageOS: ubuntu18
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: johansenja/gloss:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        id: gems-cache
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: install Bundler
+        run: gem install bundler:2.2.3
+      - name: install gems
+        run: bundle install --jobs 4 --retry 3
+      - name: Compile extension
+        run: make
+        working-directory: ext/gloss
+      - name: Run tests
+        run: rake
+      - name: Install dependencies
+        run: shards install
+        working-directory: ext/gloss
+      - name: Run tests
+        run: crystal spec
+        working-directory: ext/gloss
+      - name: Build self with current state
+        run: exe/gloss build

data/.gloss.yml

@@ -1,3 +1,5 @@
 ---
 frozen_string_literals: true
 src_dir: src
+entrypoint: src/exe/gloss
+type_checking_strictness: lenient

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    gloss (0.0.6)
+    gloss (0.1.4)
       fast_blank
       listen
-      rbs
-      steep
+      rbs (~> 1.0.4)
+      steep (~> 0.41.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     ast_utils (0.4.0)
       parser (>= 2.7.0)
     byebug (11.1.3)
@@ -24,15 +24,15 @@ GEM
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
-    ffi (1.14.2)
-    i18n (1.8.7)
+    ffi (1.15.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
     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.3)
+    minitest (5.14.4)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -49,7 +49,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.0.4)
+    rbs (1.0.6)
     regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.10.0)
@@ -77,7 +77,7 @@ GEM
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    steep (0.40.0)
+    steep (0.41.0)
       activesupport (>= 5.1)
       ast_utils (>= 0.4.0)
       language_server-protocol (~> 3.15.0.1)

data/README.md

@@ -1,10 +1,8 @@
-# Gloss
+# ![Gloss](./logo.svg "Gloss")
 [![Gem Version](https://badge.fury.io/rb/gloss.svg)](https://rubygems.org/gems/gloss)
-[![Ruby Specs](https://github.com/johansenja/gloss/workflows/Ruby%20Specs/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3A%22Ruby+Specs%22)
-[![Crystal Specs](https://github.com/johansenja/gloss/workflows/Crystal%20Specs/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3A%22Crystal+Specs%22)
-[![Total Downloads](http://ruby-gem-downloads-badge.herokuapp.com/gloss?type=total&color=green&metric=true&label=downloads%20(total)&total_label=)](https://rubygems.org/gems/gloss)
+[![Tests](https://github.com/johansenja/gloss/workflows/Tests/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3ATests)
+[![Total Downloads](http://ruby-gem-downloads-badge.herokuapp.com/gloss?type=total&color=green&label=downloads%20(total)&total_label=)](https://rubygems.org/gems/gloss)
 [![Current Version](http://ruby-gem-downloads-badge.herokuapp.com/gloss?color=green&label=downloads%20(current%20version)&metric=true)](https://rubygems.org/gems/gloss)
-[![Total Views](https://counter.gofiber.io/badge/johansenja/gloss)](https://rubygems.org/gems/gloss)
 
 [Gloss](https://en.wikipedia.org/wiki/Gloss_(annotation)) is a high-level programming language based on [Ruby](https://github.com/ruby/ruby) and [Crystal](https://github.com/crystal-lang/crystal), which compiles to ruby; its aims are on transparency,
 efficiency, and to enhance ruby's goal of developer happiness and productivity.
@@ -137,7 +135,7 @@ class Language
     TS = "TypeScript"
     P = "Python"
   end
-  
+
   def favourite_language(language : Lang)
     puts "my favourite language is #{language}"
   end
@@ -213,7 +211,7 @@ end
 ```crystal
 abstract class BaseClass
   attr_reader :var
-  
+
   def initialize(@var); end
 end
 

data/Rakefile

@@ -17,8 +17,10 @@ RSpec::Core::RakeTask.new :spec  do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :build do
-  `cd ext/gloss && make && cd -`
+task :build_gem do
+  sh "cd", "ext/gloss", "&&", "make", "all", "&&", "cd", "-"
 end
 
-task :default => [:spec]
+task build: [:build_gem]
+
+task default: [:spec]

data/exe/gloss

@@ -1,20 +1,17 @@
 #!/usr/bin/env ruby
+  # frozen_string_literal: true
+
+  ##### This file was generated by Gloss; any changes made here will be overwritten.
+  ##### See src/ to make changes
 
 require "bundler/setup"
 require "gloss"
-
 begin
-  Gloss::CLI.new(ARGV).run
+  Gloss::CLI.new(ARGV)
+.run
 rescue SystemExit
-  # raised by `abort` or `exit`; no op
-rescue => e
-  Gloss.logger.fatal <<~MSG
-    Unexpected error: #{e.class.name}
-    Message: #{e.message}
-    Trace:
-      #{e.backtrace.join("\n")}
-
-    This is probably a bug and may warrant a bug report at https://github.com/johansenja/gloss/issues
-  MSG
-  exit 1
+rescue  => e
+  abort("  Unexpected error: #{e.class
+.name}\n  Message: #{e.message}\n  Trace:\n    #{e.backtrace
+.join("\n")}\n\n  This is probably a bug and may warrant a bug report at https://github.com/johansenja/gloss/issues")
 end

data/ext/gloss/Makefile

@@ -1,26 +1,12 @@
 CRYSTAL = crystal
-TARGET = ../../lib/gls
-
 PLATFORM = $(shell uname -s)
 
 ifeq "$(PLATFORM)" "Darwin"
-install: all
-
-all: clean shards build
-
-shards:
-	shards
-
-build: ./src/gloss.cr
-	$(CRYSTAL) build  --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" $< -o $(TARGET).bundle
-
-clean:
-	rm -f $(TARGET).bundle
-	rm -f $(TARGET).bundle.dwarf
+TARGET = ../../lib/gls.bundle
+else
+TARGET = ../../lib/gls.so
 endif
 
-ifeq "$(PLATFORM)" "Linux"
-LLVM_TARGET = "$(shell uname -m)-unknown-linux-gnu"
 install: all
 
 all: clean shards build
@@ -29,9 +15,8 @@ shards:
 	shards
 
 build: ./src/gloss.cr
-	$(CRYSTAL) build $< --cross-compile --target $(LLVM_TARGET) --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" -o $(TARGET)
+	$(CRYSTAL) build  --link-flags "-shared -Wl,-undefined,dynamic_lookup" $< -o $(TARGET) --release
 
 clean:
-	rm -f $(TARGET).o
-	rm -f $(TARGET).so
-endif
+	rm -f $(TARGET)
+	rm -f $(TARGET).dwarf

data/ext/gloss/lib/cr_ruby.cr

@@ -1,8 +1,6 @@
 lib CrRuby
   # every ruby Object is a VALUE
   type VALUE = Void*
-  # ruby method typing
-  type METHOD_FUNC = VALUE, VALUE -> VALUE
 
   # a ruby Class is a VALUE
   $rb_cObject : VALUE
@@ -28,8 +26,11 @@ lib CrRuby
   fun rb_define_module(name: UInt8*) : VALUE
 
   # define ruby method in C
-  fun rb_define_method(klass: VALUE, name: UInt8*, func: METHOD_FUNC, argc: Int32)
+  fun rb_define_method(klass: VALUE, name: UInt8*, func: Proc(CrRuby::VALUE, CrRuby::VALUE,
+                                                              CrRuby::VALUE), argc: Int32)
 
   # define singleton ruby method in C
-  fun rb_define_singleton_method(klass: VALUE, name: UInt8*, func: METHOD_FUNC, argc: Int32)
+  fun rb_define_singleton_method(klass: VALUE, name: UInt8*, func: Proc(CrRuby::VALUE,
+                                                                        CrRuby::VALUE,
+                                                                        CrRuby::VALUE), argc: Int32)
 end

data/ext/gloss/src/cr_ast.cr

@@ -5,7 +5,7 @@ require "./rb_ast"
 module Crystal
   abstract class ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
@@ -17,13 +17,13 @@ module Crystal
 
   class Expressions < ASTNode
     def to_rb
-      Rb::AST::CollectionNode.new(@expressions.map(&.to_rb))
+      Rb::AST::CollectionNode.new(@expressions.map(&.to_rb), @location)
     end
   end
 
   class NilLiteral < ASTNode
     def to_rb
-      Rb::AST::LiteralNode.new("nil", Rb::AST::RbLiteral::NilClass)
+      Rb::AST::LiteralNode.new("nil", Rb::AST::RbLiteral::NilClass, @location)
     end
   end
 
@@ -31,74 +31,73 @@ module Crystal
     def to_rb
       Rb::AST::LiteralNode.new(
         @value.inspect,
-        @value ? Rb::AST::RbLiteral::TrueClass : Rb::AST::RbLiteral::FalseClass
-      )
+        @value ? Rb::AST::RbLiteral::TrueClass : Rb::AST::RbLiteral::FalseClass, @location)
     end
   end
 
   class NumberLiteral < ASTNode
     def to_rb
-      Rb::AST::LiteralNode.new(@value, Rb::AST::RbLiteral::Integer)
+      Rb::AST::LiteralNode.new(@value, Rb::AST::RbLiteral::Integer, @location)
     end
   end
 
   class CharLiteral < ASTNode
     def to_rb
-      Rb::AST::LiteralNode.new(@value.inspect, Rb::AST::RbLiteral::String)
+      Rb::AST::LiteralNode.new(@value.inspect, Rb::AST::RbLiteral::String, @location)
     end
   end
 
   class StringLiteral < ASTNode
     def to_rb
-      Rb::AST::LiteralNode.new(@value.inspect, Rb::AST::RbLiteral::String)
+      Rb::AST::LiteralNode.new(@value.inspect, Rb::AST::RbLiteral::String, @location)
     end
   end
 
   class StringInterpolation < ASTNode
     def to_rb
-      Rb::AST::StringInterpolation.new(@expressions.map &.to_rb)
+      Rb::AST::StringInterpolation.new(@expressions.map &.to_rb, @location)
     end
   end
 
   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, @location)
     end
   end
 
   class ArrayLiteral < ASTNode
     def to_rb
-      Rb::AST::ArrayLiteral.new(@elements.map(&.to_rb))
+      Rb::AST::ArrayLiteral.new(@elements.map(&.to_rb), @location)
     end
   end
 
   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} }, @location)
     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} }, @location, frozen: true)
     end
   end
 
   class RangeLiteral < ASTNode
     def to_rb
-      Rb::AST::RangeLiteral.new(@from.to_rb, @to.to_rb, @exclusive)
+      Rb::AST::RangeLiteral.new(@from.to_rb, @to.to_rb, @exclusive, @location)
     end
   end
 
   class RegexLiteral < ASTNode
     def to_rb
-      Rb::AST::RegexLiteral.new(@value.to_rb)
+      Rb::AST::RegexLiteral.new(@value.to_rb, @location)
     end
   end
 
   class TupleLiteral < ASTNode
     def to_rb
-      Rb::AST::ArrayLiteral.new(@elements.map(&.to_rb), frozen: true)
+      Rb::AST::ArrayLiteral.new(@elements.map(&.to_rb), @location, frozen: true)
     end
   end
 
@@ -115,26 +114,25 @@ module Crystal
         @body.to_rb,
         return_type.try(&.to_rb),
         @yields,
-        @block_arg.try &.to_rb
-      )
+        @block_arg.try &.to_rb, @location)
     end
   end
 
   class ClassDef < ASTNode
     def to_rb
-      Rb::AST::ClassNode.new(@name.to_rb, @body.to_rb, @superclass.try(&.to_rb), @type_vars, @abstract)
+      Rb::AST::ClassNode.new(@name.to_rb, @body.to_rb, @superclass.try(&.to_rb), @type_vars, @abstract, @location)
     end
   end
 
   class ModuleDef < ASTNode
     def to_rb
-      Rb::AST::ModuleNode.new(@name.to_rb, @body.to_rb, @type_vars)
+      Rb::AST::ModuleNode.new(@name.to_rb, @body.to_rb, @type_vars, @location)
     end
   end
 
   class Var < ASTNode
     def to_rb
-      Rb::AST::Var.new(@name)
+      Rb::AST::Var.new(@name, @location)
     end
   end
 
@@ -142,7 +140,7 @@ module Crystal
     def to_rb
       positional_args = args.dup
       splat = @splat_index ? positional_args.delete_at(@splat_index.as(Int32)) : nil
-      Rb::AST::Block.new(positional_args.map(&.to_rb), splat.try &.to_rb, @body.to_rb)
+      Rb::AST::Block.new(positional_args.map(&.to_rb), splat.try &.to_rb, @body.to_rb, @location)
     end
   end
 
@@ -155,8 +153,7 @@ module Crystal
         @named_args.try(&.map(&.to_rb.as(Rb::AST::Arg))),
         @block.try(&.to_rb),
         @block_arg.try(&.to_rb),
-        @has_parentheses
-      )
+        @has_parentheses, @location)
     end
   end
 
@@ -165,121 +162,121 @@ 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, @location)
     end
   end
 
   class NamedArgument < ASTNode
     def to_rb
-      Rb::AST::Arg.new(@name, @name, nil, @value.to_rb, true)
+      Rb::AST::Arg.new(@name, @name, nil, @value.to_rb, true, @location)
     end
   end
 
   class If < ASTNode
     def to_rb
-      Rb::AST::If.new(@cond.to_rb, @then.to_rb, @else.to_rb)
+      Rb::AST::If.new(@cond.to_rb, @then.to_rb, @else.to_rb, @location)
     end
   end
 
   class Unless < ASTNode
     def to_rb
-      Rb::AST::Unless.new(@cond.to_rb, @then.to_rb, @else.to_rb)
+      Rb::AST::Unless.new(@cond.to_rb, @then.to_rb, @else.to_rb, @location)
     end
   end
 
   class Assign < ASTNode
     def to_rb
-      Rb::AST::Assign.new(@target.to_rb, @value.to_rb)
+      Rb::AST::Assign.new(@target.to_rb, @value.to_rb, nil, @location)
     end
   end
 
   class OpAssign < ASTNode
     def to_rb
-      Rb::AST::Assign.new(@target.to_rb, @value.to_rb, @op)
+      Rb::AST::Assign.new(@target.to_rb, @value.to_rb, @op, @location)
     end
   end
 
   class MultiAssign < ASTNode
     def to_rb
-      Rb::AST::MultiAssign.new(@targets.map(&.to_rb), @values.map(&.to_rb))
+      Rb::AST::MultiAssign.new(@targets.map(&.to_rb), @values.map(&.to_rb), @location)
     end
   end
 
   class InstanceVar < ASTNode
     def to_rb
-      Rb::AST::InstanceVar.new(@name)
+      Rb::AST::InstanceVar.new(@name, @location)
     end
   end
 
   class ReadInstanceVar < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
   class ClassVar < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
   class Global < ASTNode
     def to_rb
-      Rb::AST::GlobalVar.new(@name)
+      Rb::AST::GlobalVar.new(@name, @location)
     end
   end
 
   class Annotation < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
   class MacroIf < ASTNode
     def to_rb
-      Rb::AST::MacroIf.new(@cond.to_rb, @then.to_rb, @else.to_rb)
+      Rb::AST::MacroIf.new(@cond.to_rb, @then.to_rb, @else.to_rb, @location)
     end
   end
 
   class MacroFor < ASTNode
     def to_rb
-      Rb::AST::MacroFor.new(@vars.map(&.to_rb), @exp.to_rb, @body.to_rb)
+      Rb::AST::MacroFor.new(@vars.map(&.to_rb), @exp.to_rb, @body.to_rb, @location)
     end
   end
 
   class MacroVar < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
   class MacroExpression < ASTNode
     def to_rb
-      Rb::AST::MacroExpression.new(@exp.to_rb, @output)
+      Rb::AST::MacroExpression.new(@exp.to_rb, @output, @location)
     end
   end
 
   class MacroLiteral < ASTNode
     def to_rb
-      Rb::AST::MacroLiteral.new(@value)
+      Rb::AST::MacroLiteral.new(@value, @location)
     end
   end
 
   class Annotation < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::EmptyNode.new(self.class.name, @location)
     end
   end
 
   class EnumDef < ASTNode
     def to_rb
-      Rb::AST::Enum.new(@name, @members.map(&.to_rb))
+      Rb::AST::Enum.new(@name, @members.map(&.to_rb), @location)
     end
   end
 
   class Path < ASTNode
     def to_rb
-      Rb::AST::Path.new(full_name)
+      Rb::AST::Path.new(full_name, @location)
     end
 
     def full_name
@@ -291,13 +288,13 @@ module Crystal
 
   class Require < ASTNode
     def to_rb
-      Rb::AST::Require.new(@string)
+      Rb::AST::Require.new(@string, @location)
     end
   end
 
   class TypeDeclaration < ASTNode
     def to_rb
-      Rb::AST::TypeDeclaration.new(@var.to_rb, @declared_type.to_rb, @value.try(&.to_rb))
+      Rb::AST::TypeDeclaration.new(@var.to_rb, @declared_type.to_rb, @value.try(&.to_rb), @location)
     end
   end
 
@@ -307,8 +304,7 @@ module Crystal
         @cond.try(&.to_rb),
         @whens.map(&.to_rb),
         @else.try(&.to_rb),
-        @exhaustive
-      )
+        @exhaustive, @location)
     end
   end
 
@@ -322,16 +318,14 @@ module Crystal
               Def.new(
                 "->",
                 [Arg.new(arg_name)],
-                c.tap { |call| call.obj = Var.new(arg_name) }
-              )
+                c.tap { |call| call.obj = Var.new(arg_name) })
             ).to_rb
           else
             c.to_rb
           end
         end,
         @body.to_rb,
-        @exhaustive
-      )
+        @exhaustive, @location)
     end
   end
 
@@ -351,8 +345,7 @@ module Crystal
         Rb::AST::UnaryExpr.new(
           @exp.to_rb,
           op,
-          requires_parentheses
-        )
+          requires_parentheses ,@location)
       end
     end
   {% end %}
@@ -367,8 +360,7 @@ module Crystal
             "||",
           {% end %}
           @left.to_rb,
-          @right.to_rb
-        )
+          @right.to_rb ,@location)
       end
     end
   {% end %}
@@ -376,7 +368,7 @@ module Crystal
   {% for class_name in %w[Return Break Next] %}
     class {{class_name.id}} < ControlExpression
       def to_rb
-        Rb::AST::{{class_name.id}}.new(@exp.try(&.to_rb))
+        Rb::AST::{{class_name.id}}.new(@exp.try(&.to_rb),@location)
       end
     end
   {% end %}
@@ -384,43 +376,43 @@ 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), @location)
     end
   end
 
   class Rescue < ASTNode
     def to_rb
-      Rb::AST::Rescue.new(@body.to_rb, @types.try(&.map(&.to_rb)), @name)
+      Rb::AST::Rescue.new(@body.to_rb, @types.try(&.map(&.to_rb)), @name, @location)
     end
   end
 
   class Union < ASTNode
     def to_rb
-      Rb::AST::Union.new(@types.map(&.to_rb))
+      Rb::AST::Union.new(@types.map(&.to_rb), @location)
     end
   end
 
   class Generic < ASTNode
     def to_rb
-      Rb::AST::Generic.new(@name.to_rb, @type_vars.map(&.to_rb))
+      Rb::AST::Generic.new(@name.to_rb, @type_vars.map(&.to_rb), @location)
     end
   end
 
   class ProcLiteral < ASTNode
     def to_rb
-      Rb::AST::Proc.new(@def.to_rb)
+      Rb::AST::Proc.new(@def.to_rb, @location)
     end
   end
 
   class Include < ASTNode
     def to_rb
-      Rb::AST::Include.new(@name.to_rb)
+      Rb::AST::Include.new(@name.to_rb, @location)
     end
   end
 
   class Extend < ASTNode
     def to_rb
-      Rb::AST::Extend.new(@name.to_rb)
+      Rb::AST::Extend.new(@name.to_rb, @location)
     end
   end
 
@@ -433,14 +425,13 @@ module Crystal
         nil,
         nil,
         nil,
-        false
-      )
+        false, @location)
     end
   end
 
   class VisibilityModifier < ASTNode
     def to_rb
-      Rb::AST::VisibilityModifier.new(@modifier, @exp.to_rb)
+      Rb::AST::VisibilityModifier.new(@modifier, @exp.to_rb, @location)
     end
   end
 
@@ -453,8 +444,7 @@ module Crystal
         nil,
         nil,
         nil,
-        !@exps.empty?
-      )
+        !@exps.empty?, @location)
     end
   end
 
@@ -465,7 +455,7 @@ module Crystal
                          Underscore MagicConstant Asm AsmOperand] %}
     class {{class_name.id}} < ASTNode
       def to_rb
-        Rb::AST::EmptyNode.new(self.class.name)
+        Rb::AST::EmptyNode.new(self.class.name,@location)
       end
     end
   {% end %}
@@ -473,7 +463,7 @@ module Crystal
   {% for class_name in %w[PointerOf SizeOf InstanceSizeOf Out MacroVerbatim] %}
     class {{class_name.id}} < UnaryExpression
       def to_rb
-        Rb::AST::EmptyNode.new(self.class.name)
+        Rb::AST::EmptyNode.new(self.class.name,@location)
       end
     end
   {% end %}