gloss 0.0.5 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a26f64e872c2884f2fa5969d762e66ed6f1346732933f08ae7b92eb07aea5ab3
-  data.tar.gz: 9cf39520e8dc43e6a74f9ea606a719815e2bd503d19744c7979478f746b8345f
+  metadata.gz: ed8cc1e615a2df1545467719ac63f8e2667a6e80c0e8fb3e05bf2e11d657779c
+  data.tar.gz: 59ecbb8e9f8327d8ffc86ffcb7254526b8dc2874d9c72b9fcd5f316f8c02334d
 SHA512:
-  metadata.gz: bdb98f72e57945e9de8bbd03296d95b2cfc221f915e7e8e8fd511e8b4794ef3bb65f1830d9769486c30a004595c3a7f84e3e785bb1b1297d778cff984a0a3234
-  data.tar.gz: 9758d730e858adf27c60f89ec9e88ffb07d3950d2a4f493b1d0ad2b00b7a10999fd76c9ae802753428fdfb0cab005adfe773456c415b504809217507ac30fbc5
+  metadata.gz: 91a18fc32f3a8dd27e14e9206c623fa3c608b0c6215ed8f239ae4f23a5ffa1f529b6b0cf4ddb6beeeb103b0d522c3a7bfdf5dc1d4462df0ba8a9da6598cb7c79
+  data.tar.gz: 8c42f4e1c6b92b5823835684d932ce686c6c517558d8e0061dc5633d7aa8eb11f8c652bf6aadca0bd5748731fdc51ae09543354de505da57640c89f5b457f5b4

data/.gitattributes

@@ -0,0 +1,3 @@
+lib/gloss/**/*.rb  linguist-generated
+# this will basically cover 99% of the syntax anyway
+**/*.gl linguist-language=Crystal

data/.github/workflows/{crystal.yml → crystal_specs.yml}

@@ -1,4 +1,4 @@
-name: Crystal CI
+name: Crystal Specs
 
 on:
   push:

data/.github/workflows/{ruby.yml → ruby_specs.yml}

@@ -5,7 +5,7 @@
 # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
-name: Ruby
+name: Ruby Specs
 
 on:
   push:
@@ -16,7 +16,7 @@ on:
 jobs:
   test:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/self_build.yml

@@ -0,0 +1,45 @@
+name: Self Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+env:
+  ImageOS: ubuntu18
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: crystallang/crystal
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+      # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+      # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+        with:
+          ruby-version: 2.7
+      - name: Install ruby-dev
+        run: apt-get update -y && apt-get install -y ruby-dev
+      - 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: build native extensions
+        run: cd ext/gloss && make && cd -
+      - name: Build self with current state
+        run: ls lib/ && exe/gloss build
+      - name: check installation from rubygems
+        run: gem install gloss

data/.gloss.yml

@@ -1,3 +1,4 @@
 ---
 frozen_string_literals: true
 src_dir: src
+entrypoint: src/exe/gloss

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloss (0.0.5)
+    gloss (0.1.3)
       fast_blank
       listen
       rbs
@@ -25,7 +25,7 @@ GEM
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
     ffi (1.14.2)
-    i18n (1.8.7)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
     listen (3.4.1)
@@ -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,7 +1,14 @@
 # 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)
+[![Current Version](http://ruby-gem-downloads-badge.herokuapp.com/gloss?color=green&label=downloads%20(current%20version)&metric=true)](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. Some of the features include:
+efficiency, and to enhance ruby's goal of developer happiness and productivity.
+
+### Current features
 
 - Type checking, via optional type annotations
 - Compile-time macros
@@ -10,11 +17,26 @@ efficiency, and to enhance ruby's goal of developer happiness and productivity.
 - All ruby files are valid gloss files (a small exceptions for now; workarounds are mostly available)
 - Other syntactic sugar
 
-Coming soon:
-- abstract classes
+### Current Status
+
+This project is at a stage where the core non-crystal parts are written in Gloss and compile to ruby (essentially self-hosting), albeit with the type checking being fairly loose. However the project is still in the very early stages; with (as of yet) no Linux support nor error handling (see roadmap below). Use at your own discretion!
+
+### Approx. roadmap:
+
+- Improve error handling and logging (currently almost non-existant)
+- Address Linux compatibility (currently more or less non-existant)
+- Implement different strictnesses of type checking
+- Metaprogramming helpers/safety:*
+  - Abstract classes and methods
+  - Method lookup/existence checking at compile time
+  - Method overloading
+
+#### Related items:
+
+- Rails helpers; probably some time away*
+- Editor plugins/syntax highlighting/langserver; probably some time away*
 
-Maybe on the roadmap:
-- Method overloading
+*__Dependent on popularity__
 
 ## Examples:
 
@@ -223,4 +245,12 @@ then
 
 then
 
+`mkdir src && echo "puts 'hello world'" > src/hello_world.gl`
+
+then
+
 `gloss build`
+
+then
+
+`ruby ./hello_world.rb`

data/Rakefile

@@ -18,7 +18,7 @@ RSpec::Core::RakeTask.new :spec  do |spec|
 end
 
 task :build do
-  `cd ext/gloss && make && cd -`
+  sh "cd", "ext/gloss", "&&", "make", "all", "&&", "cd", "-"
 end
 
 task :default => [:spec]

data/exe/gloss

@@ -1,6 +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"
-
-Gloss::CLI.new(ARGV).run
+begin
+  Gloss::CLI.new(ARGV)
+.run
+rescue SystemExit
+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,20 @@
 CRYSTAL = crystal
-TARGET = ../../lib/gls
-
 PLATFORM = $(shell uname -s)
 
 ifeq "$(PLATFORM)" "Darwin"
-install: all
-
-all: clean shards build
+TARGET = ../../lib/gls.bundle
 
-shards:
-	shards
+clean:
+	rm -f $(TARGET) $(TARGET).dwarf
+endif
 
-build: ./src/gloss.cr
-	$(CRYSTAL) build  --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" $< -o $(TARGET).bundle
+ifeq "$(PLATFORM)" "Linux"
+TARGET = ../../lib/gls.so
 
 clean:
-	rm -f $(TARGET).bundle
-	rm -f $(TARGET).bundle.dwarf
+	rm -f $(TARGET)
 endif
 
-ifeq "$(PLATFORM)" "Linux"
-LLVM_TARGET = "$(shell uname -m)-unknown-linux-gnu"
 install: all
 
 all: clean shards build
@@ -29,9 +23,4 @@ shards:
 	shards
 
 build: ./src/gloss.cr
-	$(CRYSTAL) build $< --cross-compile --target $(LLVM_TARGET) --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" -o $(TARGET)
-
-clean:
-	rm -f $(TARGET).o
-	rm -f $(TARGET).so
-endif
+	$(CRYSTAL) build  --link-flags "-shared -dynamic -Wl,-undefined,dynamic_lookup" $< -o $(TARGET) --release

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,127 +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)
-    end
-  end
-
-  class MacroExpression < 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
@@ -297,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
 
@@ -313,8 +304,7 @@ module Crystal
         @cond.try(&.to_rb),
         @whens.map(&.to_rb),
         @else.try(&.to_rb),
-        @exhaustive
-      )
+        @exhaustive, @location)
     end
   end
 
@@ -328,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
 
@@ -357,8 +345,7 @@ module Crystal
         Rb::AST::UnaryExpr.new(
           @exp.to_rb,
           op,
-          requires_parentheses
-        )
+          requires_parentheses ,@location)
       end
     end
   {% end %}
@@ -373,8 +360,7 @@ module Crystal
             "||",
           {% end %}
           @left.to_rb,
-          @right.to_rb
-        )
+          @right.to_rb ,@location)
       end
     end
   {% end %}
@@ -382,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 %}
@@ -390,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
 
@@ -439,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
 
@@ -459,8 +444,7 @@ module Crystal
         nil,
         nil,
         nil,
-        !@exps.empty?
-      )
+        !@exps.empty?, @location)
     end
   end
 
@@ -471,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 %}
@@ -479,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 %}