kaiser-ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49970a2460c4b355e49a2dd465dae3035c135caa619d11b43b7b47b09166676
-  data.tar.gz: cde51c100d01c71158aa70b10af6e91400cd53322165b2a34c2d85db994a1aab
+  metadata.gz: 692fa0cdec0bb22e125901704ddffd9bfb54d2d761779cec880f706b1ac1bfef
+  data.tar.gz: b48529cffefaa98132df6e0a3d9313df0e2b68c07b83c2b663b64a36993b237a
 SHA512:
-  metadata.gz: b2a0a4d21511e943449860b4058be59f186937447c7accd22fc44d8487792392baee54d33f76f6248c27478d82ef5d1702e352826d5066677f04c89cd795ce2f
-  data.tar.gz: 9f7aa127cd0a2aa13c9ba523073ea96d01aaa6ebcc104a7c1974bd8387dcba176dfa6bb1089b846f2d753693b19ed5fdd7f4bb302769dc389bbfa51034da21a8
+  metadata.gz: 1f3e3feae95830d93246828d6c1ef5783d544d57afb3bafaea168d18238469fda7972863804a65658e906d2c2934f98d251499a76c4e8dae328a0ab8c0bfba5e
+  data.tar.gz: 2aa9ba2f4f5d29aef2230797b0118e0199d4b9c03e7fcba52b123bf0b5c82e7d412ddcee71691f3e086a3526a17872c1cf82b89366f0335ae1f0299ff1ecaf37

data/CHANGELOG.md

@@ -30,3 +30,20 @@ Other stuff:
 - [x] FizzBuzz example is working
 - [x] Fibonacci example is working
 - [x] Added comments to resulting ruby code flow control statements, so it's easier to see where what ends. This should help making the code more readable (and easier to figure out if it's actually correct), at least while the indentation feature is not fully working yet.
+
+# 0.4
+
+Language Implementation:
+
+- [x] Handle non-alpha values in quoted strings
+- [x] Ignore comments in parentheses
+- [x] Handle input from STDIN
+- [x] Handle contractions - "Janie's got a gun" should be expanded to "Janie is got a gun" and so it should transpile to "janie = 313"
+- [x] Handle pronouns - he, she, it, and others should refer to the last used variable
+
+Other stuff:
+
+- [x] Updated the FizzBuzz example
+- [x] Catch exceptions in the REPL
+- [x] Suppressed warning about eval from Thor
+- [x] Move nesting indentation from main module to transformer

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kaiser-ruby (0.3.0)
+    kaiser-ruby (0.4.0)
       parslet (~> 1.8)
       thor (~> 0.20)
 
@@ -42,4 +42,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/README.md

@@ -8,7 +8,9 @@ This is still a work in progress, however most of the language implementation is
 
 Install the gem by issuing the following command.
 
-    $ gem install kaiser-ruby
+```
+$ gem install kaiser-ruby
+```
 
 ## Usage
 
@@ -16,7 +18,9 @@ The most common usage of this gem is to transpile (or transpile and run immediat
 
 This gem provides a commandline tool for you to use:
 
-    $ kaiser-ruby
+```
+$ kaiser-ruby
+```
 
 There are a few ways you can use it. First one will just output the result of the transpilation.
 
@@ -29,8 +33,6 @@ puts tommy
 
 The `--show-source` flag will output the Rockstar code along with the resulting Ruby code like this:
 
-This will have a following output:
-
 ```
 $ kaiser-ruby transpile ./examples/assignment.rock --show-source
 Tommy is a rebel

data/TODO.md

@@ -2,27 +2,22 @@
 
 ## Language Implementation
 
-- [ ] Handle pronouns - he, she, it, and others should refer to the last used variable
-- [ ] Handle "Janie's got a gun"
-- [ ] Ignore comments in parentheses
-- [ ] Handle object type
-- [ ] Handle input from STDIN
 - [ ] Function calls can be used as expressions in flow statements
 - [ ] Handle ',' instead of 'and' in function calls
+
 - [ ] Somehow handle function variable scope
+- [ ] Handle object type
 
 ## Examples
 
 - [ ] Should be able to run the [Cellular Rockomata](https://github.com/Rifhutch/cellular-rocktomata)
-- [ ] Fibonacci example https://github.com/dylanbeattie/rockstar/issues/94#issuecomment-408217504
 - [ ] Math module https://gist.github.com/wrenoud/6be6f7509c88a3d8f9867ae782fb768f
 - [ ] Primality checker https://www.reddit.com/r/RockstarDevs/comments/92i6sm/primality_checker_in_rockstar/
 - [ ] Make a demo command in the CLI that runs all examples (would that even work as a gem? it should be doable somehow)
 
 ## Other stuff
 
-- [ ] Fix indenting of nested blocks that doesn't really work well
+- [ ] Fix indenting of nested blocks that doesn't really work well (this should also help deeper nesting)
 - [ ] Add code history to the REPL
 - [ ] Make REPL work with multiline input also, not only singular lines
-- [ ] Better error handling
-- [ ] Suppress warnign about eval from Thor
+- [ ] Make a demo visitor that evals the code and waits a bit between commands, so it's more music video-ish. Maybe should change the console colors while at it?

data/lib/kaiser_ruby.rb

@@ -3,26 +3,18 @@ require 'kaiser_ruby/rockstar_parser'
 require 'kaiser_ruby/rockstar_transform'
 
 module KaiserRuby
-  def self.up_indent
-    @@indent ||= 0
-    @@indent += 2
-  end
-
-  def self.down_indent
-    @@indent ||= 0
-    @@indent -= 2
-  end
+  def self.parse(input)
+    # eat comments since we don't care about them
+    input = input.gsub(/\(.*?\)/, '')
 
-  def self.indent
-    @@indent ||= 0
-  end
+    # expand contractions
+    input = input.gsub(/'s\W+/, ' is ')
 
-  def self.parse(input)
     # strings without a line ending (or single lines) should be fed into the alternative parser
     if input.split("\n").size == 1
-      KaiserRuby::RockstarSingleLineParser.new.parse(input.chomp)
+      KaiserRuby::RockstarSingleLineParser.new.parse(input.chomp, reporter: Parslet::ErrorReporter::Deepest.new)
     else
-      KaiserRuby::RockstarParser.new.parse(input)
+      KaiserRuby::RockstarParser.new.parse(input, reporter: Parslet::ErrorReporter::Deepest.new)
     end
   rescue Parslet::ParseFailed => failure
     puts input.inspect
@@ -36,4 +28,4 @@ module KaiserRuby
   def self.transpile(input)
     transform(parse(input))
   end
-end
+end

data/lib/kaiser_ruby/cli.rb

@@ -30,7 +30,7 @@ module KaiserRuby
       file = File.read filename
       output = KaiserRuby.transpile(file)
 
-      eval output
+      instance_eval output
       say
     end
 
@@ -43,16 +43,18 @@ module KaiserRuby
       # this makes it not lose local variables throughout the loop
       b = binding
 
-      begin
+      loop do
         input = ask('\m/>')
-        if input != 'exit'
-          code = KaiserRuby.transpile(input)
-          say "\\m/> #{code}", :blue if options[:debug]
-          output = b.eval(code)
-          output = 'nil' if output.nil?
-          say "  => #{output}\n"
-        end
-      end until input == 'exit'
+        break if input == 'exit'
+
+        code = KaiserRuby.transpile(input)
+        say "\\m/> #{code}", :blue if options[:debug]
+        output = b.eval(code)
+        output = 'nil' if output.nil?
+        say "  => #{output}\n"
+      rescue
+        say "THE STAGE IS ON FIRE!"
+      end
     end
   end
-end
+end

data/lib/kaiser_ruby/rockstar_parser.rb

@@ -28,7 +28,9 @@ module KaiserRuby
     rule(:assignment_keywords) { str('Put') | str('into') }
     rule(:poetic_string_keywords) { str('says') }
     rule(:comparison_keywords) { str("is") | not_keywords | gt_keywords | gte_keywords | lt_keywords | lte_keywords }
-    rule(:function_keywords) { str('Break it down') | str('Take it to the top') | str('Give back') | str('takes') | str('taking') }
+    rule(:function_keywords) { str('Break it down') | str('Take it to the top') | str('Give back') | str('takes') | str('taking') | str('Listen to') }
+
+    rule(:pronouns) { (str('he') | str('she') | str('it') | str('they') | str('them') | str('her') | str('him') | str('its')).as(:pronoun) }
 
     # variable names
     # using [[:upper:]] etc here allows for metal umlauts and other UTF characters
@@ -48,7 +50,7 @@ module KaiserRuby
     end
 
     rule(:variable_names) do
-      (common_variable_name | proper_variable_name).as(:variable_name)
+      (pronouns | common_variable_name | proper_variable_name).as(:variable_name)
     end
 
     # all the different value types (except Object for now)
@@ -57,7 +59,7 @@ module KaiserRuby
     rule(:null_value) { null_value_keywords.as(:null_value) }
     rule(:true_value) { true_value_keywords.as(:true_value) }
     rule(:false_value) { false_value_keywords.as(:false_value) }
-    rule(:string_value) { (str('"') >> match['[[:alpha:]] '].repeat >> str('"')).as(:string_value) }
+    rule(:string_value) { (str('"') >> match['^"'].repeat >> str('"')).as(:string_value) }
     rule(:numeric_value) { match['0-9\.'].repeat.as(:numeric_value) }
     rule(:unquoted_string) { match['^\n'].repeat.as(:unquoted_string) }
     rule(:string_as_number) { reserved.absent? >> match['^\n'].repeat.as(:string_as_number) }
@@ -176,74 +178,79 @@ module KaiserRuby
       str('Give back ') >> (math_operations | value_or_variable).as(:return_value)
     end
 
+    rule(:input) do
+      str('Listen to ') >> variable_names.as(:input_variable)
+    end
+
     # comparisons
 
+    rule(:gte_keywords) { str(' is as ') >> (str('high') | str('great') | str('big') | str('strong')) >> str(' as ') }
+    rule(:gte) do
+      (
+        value_or_variable.as(:left) >> gte_keywords >> (math_operations | value_or_variable).as(:right)
+      ).as(:gte)
+    end
+
+    rule(:lte_keywords) { str(' is as ') >> (str('low') | str('little') | str('small') | str('weak')) >> str(' as ') }
+    rule(:lte) do
+      (
+        value_or_variable.as(:left) >> lte_keywords >> (math_operations | value_or_variable).as(:right)
+      ).as(:lte)
+    end
+
     rule(:equality) do
       (
-        value_or_variable.as(:left) >> str(' is ') >> value_or_variable.as(:right)
+        value_or_variable.as(:left) >> str(' is ') >> (math_operations | value_or_variable).as(:right)
       ).as(:equals)
     end
 
     rule(:not_keywords) { str(' is not ') | str(" ain't ")}
     rule(:inequality) do
       (
-        value_or_variable.as(:left) >> not_keywords >> value_or_variable.as(:right)
+        value_or_variable.as(:left) >> not_keywords >> (math_operations | value_or_variable).as(:right)
       ).as(:not_equals)
     end
 
     rule(:gt_keywords) { str(' is ') >> (str('higher') | str('greater') | str('bigger') | str('stronger')) >> str(' than ') }
     rule(:gt) do
       (
-        value_or_variable.as(:left) >> gt_keywords >> value_or_variable.as(:right)
+        value_or_variable.as(:left) >> gt_keywords >> (math_operations | value_or_variable).as(:right)
       ).as(:gt)
     end
 
     rule(:lt_keywords) { str(' is ') >> (str('lower') | str('less') | str('smaller') | str('weaker')) >> str(' than ') }
     rule(:lt) do
       (
-        value_or_variable.as(:left) >> lt_keywords >> value_or_variable.as(:right)
+        value_or_variable.as(:left) >> lt_keywords >> (math_operations | value_or_variable).as(:right)
       ).as(:lt)
     end
 
-    rule(:gte_keywords) { str(' is as ') >> (str('high') | str('great') | str('big') | str('strong')) >> str(' as ') }
-    rule(:gte) do
-      (
-        value_or_variable.as(:left) >> gte_keywords >> value_or_variable.as(:right)
-      ).as(:gte)
-    end
 
-    rule(:lte_keywords) { str(' is as ') >> (str('low') | str('little') | str('small') | str('weak')) >> str(' as ') }
-    rule(:lte) do
-      (
-        value_or_variable.as(:left) >> lte_keywords >> value_or_variable.as(:right)
-      ).as(:lte)
-    end
 
     # flow control - if, else, while, until
 
-    rule(:if_block) do
+    rule(:if_else_block) do
       (
         str('If ') >> comparisons.as(:if_condition) >>
           (space >> (str('and') | str('or')).as(:and_or) >> space >> comparisons.as(:second_condition)).maybe >> eol >>
           scope {
             inner_block_line.repeat.as(:if_block)
+          } >>
+        str('Else') >> eol >>
+          scope {
+            inner_block_line.repeat.as(:else_block)
           } >> (eol | eof).as(:endif)
-      ).as(:if)
+      ).as(:if_else)
     end
 
-    rule(:if_else_block) do
+    rule(:if_block) do
       (
         str('If ') >> comparisons.as(:if_condition) >>
           (space >> (str('and') | str('or')).as(:and_or) >> space >> comparisons.as(:second_condition)).maybe >> eol >>
           scope {
             inner_block_line.repeat.as(:if_block)
-          } >>
-        str('Else') >> eol >>
-          scope {
-            inner_block_line.repeat.as(:else_block) >>
-            (eol | eof).as(:endif)
-          }
-      ).as(:if_else)
+          } >> (eol | eof).as(:endif)
+      ).as(:if)
     end
 
     rule(:while_block) do
@@ -251,9 +258,8 @@ module KaiserRuby
         str('While ') >> comparisons.as(:while_condition) >>
           (space >> (str('and') | str('or')).as(:and_or) >> space >> comparisons.as(:second_condition)).maybe >> eol >>
           scope {
-            inner_block_line.repeat.as(:while_block) >>
-            (eol | eof).as(:endwhile)
-          }
+            inner_block_line.repeat.as(:while_block)
+          } >> (eol | eof).as(:endwhile)
       ).as(:while)
     end
 
@@ -277,7 +283,7 @@ module KaiserRuby
     rule(:comparisons) { gte | gt | lte | lt | inequality | equality }
     rule(:flow_control) { if_block | if_else_block | while_block | until_block }
     rule(:poetics) { poetic_type_literal | poetic_string_literal | poetic_number_literal }
-    rule(:functions) { function_call | function | print_function | break_function | continue_function | return_function }
+    rule(:functions) { function_call | function | print_function | break_function | continue_function | return_function | input }
     rule(:line_elements) { flow_control | poetics | expressions | functions | eol }
 
     # handle multiple lines in a file

data/lib/kaiser_ruby/rockstar_transform.rb

@@ -1,7 +1,28 @@
 require 'pry'
 module KaiserRuby
   class RockstarTransform < Parslet::Transform
-    rule(variable_name: simple(:str)) { |c| parameterize(c[:str]) }
+    @@last_variable = nil
+    @@indent = 0
+
+    class << self
+      def last_variable=(value)
+        @@last_variable = value
+      end
+
+      def up_indent
+        @@indent += 2
+      end
+
+      def down_indent
+        @@indent -= 2
+      end
+    end
+
+    rule(variable_name: simple(:str)) do |context|
+      self.last_variable = parameterize(context[:str])
+      parameterize(context[:str])
+    end
+    rule(pronoun: simple(:_)) { @@last_variable }
 
     rule(mysterious_value: simple(:_)) { 'nil' }
     rule(null_value: simple(:_)) { '0' }
@@ -10,13 +31,13 @@ module KaiserRuby
     rule(string_value: simple(:str)) { str }
     rule(numeric_value: simple(:num)) { num }
     rule(unquoted_string: simple(:str)) { "\"#{str}\"" }
-    rule(string_as_number: simple(:str)) do |c|
-      if c[:str].to_s.include?('.')
-        c[:str].to_s.gsub(/[^A-Za-z\s\.]/, '').split('.').map do |sub|
+    rule(string_as_number: simple(:str)) do |context|
+      if context[:str].to_s.include?('.')
+        context[:str].to_s.gsub(/[^A-Za-z\s\.]/, '').split('.').map do |sub|
           str_to_num(sub)
         end.join('.').to_f
       else
-        str_to_num(c[:str])
+        str_to_num(context[:str])
       end
     end
 
@@ -31,6 +52,7 @@ module KaiserRuby
     rule(print: { output: simple(:output) }) { "puts #{output}" }
     rule(continue: simple(:_)) { "next" }
     rule(break: simple(:_)) { "break" }
+    rule(input_variable: simple(:var)) { "print '> '\n#{var} = STDIN.gets.chomp" }
 
     rule(equals: { left: simple(:left), right: simple(:right) }) { "#{left} == #{right}" }
     rule(not_equals: { left: simple(:left), right: simple(:right) }) { "#{left} != #{right}" }
@@ -43,12 +65,12 @@ module KaiserRuby
       if_condition: simple(:if_condition),
       if_block: sequence(:if_block_lines),
       endif: simple(:_)
-    } ) do
-      output = "#{' ' * KaiserRuby.indent}if #{if_condition}\n"
-      KaiserRuby.up_indent
-      output += if_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endif"
+    } ) do |context|
+      output = "#{' ' * @@indent}if #{context[:if_condition]}\n"
+      self.up_indent
+      output += context[:if_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endif"
       output
     end
 
@@ -58,13 +80,13 @@ module KaiserRuby
       second_condition: simple(:second_condition),
       if_block: sequence(:if_block_lines),
       endif: simple(:_)
-    } ) do
-      proper_and_or = and_or == 'and' ? '&&' : '||'
-      output = "#{' ' * KaiserRuby.indent}if #{if_condition} #{proper_and_or} #{second_condition}\n"
-      KaiserRuby.up_indent
-      output += if_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endif"
+    } ) do |context|
+      proper_and_or = context[:and_or] == 'and' ? '&&' : '||'
+      output = "#{' ' * @@indent}if #{context[:if_condition]} #{proper_and_or} #{context[:second_condition]}\n"
+      self.up_indent
+      output += context[:if_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endif"
       output
     end
 
@@ -73,16 +95,16 @@ module KaiserRuby
       if_block: sequence(:if_block_lines),
       else_block: sequence(:else_block_lines),
       endif: simple(:_)
-    } ) do
-      output = "#{' ' * KaiserRuby.indent}if #{if_condition}\n"
-      KaiserRuby.up_indent
-      output += if_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}else\n"
-      KaiserRuby.up_indent
-      output += else_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endifelse"
+    } ) do |context|
+      output = "#{' ' * @@indent}if #{context[:if_condition]}\n"
+      self.up_indent
+      output += context[:if_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}else\n"
+      self.up_indent
+      output += context[:else_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endifelse"
       output
     end
 
@@ -93,17 +115,17 @@ module KaiserRuby
       if_block: sequence(:if_block_lines),
       else_block: sequence(:else_block_lines),
       endif: simple(:_)
-    } ) do
-      proper_and_or = and_or == 'and' ? '&&' : '||'
-      output = "#{' ' * KaiserRuby.indent}if #{if_condition} #{proper_and_or} #{second_condition}\n"
-      KaiserRuby.up_indent
-      output += if_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}else\n"
-      KaiserRuby.up_indent
-      output += else_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endifelse"
+    } ) do |context|
+      proper_and_or = context[:and_or] == 'and' ? '&&' : '||'
+      output = "#{' ' * @@indent}if #{context[:if_condition]} #{proper_and_or} #{context[:second_condition]}\n"
+      self.up_indent
+      output += context[:if_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}else\n"
+      self.up_indent
+      output += context[:else_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endifelse"
       output
     end
 
@@ -111,12 +133,12 @@ module KaiserRuby
       while_condition: simple(:while_condition),
       while_block: sequence(:while_block_lines),
       endwhile: simple(:_)
-    } ) do
-      output = "#{' ' * KaiserRuby.indent}while #{while_condition}\n"
-      KaiserRuby.up_indent
-      output += while_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endwhile"
+    } ) do |context|
+      output = "#{' ' * @@indent}while #{context[:while_condition]}\n"
+      self.up_indent
+      output += context[:while_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endwhile"
       output
     end
 
@@ -126,13 +148,13 @@ module KaiserRuby
       second_condition: simple(:second_condition),
       while_block: sequence(:while_block_lines),
       endwhile: simple(:_)
-    } ) do
-      proper_and_or = and_or == 'and' ? '&&' : '||'
-      output = "#{' ' * KaiserRuby.indent}while #{while_condition} #{proper_and_or} #{second_condition}\n"
-      KaiserRuby.up_indent
-      output += while_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # endwhile"
+    } ) do |context|
+      proper_and_or = context[:and_or] == 'and' ? '&&' : '||'
+      output = "#{' ' * @@indent}while #{context[:while_condition]} #{proper_and_or} #{context[:second_condition]}\n"
+      self.up_indent
+      output += context[:while_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # endwhile"
       output
     end
 
@@ -140,12 +162,12 @@ module KaiserRuby
       until_condition: simple(:until_condition),
       until_block: sequence(:until_block_lines),
       enduntil: simple(:_)
-    } ) do
-      output = "#{' ' * KaiserRuby.indent}until #{until_condition}\n"
-      KaiserRuby.up_indent
-      output += until_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # enduntil"
+    } ) do |context|
+      output = "#{' ' * @@indent}until #{context[:until_condition]}\n"
+      self.up_indent
+      output += context[:until_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # enduntil"
       output
     end
 
@@ -155,13 +177,13 @@ module KaiserRuby
       second_condition: simple(:second_condition),
       until_block: sequence(:until_block_lines),
       enduntil: simple(:_)
-    } ) do
-      proper_and_or = and_or == 'and' ? '&&' : '||'
-      output = "#{' ' * KaiserRuby.indent}until #{until_condition} #{proper_and_or} #{second_condition}\n"
-      KaiserRuby.up_indent
-      output += until_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # enduntil"
+    } ) do |context|
+      proper_and_or = context[:and_or] == 'and' ? '&&' : '||'
+      output = "#{' ' * @@indent}until #{context[:until_condition]} #{proper_and_or} #{context[:second_condition]}\n"
+      self.up_indent
+      output += context[:until_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # enduntil"
       output
     end
 
@@ -173,12 +195,12 @@ module KaiserRuby
       arguments: sequence(:arguments),
       function_block: sequence(:function_block_lines),
       enddef: simple(:_)
-    } ) do
-      output = "#{' ' * KaiserRuby.indent}def #{function_name}(#{arguments.join(', ')})\n"
-      KaiserRuby.up_indent
-      output += function_block_lines.map { |l| "#{' ' * KaiserRuby.indent}#{l}\n" }.join
-      KaiserRuby.down_indent
-      output += "#{' ' * KaiserRuby.indent}end # enddef"
+    } ) do |context|
+      output = "#{' ' * @@indent}def #{context[:function_name]}(#{context[:arguments].join(', ')})\n"
+      self.up_indent
+      output += context[:function_block_lines].map { |l| "#{' ' * @@indent}#{l}\n" }.join
+      self.down_indent
+      output += "#{' ' * @@indent}end # enddef"
       output
     end
 
@@ -200,4 +222,4 @@ module KaiserRuby
       string.to_s.split(/\s+/).map { |e| e.length % 10 }.join.to_i
     end
   end
-end
+end

data/lib/kaiser_ruby/version.rb

@@ -1,3 +1,3 @@
 module KaiserRuby
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaiser-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Marcin Ruszkiewicz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Transpiler of Rockstar language to Ruby