gobstones 0.0.2 → 0.0.3

data/lib/gobstones/parser/parse_error.rb

@@ -1,17 +1,12 @@
 module Gobstones
-
   module Parser
-
     class ParseError < StandardError
-
       attr_reader :parser, :code
 
       def initialize(parser, code)
-        @parser, @code = parser, code
+        @parser = parser
+        @code = code
       end
-
     end
-
   end
-
 end

data/lib/gobstones/parser/treetop_parser.rb

@@ -3,11 +3,8 @@ require 'gobstones/parser/ast/ast'
 require 'gobstones/parser/parse_error'
 
 module Gobstones
-
   module Parser
-
     class TreetopParser
-
       def initialize
         Treetop.load grammar_file
         @parser = GobstonesParser.new
@@ -15,8 +12,9 @@ module Gobstones
 
       def parse(code)
         code_without_comments = remove_comments_from(code)
-        result = @parser.parse code_without_comments
+        result = @parser.parse(code_without_comments)
         raise ParseError.new(self, code_without_comments) if result.nil?
+
         result.value
       end
 
@@ -33,21 +31,21 @@ module Gobstones
       end
 
       def remove_comments_from(code)
-        code
-          .gsub(single_line_c_style_comments_regex, '')
-          .gsub(single_line_haskell_style_comments_regex, '')
-          .gsub(multi_line_c_style_comments_regex, '')
-          .gsub(multi_line_haskell_style_comments_regex, '')
+        code.
+          gsub(single_line_c_style_comments_regex, '').
+          gsub(single_line_haskell_style_comments_regex, '').
+          gsub(multi_line_c_style_comments_regex, '').
+          gsub(multi_line_haskell_style_comments_regex, '')
       end
 
       private
 
       def grammar_file
-        File.join base_path, 'grammar/gobstones'
+        File.join(base_path, 'grammar/gobstones')
       end
 
       def base_path
-        File.expand_path File.dirname(__FILE__)
+        __dir__
       end
 
       def single_line_c_style_comments_regex
@@ -65,9 +63,6 @@ module Gobstones
       def multi_line_haskell_style_comments_regex
         /{-.*?\-}/m
       end
-
     end
-
   end
-
 end

data/lib/gobstones/runner/board.rb

@@ -1,32 +1,32 @@
 require 'gobstones/runner/cell'
 
 module Gobstones
-
   module Runner
-
     class Board
-
       attr_reader :rows, :columns
 
-      def initialize(r, c, matrix=[])
-        @rows, @columns = r, c
+      def initialize(rows_num, cols_num, matrix = [])
+        @rows = rows_num
+        @columns = cols_num
         if matrix.empty?
           @matrix = []
-          r.times { @matrix << []; c.times { @matrix.last << Cell.new } }
+          rows_num.times do
+            @matrix << []
+            cols_num.times { @matrix.last << Cell.new }
+          end
         else
           @matrix = matrix
         end
       end
 
       def cell_at(x, y)
-        raise OutOfBoardError unless \
-          x.between?(0, rows - 1) && y.between?(0, columns - 1)
+        raise OutOfBoardError unless x.between?(0, rows - 1) && y.between?(0, columns - 1)
 
         @matrix[x][y]
       end
 
       def each_cell
-        @matrix.each { |row| row.each { |cell| yield cell } }
+        @matrix.each { |row| row.each { |cell| yield(cell) } }
       end
 
       def put(x, y, color)
@@ -46,7 +46,7 @@ module Gobstones
       end
 
       def empty!
-        each_cell { |cell| cell.empty! }
+        each_cell(&:empty!)
       end
 
       def empty?
@@ -55,12 +55,9 @@ module Gobstones
       end
 
       def clone
-        new_matrix = @matrix.map { |row| row.map { |cell| cell.clone } }
-        self.class.new @rows, @columns, new_matrix
+        new_matrix = @matrix.map { |row| row.map(&:clone) }
+        self.class.new(rows, columns, new_matrix)
       end
-
     end
-
   end
-
 end

data/lib/gobstones/runner/cell.rb

@@ -1,32 +1,32 @@
-module Gobstones
+require 'gobstones/runner/errors/empty_cell_error'
 
+module Gobstones
   module Runner
-
     class Cell
-
       def initialize
-        @values = { Azul => 0, Negro => 0, Rojo => 0, Verde => 0 }
+        @values = Hash[Color.all.map { |color| [color, 0] }]
       end
 
       def put(color)
-        check color
+        check(color)
         lookup(color) { |value| value + 1 }
       end
 
       def take_out(color)
-        check color
+        check(color)
         raise EmptyCellError unless are_there_balls?(color)
+
         lookup(color) { |value| value - 1 }
       end
 
       def are_there_balls?(color)
-        check color
-        number_of_balls(color) > 0
+        check(color)
+        number_of_balls(color).positive?
       end
 
       def number_of_balls(color)
-        check color
-        lookup color
+        check(color)
+        lookup(color)
       end
 
       def empty!
@@ -34,15 +34,13 @@ module Gobstones
       end
 
       def empty?
-        @values.values.all? { |value| value.zero? }
+        @values.values.all?(&:zero?)
       end
 
       def clone
         self.class.new.tap do |copy|
-          [Azul.new, Negro.new, Rojo.new, Verde.new].each do |color|
-            number_of_balls(color).times do
-              copy.put color
-            end
+          Color.all.map(&:new).each do |color|
+            number_of_balls(color).times { copy.put(color) }
           end
         end
       end
@@ -50,8 +48,7 @@ module Gobstones
       private
 
       def check(color)
-        raise "'#{color}' is not a color" \
-        unless [Azul, Negro, Rojo, Verde].include? color.class
+        raise "'#{color}' is not a color" unless Color.all.include?(color.class)
       end
 
       def lookup(color)
@@ -62,9 +59,6 @@ module Gobstones
           @values[value]
         end
       end
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/all.rb

@@ -3,6 +3,6 @@ require 'gobstones/runner/errors/definition_not_found_error'
 require 'gobstones/runner/errors/empty_cell_error'
 require 'gobstones/runner/errors/gobstones_runtime_error'
 require 'gobstones/runner/errors/gobstones_type_error'
-require 'gobstones/runner/errors/undefined_variable_error'
 require 'gobstones/runner/errors/out_of_board_error'
+require 'gobstones/runner/errors/undefined_variable_error'
 require 'gobstones/runner/errors/wrong_arguments_error'

data/lib/gobstones/runner/errors/boom_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
     class BoomError < StandardError
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/definition_not_found_error.rb

@@ -1,19 +1,19 @@
 module Gobstones
-
   module Runner
-
     class DefinitionNotFound < StandardError
+      # TODO indicate if it is coming from a procedure or function
+
+      def initialize(definition_name)
+        @definition_name = definition_name
+      end
 
-      def self.new(definition_name)
-        super(message_for(definition_name))
+      def message
+        self.class.message_for(@definition_name)
       end
 
       def self.message_for(definition_name)
         "definition named '#{definition_name}' not found in program"
       end
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/empty_cell_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
     class EmptyCellError < StandardError
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/gobstones_runtime_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
     class GobstonesRuntimeError < StandardError
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/gobstones_type_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
-    class GobstonesTypeError < StandardError
-
-    end
-
+    # TODO instantiate with the statement in which this exception occurs
+    GobstonesTypeError = Class.new(StandardError)
   end
-
 end

data/lib/gobstones/runner/errors/out_of_board_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
     class OutOfBoardError < StandardError
-
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/undefined_variable_error.rb

@@ -1,11 +1,13 @@
 module Gobstones
-
   module Runner
-
     class UndefinedVariableError < StandardError
+      def self.for(variable_name)
+        new(undefined_variable_message_for(variable_name))
+      end
 
+      def self.undefined_variable_message_for(variable_name)
+        "Undefined variable: #{variable_name}"
+      end
     end
-
   end
-
 end

data/lib/gobstones/runner/errors/wrong_arguments_error.rb

@@ -1,11 +1,6 @@
 module Gobstones
-
   module Runner
-
     class WrongArgumentsError < StandardError
-
     end
-
   end
-
 end

data/lib/gobstones/runner/execution_context.rb

@@ -1,11 +1,10 @@
 require 'gobstones/runner/head'
+require 'gobstones/runner/errors/undefined_variable_error'
+require 'error_handling_protocol'
 
 module Gobstones
-
   module Runner
-
     class ExecutionContext
-
       def initialize
         @values = {}
       end
@@ -15,7 +14,7 @@ module Gobstones
       end
 
       def get(variable_name)
-        @values[variable_name] || undefined_variable_error
+        @values[variable_name] || undefined_variable_error(variable_name)
       end
 
       def clear(variable_name)
@@ -23,27 +22,25 @@ module Gobstones
       end
 
       def has_variable_named?(name)
-        @values.keys.any? { |variable| variable.named? name }
+        @values.keys.any? { |variable| variable.named?(name) }
       end
 
       def program_context
-        raise 'subclass responsibility'
+        subclass_responsibility
       end
 
       protected
 
-      def undefined_variable_error
-        raise UndefinedVariableError
+      def undefined_variable_error(variable_name)
+        raise UndefinedVariableError.for(variable_name)
       end
-
     end
 
     class ProgramExecutionContext < ExecutionContext
-
       attr_reader :head
 
       def self.for(program)
-        self.new program
+        new(program)
       end
 
       def initialize(program)
@@ -54,9 +51,8 @@ module Gobstones
 
       def definition_named(name, found_block, not_found_block)
         if_none = proc { return not_found_block.call }
-        found_definition = @program.definitions.detect(if_none) \
-          { |definition| definition.named? name }
-        found_block.call found_definition
+        found_definition = @program.definitions.detect(if_none) { |definition| definition.named?(name) }
+        found_block.call(found_definition)
       end
 
       def program_context
@@ -66,13 +62,11 @@ module Gobstones
       def board
         head.board
       end
-
     end
 
     class ProcedureExecutionContext < ExecutionContext
-
       def self.based_on(outer_context)
-        new outer_context
+        new(outer_context)
       end
 
       def initialize(outer_context)
@@ -87,15 +81,13 @@ module Gobstones
       def program_context
         @outer_context.program_context
       end
-
     end
 
     class FunctionExecutionContext < ExecutionContext
-
       attr_reader :head
 
       def self.based_on(outer_context)
-        new outer_context
+        new(outer_context)
       end
 
       def initialize(outer_context)
@@ -107,33 +99,24 @@ module Gobstones
       def program_context
         @outer_context.program_context
       end
-
     end
 
     class NullExecutionContext < ExecutionContext
-
-      def set(variable_name, value)
-
-      end
+      def set(variable_name, value); end
 
       def get(variable_name)
-        undefined_variable_error
+        undefined_variable_error(variable_name)
       end
 
-      def clear(variable_name)
-
-      end
+      def clear(variable_name); end
 
-      def has_variable_named?(variable_name)
+      def has_variable_named?(_variable_name)
         false
       end
 
       def program_context
         raise 'a null execution does not know its program context'
       end
-
     end
-
   end
-
 end