gobstones 0.0.2 → 0.0.3

data/lib/gobstones/cli/printer.rb

@@ -1,30 +1,46 @@
-require 'gobstones/lang/literals/colors'
+require 'gobstones/lang/literals/color'
 
 module Gobstones
-
   module CLI
-
     class Printer
-
       TEMPLATE = File.read(File.dirname(__FILE__) + '/board_template')
 
-      def initialize(context)
-        @context = context
+      def initialize(program_result)
+        @program_result = program_result
         @board = TEMPLATE
       end
 
       def print
         highlight_current_cell
         put_ball_values
+        print_return_values
+        print_board
+      end
+
+      def print_return_values
+        @program_result.return_values.each do |variable, value|
+          puts "#{variable.name} => #{value}"
+        end
+      end
+
+      def print_board
         puts @board
       end
 
       private
 
+      def head
+        @program_result.head
+      end
+
+      def board
+        head.board
+      end
+
       def highlight_current_cell
         char = 'X'
-        x = @context.head.x_pos
-        y = @context.head.y_pos
+        x = head.x_pos
+        y = head.y_pos
         highlight_row x, y, char
         highlight_row x, y - 1, char
         highlight_column x, y, char
@@ -34,38 +50,38 @@ module Gobstones
       def put_ball_values
         total_rows.times do |x|
           total_columns.times do |y|
-            put_ball_value @context.board.number_of_balls(x, y, Gobstones::Lang::Negro.new), 'N', x, y, 2, 1
-            put_ball_value @context.board.number_of_balls(x, y, Gobstones::Lang::Azul.new) , 'A', x, y, 6, 1
-            put_ball_value @context.board.number_of_balls(x, y, Gobstones::Lang::Verde.new), 'V', x, y, 2, 3
-            put_ball_value @context.board.number_of_balls(x, y, Gobstones::Lang::Rojo.new) , 'R', x, y, 6, 3
+            put_ball_value board.number_of_balls(x, y, Lang::Negro.new), 'N', x, y, 2, 1
+            put_ball_value board.number_of_balls(x, y, Lang::Azul.new), 'A', x, y, 6, 1
+            put_ball_value board.number_of_balls(x, y, Lang::Verde.new), 'V', x, y, 2, 3
+            put_ball_value board.number_of_balls(x, y, Lang::Rojo.new), 'R', x, y, 6, 3
           end
         end
       end
 
       def put_ball_value(number, char, x, y, x_offset, y_offset)
-        unless number.zero?
-          corner = cell_top_left_corner x, y
-          pos = corner + (y_offset * line_length) + x_offset
-          if number < 10
-            @board[pos] = ' '
-            @board[pos+1] = number.to_s
-          else
-            @board[pos] = number.to_s[0]
-            @board[pos+1] = number.to_s[1]
-          end
-          @board[pos+2] = char
+        return if number.zero?
+
+        corner = cell_top_left_corner(x, y)
+        pos = corner + (y_offset * line_length) + x_offset
+        if number < 10
+          @board[pos] = ' '
+          @board[pos + 1] = number.to_s
+        else
+          @board[pos] = number.to_s[0]
+          @board[pos + 1] = number.to_s[1]
         end
+        @board[pos + 2] = char
       end
 
       def highlight_row(x, y, char)
-        corner = cell_top_left_corner x, y
+        corner = cell_top_left_corner(x, y)
         (cell_width - 1).times do |index|
           @board[corner + index + 1] = char
         end
       end
 
       def highlight_column(x, y, char)
-        corner = cell_top_left_corner x, y
+        corner = cell_top_left_corner(x, y)
         (cell_height - 1).times do |index|
           @board[corner + ((index + 1) * line_length)] = char
         end
@@ -98,9 +114,6 @@ module Gobstones
       def total_rows
         9
       end
-
     end
-
   end
-
 end

data/lib/gobstones/cli/runner.rb

@@ -5,11 +5,8 @@ require 'gobstones/cli/printer'
 include Gobstones::Parser
 
 module Gobstones
-
   module CLI
-
     class Runner
-
       def self.run(file_name)
         new(File.read(file_name)).run
       end
@@ -21,19 +18,32 @@ module Gobstones
 
       def run
         print_program_result parse_program.evaluate
-      rescue Gobstones::Parser::ParseError => parse_error
-        handle_parse_error parse_error
-      rescue Gobstones::Runner::GobstonesTypeError => type_error
-        handle_type_error type_error
-      rescue Exception => e
-        # TODO handle more gobstones exceptions
+      rescue Gobstones::Parser::ParseError => e
+        handle_parse_error e
+      rescue Gobstones::Runner::GobstonesTypeError => e
+        handle_type_error e
+      rescue Gobstones::Runner::BoomError => e
+        handle_boom_error e
+      rescue Gobstones::Runner::UndefinedVariableError => e
+        handle_undefined_variable_error e
+      rescue Gobstones::Runner::EmptyCellError => e
+        handle_empty_cell_error e
+      rescue Gobstones::Runner::OutOfBoardError => e
+        handle_out_of_board_error e
+      rescue Gobstones::Runner::DefinitionNotFound => e
+        handle_definition_not_found_error e
+      rescue Gobstones::Runner::WrongArgumentsError => e
+        handle_wrong_arguments_error e
+      rescue Gobstones::Runner::GobstonesRuntimeError => e
+        handle_runtime_error e
+      rescue StandardError => e
         raise e
       end
 
       private
 
-      def print_program_result(context)
-        Printer.new(context).print
+      def print_program_result(result)
+        Printer.new(result).print
       end
 
       def parse_program
@@ -42,17 +52,42 @@ module Gobstones
 
       def handle_parse_error(parse_error)
         parse_error.parser.failure_reason =~ /^(Expected .+) after/m
-        puts "#{$1.gsub("\n", '$NEWLINE')}:"
+        puts "#{Regexp.last_match(1).gsub("\n", '$NEWLINE')}:"
         puts parse_error.code.lines.to_a[parse_error.parser.failure_line - 1]
         puts "#{'~' * (parse_error.parser.failure_column - 1)}^"
       end
 
       def handle_type_error(type_error)
-        puts "Type Error: #{type_error.message} occurred in #{type_error.statement}"
+        puts "Type Error: #{type_error.message}"
       end
 
-    end
+      def handle_boom_error(boom_error)
+        puts "BOOM!! #{boom_error.message}"
+      end
 
-  end
+      def handle_undefined_variable_error(undefined_variable_error)
+        puts undefined_variable_error.message
+      end
+
+      def handle_empty_cell_error(_empty_cell_error)
+        puts 'There are no balls to take out!'
+      end
 
+      def handle_out_of_board_error(_out_of_board_error)
+        puts 'You fell from the board!'
+      end
+
+      def handle_definition_not_found_error(definition_not_found_error)
+        puts definition_not_found_error.message
+      end
+
+      def handle_wrong_arguments_error(wrong_arguments_error)
+        puts wrong_arguments_error.message
+      end
+
+      def handle_runtime_error(runtime_error)
+        puts runtime_error.message
+      end
+    end
+  end
 end

data/lib/gobstones/extensions/all.rb

@@ -1,3 +1,3 @@
 require 'gobstones/extensions/boolean'
-require 'gobstones/extensions/fixnum'
+require 'gobstones/extensions/integer'
 require 'gobstones/extensions/string'

data/lib/gobstones/extensions/boolean.rb

@@ -1,17 +1,13 @@
-require 'gobstones/lang/literals/booleans'
+require 'gobstones/lang/literals/boolean'
 
 class TrueClass
-
   def to_gbs_bool
     Gobstones::Lang::True.new
   end
-
 end
 
 class FalseClass
-
   def to_gbs_bool
     Gobstones::Lang::False.new
   end
-
 end

data/lib/gobstones/extensions/{fixnum.rb → integer.rb}

@@ -1,9 +1,7 @@
 require 'gobstones/lang/literals/number'
 
-class Fixnum
-
+class Integer
   def to_gbs_num
-    Gobstones::Lang::Number.new self
+    Gobstones::Lang::Number.new(self)
   end
-
 end

data/lib/gobstones/extensions/string.rb

@@ -1,9 +1,7 @@
 require 'gobstones/lang/expressions/var_name'
 
 class String
-
   def to_var_name
-    Gobstones::Lang::VarName.new self
+    Gobstones::Lang::VarName.new(self)
   end
-
 end

data/lib/gobstones/lang/all.rb

@@ -1,5 +1,5 @@
-require 'gobstones/lang/literals/all'
-require 'gobstones/lang/expressions/all'
+require 'gobstones/lang/program'
 require 'gobstones/lang/commands/all'
 require 'gobstones/lang/definitions/all'
-require 'gobstones/lang/program'
+require 'gobstones/lang/expressions/all'
+require 'gobstones/lang/literals/all'

data/lib/gobstones/lang/commands/all.rb

@@ -1,14 +1,15 @@
-require 'gobstones/lang/commands/boom_cmd'
+require 'gobstones/lang/commands/boom'
 require 'gobstones/lang/commands/command_block'
-require 'gobstones/lang/commands/if_cmd'
-require 'gobstones/lang/commands/ir_al_origen_cmd'
-require 'gobstones/lang/commands/mover_cmd'
+require 'gobstones/lang/commands/if'
+require 'gobstones/lang/commands/if_then_else'
+require 'gobstones/lang/commands/ir_al_origen'
+require 'gobstones/lang/commands/mover'
 require 'gobstones/lang/commands/multiple_assignment'
-require 'gobstones/lang/commands/poner_cmd'
+require 'gobstones/lang/commands/poner'
 require 'gobstones/lang/commands/procedure_call'
-require 'gobstones/lang/commands/repeat_with_cmd'
-require 'gobstones/lang/commands/sacar_cmd'
+require 'gobstones/lang/commands/repeat_with'
+require 'gobstones/lang/commands/sacar'
 require 'gobstones/lang/commands/single_assignment'
-require 'gobstones/lang/commands/skip_cmd'
-require 'gobstones/lang/commands/vaciar_tablero_cmd'
-require 'gobstones/lang/commands/while_cmd'
+require 'gobstones/lang/commands/skip'
+require 'gobstones/lang/commands/vaciar_tablero'
+require 'gobstones/lang/commands/while'

data/lib/gobstones/lang/commands/boom.rb

@@ -0,0 +1,26 @@
+require 'gobstones/runner/errors/boom_error'
+require 'gobstones/modules/equality_definition'
+
+module Gobstones
+  module Lang
+    module Commands
+      class Boom
+        include EqualityDefinition
+
+        attr_reader :message
+
+        def initialize(message)
+          @message = message
+        end
+
+        def equality_attributes
+          %i[message]
+        end
+
+        def evaluate(_context)
+          raise Runner::BoomError, message
+        end
+      end
+    end
+  end
+end

data/lib/gobstones/lang/commands/command_block.rb

@@ -1,37 +1,37 @@
-require 'gobstones/modules/equal_by_class'
+require 'gobstones/modules/equality_definition'
 
 module Gobstones
-
   module Lang
+    module Commands
+      class CommandBlock
+        include EqualityDefinition
 
-    class CommandBlock
+        attr_reader :commands
 
-      include Gobstones::EqualByClass
+        def self.empty
+          new([])
+        end
 
-      attr_reader :commands
+        def self.with_just(a_command)
+          new([a_command])
+        end
 
-      def self.empty
-        self.new []
-      end
+        def initialize(commands)
+          @commands = commands
+        end
 
-      def initialize(commands)
-        @commands = commands
-      end
+        def equality_attributes
+          %i[commands]
+        end
 
-      def ==(other)
-        super(other) && self.commands == other.commands
-      end
+        def empty?
+          commands.empty?
+        end
 
-      def empty?
-        commands.empty?
+        def evaluate(context)
+          commands.each { |command| command.evaluate(context) }
+        end
       end
-
-      def evaluate(context)
-        commands.each { |command| command.evaluate context }
-      end
-
     end
-
   end
-
 end

data/lib/gobstones/lang/commands/conditional.rb

@@ -0,0 +1,26 @@
+require 'gobstones/modules/equality_definition'
+
+module Gobstones
+  module Lang
+    module Commands
+      class Conditional
+        include EqualityDefinition
+
+        attr_reader :condition, :then_block
+
+        def initialize(condition, then_block)
+          @condition = condition
+          @then_block = then_block
+        end
+
+        def equality_attributes
+          %i[condition then_block]
+        end
+
+        def evaluate_condition(context)
+          condition.evaluate(context)
+        end
+      end
+    end
+  end
+end

data/lib/gobstones/lang/commands/if.rb

@@ -0,0 +1,13 @@
+require 'gobstones/lang/commands/conditional'
+
+module Gobstones
+  module Lang
+    module Commands
+      class If < Conditional
+        def evaluate(context)
+          evaluate_condition(context).if_true(then_block, context)
+        end
+      end
+    end
+  end
+end

data/lib/gobstones/lang/commands/if_then_else.rb

@@ -0,0 +1,26 @@
+require 'gobstones/lang/commands/if'
+
+module Gobstones
+  module Lang
+    module Commands
+      class IfThenElse < If
+        attr_reader :else_block
+
+        def initialize(condition, then_block, else_block)
+          super(condition, then_block)
+          @else_block = else_block
+        end
+
+        def equality_attributes
+          super + [:else_block]
+        end
+
+        def evaluate(context)
+          evaluate_condition(context).
+            if_true(then_block, context).
+            if_false(else_block, context)
+        end
+      end
+    end
+  end
+end