kaiser-ruby 0.7.1 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86f7b4d4eeb3c6c63aee4afd51fafb2e1676fe6d743a8df48a10a77b7e761e8
-  data.tar.gz: 1090782c7e4bb4684ffbc3162f4d5ae6529c0e4cfd3d29d227938f1a930d8519
+  metadata.gz: 040ea9398c1f1cb0499f3a5d21038b9ee52434a9370145ec8efd5e1217264431
+  data.tar.gz: b7eb871f93fb4f68570685d9376c75698ca23e16b12752e6157cd046acacc6ff
 SHA512:
-  metadata.gz: 9cf3a4423bc2d0da323ac5dcf575cdacf373eac7d3aaccee48c23781a85589342941a225a909b53f7e342baa611e0fe8ad8997c37386f44ffc306bff96160839
-  data.tar.gz: 100adddde94add35ad05b3a2d58d8a99993bc88b55f8d71a452f0356468d8f4a1be669a6bb3531d0ca596d8230b73098ee447b28b65d86bfefe40c245fb26d22
+  metadata.gz: bdd9abbab639f244d3a97799a25dc8c0ef5b5dfc582011a6b1d3cc02df804c7ca2d3ca8746214ba5b7df101af8967021e9fe20a010e86c8121bd122b68ea98f0
+  data.tar.gz: 3c04422053c184d14c59740bceb57212b4f8b1d3483c916ee8c131128af2315cf30a2040dbf0c431dd31c27100372b858580b3180739975f593a639e6f336945

data/.rubocop.yml

@@ -0,0 +1,11 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
+Metrics:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Lint/InterpolationCheck:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.2

data/.travis.yml

@@ -1,7 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5
+  - 2.6.2
+before_install: gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 0.8
+
+Language implementation:
+
+- [x] Add support for simple variables
+- [x] Add support for rest of the pronouns
+- [x] Return integers instead of floats where applicable so it will show `5` instead of `5.0` if there's no need for a Float
+- [x] Introduce proper `mysterious` type to allow `nil` to be used more predictably
+- [x] Update pronouns only on variable assignment, not on usage too
+- [x] Fix double elses without preceding empty line to end the `if/else` block explicitly
+- [x] Comments are properly ignored now (even multiline ones though they're a really bad idea anyway)
+- [x] Math operators like `+` are also handled in addition to `plus`
+- [x] Strings are no longer considered falsy if they contain a falsy alias (`lies`, `false` etc), they're always truthy
+- [x] Support `let <variable> be <expression>`
+- [x] Handle recursion
+- [x] Handle nested functions and their scoping
+
+Other changes:
+
+- [x] Add new reference tests from main language repository
+- [x] Fix else nesting
+- [x] Fix older Ruby versions
+
 # 0.7.1
 
 - [x] Strips all lines while parsing, so you can indent the .rock file however you want
@@ -7,7 +30,7 @@
 
 # 0.7
 
-Language Implementation
+Language implementation:
 
 - [x] Full language implementation according to the spec
 
@@ -27,7 +50,7 @@ Language Implementation
 - [x] Multiple increments/decrements with `build X up, up up` and `knock Y down, down, down`
 - [x] Handle global variables if they're declared after function definition that uses them
 
-Other
+Other changes:
 
 - [x] Replaced parsing with Parslet with a hand-written parser in plain Ruby
 - [x] Implemented reference tests
@@ -38,26 +61,27 @@ Other
 
 # 0.6 - unreleased
 
+Other changes:
+
 - [x] Fixed error in input from STDIN
 - [x] The transpiler now throws a SyntaxError instead of Parslet exception
-
-Test Suite
-
 - [x] Refactored the test suite to make more sense
 - [x] Added a ton of new negative and positive tests
 
 # 0.5
 
+Language implementation:
+
 - [x] Fixed converting decimals so "Conversion is lovestruck. lovestruck and essential seasick" results in "conversion = 0.0397" as one would expect.
 
-Other stuff
+Other changes:
 
 - [x] Updated the REPL to work on Ruby versions earlier than 2.5 (2.3 is the minimum supported version)
 - [x] Travis CI tests on all supported Ruby versions
 
 # 0.4
 
-Language Implementation:
+Language implementation:
 
 - [x] Handle non-alpha values in quoted strings
 - [x] Ignore comments in parentheses
@@ -67,7 +91,7 @@ Language Implementation:
 - [x] Better handle input of integers from STDIN
 - [x] Print can print returned values from functions
 
-Other stuff:
+Other changes:
 
 - [x] Updated the FizzBuzz example
 - [x] Catch exceptions in the REPL
@@ -77,7 +101,7 @@ Other stuff:
 
 # 0.3
 
-Language Implementation:
+Language implementation:
 
 - [x] Handle null type differently - nil in Ruby isn't really comparable to 0
 - [x] Handle mysterious type - probably this should be nil and what is now nil should be 0 instead
@@ -91,7 +115,7 @@ Language Implementation:
 - [x] Handle function calls
 - [x] Return can return math operations directly
 
-Other stuff:
+Other changes:
 
 - [x] FizzBuzz example is working
 - [x] Fibonacci example is working

data/Gemfile

@@ -1,6 +1,8 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in kaiser-ruby.gemspec
 gemspec

data/Gemfile.lock

@@ -1,45 +1,60 @@
 PATH
   remote: .
   specs:
-    kaiser-ruby (0.7.1)
+    kaiser-ruby (0.8)
       hashie
-      thor (~> 0.20)
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     coderay (1.1.2)
     diff-lcs (1.3)
     hashie (3.6.0)
-    method_source (0.9.0)
-    pry (0.11.3)
+    jaro_winkler (1.5.2)
+    method_source (0.9.2)
+    parallel (1.15.0)
+    parser (2.6.2.0)
+      ast (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    psych (3.1.0)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    thor (0.20.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.66.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.0)
+    thor (0.20.3)
+    unicode-display_width (1.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.17.0)
   kaiser-ruby!
-  pry (~> 0.11)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.2
+  pry
+  rake
+  rspec
+  rubocop

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'kaiser_ruby'
+require 'pry'
+
+using KaiserRuby::Refinements
 
-require "bundler/setup"
-require "kaiser_ruby"
-require "pry"
 Pry.start

data/exe/kaiser-ruby

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require "bundler/setup"
-require "kaiser_ruby"
-require "kaiser_ruby/cli"
-require "kaiser_ruby/refinements"
+# frozen_string_literal: true
 
-KaiserRuby::CLI.start(ARGV)
+require 'rubygems'
+require 'bundler/setup'
+require 'kaiser_ruby'
+require 'kaiser_ruby/cli'
+require 'kaiser_ruby/refinements'
+
+KaiserRuby::CLI.start(ARGV)

data/kaiser-ruby.gemspec

@@ -1,30 +1,33 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "kaiser_ruby/version"
+require 'kaiser_ruby/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "kaiser-ruby"
+  spec.name          = 'kaiser-ruby'
   spec.version       = KaiserRuby::VERSION
-  spec.authors       = ["Marcin Ruszkiewicz"]
-  spec.email         = ["marcin.ruszkiewicz@polcode.net"]
+  spec.authors       = ['Marcin Ruszkiewicz']
+  spec.email         = ['marcin.ruszkiewicz@polcode.net']
 
-  spec.summary       = %q{Transpiler of Rockstar language to Ruby}
-  spec.homepage      = "https://github.com/marcinruszkiewicz/kaiser-ruby"
-  spec.license       = "MIT"
+  spec.summary       = 'Transpiler of Rockstar language to Ruby'
+  spec.homepage      = 'https://github.com/marcinruszkiewicz/kaiser-ruby'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|examples)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = ['kaiser-ruby']
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.11"
-  spec.add_dependency "thor", "~> 0.20"
-  spec.add_dependency "hashie"
+  spec.add_development_dependency 'bundler', '~> 1.17.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_dependency 'hashie'
+  spec.add_dependency 'thor'
 end

data/lib/kaiser_ruby.rb

@@ -1,17 +1,17 @@
+# frozen_string_literal: true
+
 require 'hashie'
 require 'kaiser_ruby/parser'
-require 'kaiser_ruby/transformer'
 require 'kaiser_ruby/refinements'
+require 'kaiser_ruby/transformer'
 require 'pry'
 
+# Transpile Rockstar into Ruby code
 module KaiserRuby
   class RockstarSyntaxError < SyntaxError
   end
 
   def self.parse(input)
-    # eat comments since we don't care about them
-    input = input.gsub(/\n *\(.*?\) *\n/m, "\n\n")
-    input = input.gsub(/\(.*?\)\s*\n/m, "\n").gsub(/ +/, ' ')
     parser = KaiserRuby::Parser.new(input)
     parser.parse
   end
@@ -29,8 +29,6 @@ module KaiserRuby
     end
   end
 
-  private
-
   def self.with_captured_stdout
     old_stdout = $stdout
     $stdout = StringIO.new

data/lib/kaiser_ruby/cli.rb

@@ -1,20 +1,32 @@
+# frozen_string_literal: true
+
 require 'thor'
 require_relative 'version'
 
 module KaiserRuby
+  # command line interface for kaiser-ruby command
   class CLI < Thor
     package_name "Kaiser-Ruby v#{KaiserRuby::VERSION}"
 
-    desc "transpile FILE", "transpile a .rock FILE and output the result"
-    option 'show-source'.to_sym, type: :boolean, desc: "prints out the source file along with the transpiled output"
-    option :save, desc: "saves the transpiled output in SAVE"
+    desc 'parse FILE', 'parse a .rock FILE and output the intermediate tree'
+    def parse(filename)
+      file = File.read filename
+      output = KaiserRuby.parse(file)
+
+      puts output
+      say
+    end
+
+    desc 'transpile FILE', 'transpile a .rock FILE and output the resulting Ruby code'
+    option 'show-source'.to_sym, type: :boolean, desc: 'prints out the source file along with the transpiled output'
+    option :save, desc: 'saves the transpiled output in SAVE'
     def transpile(filename)
       file = File.read filename
       output = KaiserRuby.transpile(file)
 
       if options['show-source'.to_sym]
         say file
-        say "-" * 40, :green
+        say '-' * 40, :green
       end
 
       if options[:save]
@@ -35,7 +47,7 @@ module KaiserRuby
 
     using KaiserRuby::Refinements
 
-    desc "execute FILE", "transpiles and runs a .rock FILE"
+    desc 'execute FILE', 'transpiles and runs a .rock FILE'
     def execute(filename)
       file = File.read filename
       output = KaiserRuby.transpile(file)
@@ -43,8 +55,8 @@ module KaiserRuby
       say
     end
 
-    desc "rock", "opens an interactive console that accepts and evaluates Rockstar code"
-    option :debug, type: :boolean, desc: "also shows transpiled code"
+    desc 'rock', 'opens an interactive console that accepts and evaluates Rockstar code'
+    option :debug, type: :boolean, desc: 'also shows transpiled code'
     def rock
       say "Type 'exit' to exit the console. Otherwise, rock on!"
 

data/lib/kaiser_ruby/parser.rb

@@ -1,70 +1,77 @@
+# frozen_string_literal: true
+
 module KaiserRuby
+  # Parser class goes through the Rockstar code provided and generates
+  # an intermediate tree from which we can output a proper Ruby program
   class Parser
     attr_reader :lines, :raw_input, :tree
 
-    POETIC_STRING_KEYWORDS = %w(says)
-    POETIC_NUMBER_KEYWORDS = %w(is was were are 's 're)
-    POETIC_NUMBER_CONTRACTIONS = %w('s 're)
-    POETIC_TYPE_KEYWORDS = %w(is)
-    PRINT_KEYWORDS = %w(say whisper shout scream)
-    LISTEN_TO_KEYWORDS = ['listen to']
-    LISTEN_KEYWORDS = ['listen']
-    BREAK_KEYWORDS = ['break', 'break it down']
-    CONTINUE_KEYWORDS = ['continue', 'take it to the top']
-    RETURN_KEYWORDS = ['give back']
-
-    INCREMENT_FIRST_KEYWORDS = %w(build)
-    INCREMENT_SECOND_KEYWORDS = %w(up)
-    DECREMENT_FIRST_KEYWORDS = %w(knock)
-    DECREMENT_SECOND_KEYWORDS = %w(down)
-    ASSIGNMENT_FIRST_KEYWORDS = %w(put)
-    ASSIGNMENT_SECOND_KEYWORDS = %w(into)
-
-    FUNCTION_KEYWORDS = %w(takes)
-    FUNCTION_SEPARATORS = ['and', ', and', "'n'", '&', ',']
-    FUNCTION_CALL_KEYWORDS = %w(taking)
-    FUNCTION_CALL_SEPARATORS = [', and', "'n'", '&', ',']
-    IF_KEYWORDS = %w(if)
-    UNTIL_KEYWORDS = %w(until)
-    WHILE_KEYWORDS = %w(while)
-    ELSE_KEYWORDS = %w(else)
-
-    NULL_TYPE = %w(null nothing nowhere nobody gone empty)
-    TRUE_TYPE = %w(true yes ok right)
-    FALSE_TYPE = %w(false no lies wrong)
-    NIL_TYPE = %w(mysterious)
-    POETIC_TYPE_LITERALS = NIL_TYPE + NULL_TYPE + TRUE_TYPE + FALSE_TYPE
-
-    COMMON_VARIABLE_KEYWORDS = %w(a an the my your)
-    PRONOUN_KEYWORDS = %w(he him she her it its they them)
-
-    ADDITION_KEYWORDS = %w(plus with)
-    SUBTRACTION_KEYWORDS = %w(minus without)
-    MULTIPLICATION_KEYWORDS = %w(times of)
-    DIVISION_KEYWORDS = %w(over)
+    POETIC_STRING_KEYWORDS = %w[says].freeze
+    POETIC_NUMBER_KEYWORDS = %w[is was were are 's 're].freeze
+    POETIC_NUMBER_CONTRACTIONS = %w['s 're].freeze
+    POETIC_TYPE_KEYWORDS = %w[is].freeze
+    PRINT_KEYWORDS = %w[say whisper shout scream].freeze
+    LISTEN_TO_KEYWORDS = ['listen to'].freeze
+    LISTEN_KEYWORDS = ['listen'].freeze
+    BREAK_KEYWORDS = ['break', 'break it down'].freeze
+    CONTINUE_KEYWORDS = ['continue', 'take it to the top'].freeze
+    RETURN_KEYWORDS = ['give back'].freeze
+
+    INCREMENT_FIRST_KEYWORDS = %w[build].freeze
+    INCREMENT_SECOND_KEYWORDS = %w[up].freeze
+    DECREMENT_FIRST_KEYWORDS = %w[knock].freeze
+    DECREMENT_SECOND_KEYWORDS = %w[down].freeze
+    ASSIGNMENT_FIRST_KEYWORDS = %w[put].freeze
+    ASSIGNMENT_SECOND_KEYWORDS = %w[into].freeze
+    LET_ASSIGNMENT_FIRST_KEYWORDS = %w[let].freeze
+    LET_ASSIGNMENT_SECOND_KEYWORDS = %w[be].freeze
+
+    FUNCTION_KEYWORDS = %w[takes].freeze
+    FUNCTION_SEPARATORS = ['and', ', and', "'n'", '&', ','].freeze
+    FUNCTION_CALL_KEYWORDS = %w[taking].freeze
+    FUNCTION_CALL_SEPARATORS = [', and', "'n'", '&', ','].freeze
+    IF_KEYWORDS = %w[if].freeze
+    UNTIL_KEYWORDS = %w[until].freeze
+    WHILE_KEYWORDS = %w[while].freeze
+    ELSE_KEYWORDS = %w[else].freeze
+
+    NULL_TYPE = %w[null nothing nowhere nobody gone empty].freeze
+    TRUE_TYPE = %w[true yes ok right].freeze
+    FALSE_TYPE = %w[false no lies wrong].freeze
+    MYSTERIOUS_TYPE = %w[mysterious].freeze
+    POETIC_TYPE_LITERALS = MYSTERIOUS_TYPE + NULL_TYPE + TRUE_TYPE + FALSE_TYPE
+
+    COMMON_VARIABLE_KEYWORDS = %w[a an the my your].freeze
+    PRONOUN_KEYWORDS = %w[he him she her it its they them ze hir zie zir xe xem ve ver].freeze
+
+    ADDITION_KEYWORDS = %w[plus with +].freeze
+    SUBTRACTION_KEYWORDS = %w[minus without -].freeze
+    MULTIPLICATION_KEYWORDS = %w[times of *].freeze
+    DIVISION_KEYWORDS = %w[over /].freeze
     MATH_OP_KEYWORDS = ADDITION_KEYWORDS + SUBTRACTION_KEYWORDS + MULTIPLICATION_KEYWORDS + DIVISION_KEYWORDS
-
-    EQUALITY_KEYWORDS = %w(is)
-    INEQUALITY_KEYWORDS = %w(isn't isnt ain't aint is\ not)
-    GT_KEYWORDS = ['is higher than', 'is greater than', 'is bigger than', 'is stronger than']
-    GTE_KEYWORDS = ['is as high as', 'is as great as', 'is as big as', 'is as strong as']
-    LT_KEYWORDS = ['is lower than', 'is less than', 'is smaller than', 'is weaker than']
-    LTE_KEYWORDS = ['is as low as', 'is as little as', 'is as small as', 'is as weak as']
+    MATH_TOKENS = %w[+ / * -].freeze
+
+    EQUALITY_KEYWORDS = %w[is].freeze
+    INEQUALITY_KEYWORDS = %w[isn't isnt ain't aint is\ not].freeze
+    GT_KEYWORDS = ['is higher than', 'is greater than', 'is bigger than', 'is stronger than'].freeze
+    GTE_KEYWORDS = ['is as high as', 'is as great as', 'is as big as', 'is as strong as'].freeze
+    LT_KEYWORDS = ['is lower than', 'is less than', 'is smaller than', 'is weaker than'].freeze
+    LTE_KEYWORDS = ['is as low as', 'is as little as', 'is as small as', 'is as weak as'].freeze
     COMPARISON_KEYWORDS = EQUALITY_KEYWORDS + INEQUALITY_KEYWORDS + GT_KEYWORDS + GTE_KEYWORDS + LT_KEYWORDS + LTE_KEYWORDS
 
     FUNCTION_RESTRICTED_KEYWORDS = MATH_OP_KEYWORDS + ['(?<!, )and', 'is', 'or', 'into', 'nor']
 
-    AND_KEYWORDS = %w(and)
-    OR_KEYWORDS = %w(or)
-    NOR_KEYWORDS = %w(nor)
-    NOT_KEYWORDS = ['(?<!is )not']
+    AND_KEYWORDS = ['(?<!, )and'].freeze
+    OR_KEYWORDS = %w[or].freeze
+    NOR_KEYWORDS = %w[nor].freeze
+    NOT_KEYWORDS = ['(?<!is )not'].freeze
     LOGIC_KEYWORDS = AND_KEYWORDS + OR_KEYWORDS + NOT_KEYWORDS + NOR_KEYWORDS
 
     RESERVED_KEYWORDS = LOGIC_KEYWORDS + MATH_OP_KEYWORDS + POETIC_TYPE_LITERALS
 
     def initialize(input)
       @raw_input = input
-      @lines = input.split /\n/
+      @lines = input.gsub(/\(\n.*?\)/m, "\n").split(/\n/) # eat multiline comments
     end
 
     def parse
@@ -73,7 +80,8 @@ module KaiserRuby
       @tree.extend(Hashie::Extensions::DeepLocate)
       @function_temp = []
       @nesting = 0
-      @nesting_start_line = 0
+      @nesting_has_else = false
+      @current_scope = [nil]
       @lnum = 0
 
       # parse through lines to get the general structure (statements/flow control/functions/etc) out of it
@@ -94,14 +102,18 @@ module KaiserRuby
     end
 
     def parse_line(line)
-      line = line.strip
+      # consume comments and extra spaces
+      line = line.gsub(/\(.*?\)/, '').strip
 
       if line.empty?
-        if @nesting > 0
+        if @nesting.positive?
+          @current_scope.pop unless @current_scope[@nesting].nil?
+          @nesting_has_else = false
           @nesting -= 1
-          @nesting_start_line = nil
         end
 
+        @current_scope.pop if @nesting.zero?
+
         add_to_tree(parse_empty_line)
       else
         obj = parse_line_content(line)
@@ -111,14 +123,18 @@ module KaiserRuby
     end
 
     def update_nesting(object)
-      if %i(if function until while).include? object.keys.first
+      if %i[if function until while].include? object.keys.first
         @nesting += 1
-        @nesting_start_line = @lnum
+        @nesting_has_else = false
+      end
+
+      if object.keys.first == :function
+        @current_scope.push object.deep_locate(:function_name).first.dig(:function_name)
       end
     end
 
     def parse_line_content(line)
-      words = line.split /\s/
+      words = line.split(/\s/)
 
       if matches_first?(words, IF_KEYWORDS)
         return parse_if(line)
@@ -130,6 +146,8 @@ module KaiserRuby
         return parse_until(line)
       elsif matches_separate?(words, ASSIGNMENT_FIRST_KEYWORDS, ASSIGNMENT_SECOND_KEYWORDS)
         return parse_assignment(line)
+      elsif matches_separate?(words, LET_ASSIGNMENT_FIRST_KEYWORDS, LET_ASSIGNMENT_SECOND_KEYWORDS)
+        return parse_let_assignment(line)
       elsif matches_several_first?(line, RETURN_KEYWORDS)
         return parse_return(line)
       elsif matches_first?(words, PRINT_KEYWORDS)
@@ -146,21 +164,13 @@ module KaiserRuby
           return(parse_continue) if matches_several_first?(line, CONTINUE_KEYWORDS)
           return(parse_function_call(line)) if matches_any?(words, FUNCTION_CALL_KEYWORDS)
 
-          if matches_separate?(words, INCREMENT_FIRST_KEYWORDS, INCREMENT_SECOND_KEYWORDS)
-            return parse_increment(line)
-          end
-
-          if matches_separate?(words, DECREMENT_FIRST_KEYWORDS, DECREMENT_SECOND_KEYWORDS)
-            return parse_decrement(line)
-          end
-
-          if matches_any?(words, FUNCTION_KEYWORDS)
-            return(parse_function(line))
-          end
+          return parse_increment(line) if matches_separate?(words, INCREMENT_FIRST_KEYWORDS, INCREMENT_SECOND_KEYWORDS)
+          return parse_decrement(line) if matches_separate?(words, DECREMENT_FIRST_KEYWORDS, DECREMENT_SECOND_KEYWORDS)
+          return(parse_function(line)) if matches_any?(words, FUNCTION_KEYWORDS)
         end
       end
 
-      raise KaiserRuby::RockstarSyntaxError, "couldn't parse line: #{line}:#{@lnum+1}"
+      raise KaiserRuby::RockstarSyntaxError, "couldn't parse line: #{line}:#{@lnum + 1}"
     end
 
     # statements
@@ -176,6 +186,7 @@ module KaiserRuby
       words = line.split prepared_regexp(LISTEN_TO_KEYWORDS)
       arg = parse_variables(words.last.strip)
       arg[:type] = :assignment
+
       { listen_to: arg }
     end
 
@@ -187,6 +198,7 @@ module KaiserRuby
       words = line.split prepared_regexp(RETURN_KEYWORDS)
       arg = consume_function_calls(words.last.strip)
       argument = parse_argument(arg)
+
       { return: argument }
     end
 
@@ -194,8 +206,8 @@ module KaiserRuby
       match_rxp = prepared_capture(INCREMENT_FIRST_KEYWORDS, INCREMENT_SECOND_KEYWORDS)
       var = line.match(match_rxp).captures.first.strip
       capture = parse_variables(var)
-
       capture[:amount] = line.split(var).last.scan(/\bup\b/i).count
+
       { increment: capture }
     end
 
@@ -203,12 +215,20 @@ module KaiserRuby
       match_rxp = prepared_capture(DECREMENT_FIRST_KEYWORDS, DECREMENT_SECOND_KEYWORDS)
       var = line.match(match_rxp).captures.first.strip
       capture = parse_variables(var)
-
       capture[:amount] = line.split(var).last.scan(/\bdown\b/i).count
+
       { decrement: capture }
     end
 
     def parse_else
+      if @nesting_has_else
+        @nesting -= 1
+        @nesting_has_else = false
+        add_to_tree parse_empty_line
+      else
+        @nesting_has_else = true
+      end
+
       { else: nil }
     end
 
@@ -247,15 +267,14 @@ module KaiserRuby
     end
 
     def parse_function_call(line)
-      words = line.split /\s/
-      if matches_any?(words, FUNCTION_CALL_KEYWORDS)
-        words = line.split prepared_regexp(FUNCTION_CALL_KEYWORDS)
-        left = parse_function_name(words.first.strip)
-        right = parse_function_call_arguments(words.last.strip)
-        { function_call: { left: left, right: right } }
-      else
-        return false
-      end
+      words = line.split(/\s/)
+      return false unless matches_any?(words, FUNCTION_CALL_KEYWORDS)
+
+      words = line.split prepared_regexp(FUNCTION_CALL_KEYWORDS)
+      left = parse_function_name(words.first.strip)
+      right = parse_function_call_arguments(words.last.strip)
+
+      { function_call: { left: left, right: right } }
     end
 
     def parse_poetic_string(line)
@@ -263,6 +282,7 @@ module KaiserRuby
       left = parse_variables(words.first.strip)
       right = { string: "\"#{words.last.strip}\"" }
       left[:type] = :assignment
+
       { poetic_string: { left: left, right: right } }
     end
 
@@ -271,23 +291,28 @@ module KaiserRuby
       left = parse_variables(words.first.strip)
       right = parse_type_value(words.last.strip)
       left[:type] = :assignment
+
       { poetic_type: { left: left, right: right } }
     end
 
     def parse_type_value(string)
-      words = string.split /\s/
+      words = string.split(/\s/)
 
-      if matches_first?(words, NIL_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
-        { type: 'nil' }
+      if matches_first?(words, MYSTERIOUS_TYPE)
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum + 1}" if words.count > 1
+
+        { type: 'mysterious' }
       elsif matches_first?(words, NULL_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum + 1}" if words.count > 1
+
         { type: 'null' }
       elsif matches_first?(words, TRUE_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum + 1}" if words.count > 1
+
         { type: 'true' }
       elsif matches_first?(words, FALSE_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum + 1}" if words.count > 1
+
         { type: 'false' }
       elsif string.strip.start_with?('"') && string.strip.end_with?('"')
         parse_literal_string(string)
@@ -297,11 +322,11 @@ module KaiserRuby
     end
 
     def parse_type_literal(string)
-      words = string.split /\s/
-      raise SyntaxError, "too many words in poetic type literal: #{string}:#{@lnum+1}" if words.size > 1
+      words = string.split(/\s/)
+      raise SyntaxError, "too many words in poetic type literal: #{string}:#{@lnum + 1}" if words.size > 1
 
-      if matches_first?(words, NIL_TYPE)
-        { type: 'nil' }
+      if matches_first?(words, MYSTERIOUS_TYPE)
+        { type: 'mysterious' }
       elsif matches_first?(words, NULL_TYPE)
         { type: 'null' }
       elsif matches_first?(words, TRUE_TYPE)
@@ -309,7 +334,7 @@ module KaiserRuby
       elsif matches_first?(words, FALSE_TYPE)
         { type: 'false' }
       else
-        raise SyntaxError, "unknown poetic type literal: #{string}:#{@lnum+1}"
+        raise SyntaxError, "unknown poetic type literal: #{string}:#{@lnum + 1}"
       end
     end
 
@@ -318,14 +343,33 @@ module KaiserRuby
       right = parse_argument(line.match(match_rxp).captures.first.strip)
       left = parse_variables(line.match(match_rxp).captures.last.strip)
       left[:type] = :assignment
+
+      { assignment: { left: left, right: right } }
+    end
+
+    def parse_let_assignment(line)
+      match_rxp = prepared_capture(LET_ASSIGNMENT_FIRST_KEYWORDS, LET_ASSIGNMENT_SECOND_KEYWORDS)
+      right = parse_argument(line.match(match_rxp).captures.last.strip)
+      left = parse_variables(line.match(match_rxp).captures.first.strip)
+      left[:type] = :assignment
+
+      # if the right is an expression and its variable name is empty
+      # then it's a compound assignment which we translate back to an explicit one
+      right.extend(Hashie::Extensions::DeepLocate)
+      unless right.deep_locate(:variable_name).empty?
+        if right.deep_locate(:variable_name).first[:variable_name].empty?
+          right.deep_locate(:variable_name).first[:variable_name] = left[:variable_name]
+        end
+      end
+
       { assignment: { left: left, right: right } }
     end
 
     def parse_if(line)
       words = line.split prepared_regexp(IF_KEYWORDS)
-
       arg = consume_function_calls(words.last.strip)
       argument = parse_argument(arg)
+
       { if: { argument: argument } }
     end
 
@@ -333,6 +377,7 @@ module KaiserRuby
       words = line.split prepared_regexp(UNTIL_KEYWORDS)
       arg = consume_function_calls(words.last.strip)
       argument = parse_argument(arg)
+
       { until: { argument: argument } }
     end
 
@@ -340,6 +385,7 @@ module KaiserRuby
       words = line.split prepared_regexp(WHILE_KEYWORDS)
       arg = consume_function_calls(words.last.strip)
       argument = parse_argument(arg)
+
       { while: { argument: argument } }
     end
 
@@ -347,13 +393,14 @@ module KaiserRuby
       words = line.split prepared_regexp(FUNCTION_KEYWORDS)
       funcname = parse_function_name(words.first.strip)
       argument = parse_function_definition_arguments(words.last.strip)
+
       { function: { name: funcname, argument: argument } }
     end
 
     def consume_function_calls(string)
       if string =~ prepared_regexp(FUNCTION_CALL_KEYWORDS)
         words = string.split prepared_regexp(FUNCTION_RESTRICTED_KEYWORDS)
-        found_string = words.select { |w| w =~ (/\btaking\b/) }.first
+        found_string = words.select { |w| w =~ /\btaking\b/ }.first
         @function_temp << found_string
         string = string.gsub(found_string, " func_#{@function_temp.count - 1} ")
       end
@@ -362,11 +409,9 @@ module KaiserRuby
     end
 
     def pass_function_calls(string)
-      if string.strip =~ /func_\d+\Z/
-        { passed_function_call: string }
-      else
-        return false
-      end
+      return false unless string.strip =~ /func_\d+\Z/
+
+      { passed_function_call: string }
     end
 
     def parse_argument(string)
@@ -411,11 +456,9 @@ module KaiserRuby
 
     def parse_poetic_number_value(string)
       num = parse_literal_number(string)
-      if num
-        return num
-      else
-        return { number_literal: string.strip }
-      end
+      return num if num
+
+      { number_literal: string.strip }
     end
 
     def parse_logic_operation(string)
@@ -430,7 +473,7 @@ module KaiserRuby
         return parse_nor(string)
       end
 
-      return false
+      false
     end
 
     def parse_and(string)
@@ -461,6 +504,7 @@ module KaiserRuby
 
     def parse_not(string)
       return false if string !~ /(?<!is )\bnot\b/i
+
       words = string.split prepared_regexp(NOT_KEYWORDS)
       argument = parse_argument(words.last.strip)
 
@@ -469,7 +513,6 @@ module KaiserRuby
 
     def parse_comparison(string)
       return false if string.strip.start_with?('"') && string.strip.strip.end_with?('"') && string.count('"') == 2
-      words = string.split(/\s/)
 
       if string =~ prepared_regexp(GT_KEYWORDS)
         return parse_gt(string)
@@ -485,7 +528,7 @@ module KaiserRuby
         return parse_equality(string)
       end
 
-      return false
+      false
     end
 
     def parse_equality(string)
@@ -537,7 +580,7 @@ module KaiserRuby
     end
 
     def parse_variables(string)
-      words = string.split /\s/
+      words = string.split(/\s/)
       words = words.map { |e| e.chars.select { |c| c =~ /[[:alnum:]]|\./ }.join }
       string = words.join(' ')
 
@@ -547,9 +590,11 @@ module KaiserRuby
         return parse_common_variable(string)
       elsif matches_all?(words, /\A[[:upper:]]/) && string !~ prepared_regexp(RESERVED_KEYWORDS)
         return parse_proper_variable(string)
+      elsif words.count == 1 && string !~ prepared_regexp(RESERVED_KEYWORDS)
+        return prase_simple_variable(string)
       end
 
-      return false
+      false
     end
 
     def parse_function_name(string)
@@ -561,14 +606,8 @@ module KaiserRuby
     def parse_common_variable(string)
       words = string.split(/\s/)
 
-      copied = words.dup
-      copied.shift
-      copied.each do |w|
-        raise SyntaxError, "invalid common variable name: #{string}:#{@lnum+1}" if w =~ /[[:upper:]]/
-      end
-
       words = words.map { |e| e.chars.select { |c| c =~ /[[:alpha:]]/ }.join }
-      { variable_name: words.map { |w| w.downcase }.join('_') }
+      { variable_name: words.map(&:downcase).join('_') }
     end
 
     def parse_proper_variable(string)
@@ -577,19 +616,24 @@ module KaiserRuby
       copied = words.dup
       copied.shift
       copied.each do |w|
-        raise SyntaxError, "invalid proper variable name: #{string}:#{@lnum+1}" unless w =~ /\A[[:upper:]]/
+        raise SyntaxError, "invalid proper variable name: #{string}:#{@lnum + 1}" unless w =~ /\A[[:upper:]]/
       end
 
       words = words.map { |e| e.chars.select { |c| c =~ /[[:alpha:]]/ }.join }
-      { variable_name: words.map { |w| w.downcase }.join('_') }
+      { variable_name: words.map(&:downcase).join('_') }
     end
 
     def parse_pronoun
       { pronoun: nil }
     end
 
+    def prase_simple_variable(string)
+      { variable_name: string }
+    end
+
     def parse_math_operations(string)
       return false if string.strip.start_with?('"') && string.strip.end_with?('"') && string.count('"') == 2
+
       words = string.split(/\s/)
 
       if matches_any?(words, MULTIPLICATION_KEYWORDS)
@@ -602,7 +646,7 @@ module KaiserRuby
         return parse_subtraction(string)
       end
 
-      return false
+      false
     end
 
     def parse_addition(string)
@@ -638,42 +682,37 @@ module KaiserRuby
     end
 
     def parse_literal_string(string)
-      if string.strip.start_with?('"') && string.strip.end_with?('"') && string.count('"') == 2
-        { string: string }
-      else
-        return false
-      end
+      return false unless string.strip.start_with?('"') && string.strip.end_with?('"') && string.count('"') == 2
+
+      { string: string }
     end
 
     def parse_literal_number(string)
       num = Float(string) rescue string
-      if num.is_a?(Float)
-        { number: num }
-      else
-        return false
-      end
+      return false unless num.is_a?(Float)
+
+      { number: num }
     end
 
-    #private
+    # private
 
     def add_to_tree(object)
       object.extend(Hashie::Extensions::DeepLocate)
 
-      if @nesting > 0
-        object[:nesting_start_line] = @nesting_start_line
-        object[:nesting] = @nesting
-      end
+      object[:current_scope] = @current_scope.last
+      object[:nesting] = @nesting
+
       @tree << object
     end
 
     def prepared_regexp(array)
-      rxp = array.map { |a| '\b' + a + '\b' }.join('|')
+      rxp = array.map { |a| tokenize_word(a) }.join('|')
       Regexp.new(rxp, Regexp::IGNORECASE)
     end
 
     def prepared_capture(farr, sarr)
-      frxp = farr.map { |a| '\b' + a + '\b' }.join('|')
-      srxp = sarr.map { |a| '\b' + a + '\b' }.join('|')
+      frxp = farr.map { |a| tokenize_word(a) }.join('|')
+      srxp = sarr.map { |a| tokenize_word(a) }.join('|')
       Regexp.new(frxp + '(.*?)' + srxp + '(.*)', Regexp::IGNORECASE)
     end
 
@@ -691,22 +730,28 @@ module KaiserRuby
       first_idx = words.index { |w| w =~ prepared_regexp(first_rxp) }
       second_idx = words.index { |w| w =~ prepared_regexp(second_rxp) }
 
-      second_idx != nil && first_idx != nil && second_idx.to_i - first_idx.to_i == 1
+      !second_idx.nil? && !first_idx.nil? && second_idx.to_i - first_idx.to_i == 1
     end
 
     def matches_first?(words, rxp)
-      words.index { |w| w =~ prepared_regexp(rxp) } == 0
+      words.index { |w| w =~ prepared_regexp(rxp) }&.zero?
     end
 
     def matches_several_first?(line, rxp)
-      (line =~ prepared_regexp(rxp)) == 0
+      (line =~ prepared_regexp(rxp))&.zero?
     end
 
     def matches_separate?(words, first_rxp, second_rxp)
       first_idx = words.index { |w| w =~ prepared_regexp(first_rxp) }
       second_idx = words.index { |w| w =~ prepared_regexp(second_rxp) }
 
-      second_idx != nil && first_idx != nil && second_idx.to_i > first_idx.to_i
+      !second_idx.nil? && !first_idx.nil? && second_idx.to_i > first_idx.to_i
+    end
+
+    def tokenize_word(word)
+      return '\B' + Regexp.escape(word) + '\B' if MATH_TOKENS.include?(word) # apparently ' + ' is not a word so word boundaries don't work
+
+      '\b' + word + '\b'
     end
   end
-end
+end