gobstones 0.0.1.1 → 0.0.2

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

@@ -2,7 +2,7 @@ require 'gobstones/lang/expressions/arithmetic_expressions'
 require 'gobstones/lang/expressions/boolean_expressions'
 require 'gobstones/lang/expressions/comparison_expressions'
 require 'gobstones/lang/expressions/function_call'
-require 'gobstones/lang/expressions/parentheses_expression'
+require 'gobstones/lang/expressions/enclosed_by_parens_expression'
 require 'gobstones/lang/expressions/primitive_functions'
 require 'gobstones/lang/expressions/type_bound_functions'
 require 'gobstones/lang/expressions/var_name'

data/lib/gobstones/lang/expressions/arithmetic_expressions.rb

@@ -49,4 +49,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/lang/expressions/boolean_expressions.rb

@@ -1,4 +1,5 @@
 require 'gobstones/lang/expressions/one_arg_expression'
+require 'gobstones/lang/expressions/two_arg_expression'
 
 module Gobstones
 
@@ -6,8 +7,8 @@ module Gobstones
 
     class Not < OneArgExpression
 
-      def evaluate
-        arg.evaluate.not
+      def evaluate(context)
+        with_evaluated_argument_in(context) { |result| result.not }
       end
 
     end

data/lib/gobstones/lang/expressions/enclosed_by_parens_expression.rb

@@ -0,0 +1,17 @@
+require 'gobstones/lang/expressions/one_arg_expression'
+
+module Gobstones
+
+  module Lang
+
+    class EnclosedByParensExpression < OneArgExpression
+
+      def evaluate(context)
+        with_evaluated_argument_in(context) { |result| result }
+      end
+
+    end
+
+  end
+
+end

data/lib/gobstones/lang/expressions/function_call.rb

@@ -12,4 +12,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/lang/expressions/one_arg_expression.rb

@@ -1,17 +1,29 @@
+require 'gobstones/modules/equal_by_class'
+
 module Gobstones
 
   module Lang
 
     class OneArgExpression
 
-      attr_reader :arg
+      include Gobstones::EqualByClass
+
+      attr_reader :argument
 
-      def initialize(arg)
-        @arg = arg
+      def initialize(argument)
+        @argument = argument
       end
 
       def ==(other)
-        self.class == other.class && arg == other.arg
+        super(other) && argument == other.argument
+      end
+
+      def evaluate(context)
+        raise 'subclass responsibility'
+      end
+
+      def with_evaluated_argument_in(context, &block)
+        yield argument.evaluate(context)
       end
 
     end

data/lib/gobstones/lang/expressions/primitive_functions.rb

@@ -10,7 +10,9 @@ module Gobstones
     class NroBolitas < OneArgExpression
 
       def evaluate(context)
-        context.head.number_of_balls(arg.evaluate(context)).to_gbs_num
+        with_evaluated_argument_in(context) do |result|
+          context.head.number_of_balls(result).to_gbs_num
+        end
       end
 
     end
@@ -18,7 +20,9 @@ module Gobstones
     class HayBolitas < OneArgExpression
 
       def evaluate(context)
-        context.head.are_there_balls?(arg.evaluate(context)).to_gbs_bool
+        with_evaluated_argument_in(context) do |result|
+          context.head.are_there_balls?(result).to_gbs_bool
+        end
       end
 
     end
@@ -26,43 +30,45 @@ module Gobstones
     class PuedeMover < OneArgExpression
 
       def evaluate(context)
-        context.head.can_move?(arg.evaluate(context)).to_gbs_bool
+        with_evaluated_argument_in(context) do |result|
+          context.head.can_move?(result).to_gbs_bool
+        end
       end
 
-      def arg_type
+      def argument_type
         :Direction
       end
 
       def type_check
-        Gobstones::TypeCheckResult.new arg_type, arg.return_type
+        Gobstones::TypeCheckResult.new argument_type, argument.return_type
       end
 
     end
 
     class Siguiente < OneArgExpression
 
-      def evaluate(context=nil)
-        arg.evaluate(context).next
+      def evaluate(context)
+        with_evaluated_argument_in(context) { |result| result.next }
       end
 
     end
 
     class Previo < OneArgExpression
 
-      def evaluate(context=nil)
-        arg.evaluate(context).previous
+      def evaluate(context)
+        with_evaluated_argument_in(context) { |result| result.previous }
       end
 
     end
 
     class Opuesto < OneArgExpression
 
-      def evaluate(context=nil)
-        arg.evaluate(context).opposite
+      def evaluate(context)
+        with_evaluated_argument_in(context) { |result| result.opposite }
       end
 
     end
 
   end
 
-end
+end

data/lib/gobstones/lang/expressions/two_arg_expression.rb

@@ -1,9 +1,13 @@
+require 'gobstones/modules/equal_by_class'
+
 module Gobstones
 
   module Lang
 
     class TwoArgExpression
 
+      include Gobstones::EqualByClass
+
       attr_reader :left_expr, :right_expr
 
       def self.evaluates_with(selector)
@@ -22,9 +26,9 @@ module Gobstones
       end
 
       def ==(other)
-        self.class == other.class &&
-          self.left_expr == other.left_expr &&
-          self.right_expr == other.right_expr
+        super(other) &&
+        self.left_expr == other.left_expr &&
+        self.right_expr == other.right_expr
       end
 
     end

data/lib/gobstones/lang/expressions/type_bound_functions.rb

@@ -63,4 +63,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/lang/expressions/var_name.rb

@@ -1,9 +1,13 @@
+require 'gobstones/modules/equal_by_class'
+
 module Gobstones
 
   module Lang
 
     class VarName
 
+      include Gobstones::EqualByClass
+
       attr_reader :name
 
       def initialize(name)
@@ -11,11 +15,9 @@ module Gobstones
       end
 
       def ==(var)
-        self.class == var.class && self.name == var.name
+        super(var) && self.name == var.name
       end
 
-      alias eql? ==
-
       def hash
         @name.hash
       end
@@ -24,6 +26,10 @@ module Gobstones
         context.get self
       end
 
+      def named?(a_name)
+        name == a_name
+      end
+
     end
 
   end

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

@@ -1,4 +1,4 @@
 require 'gobstones/lang/literals/booleans'
 require 'gobstones/lang/literals/colors'
 require 'gobstones/lang/literals/directions'
-require 'gobstones/lang/literals/number'
+require 'gobstones/lang/literals/number'

data/lib/gobstones/lang/literals/colors.rb

@@ -91,4 +91,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/lang/literals/literal.rb

@@ -22,26 +22,6 @@ module Gobstones
         raise 'subclass responsibility'
       end
 
-      def if_true(block, context)
-        raise Gobstones::Runner::GobstonesTypeError, "#{self} is not a boolean"
-      end
-
-      def if_false(block, context)
-        raise Gobstones::Runner::GobstonesTypeError, "#{self} is not a boolean"
-      end
-
-      def is_true?
-        raise Gobstones::Runner::GobstonesTypeError, "#{self} is not a boolean"
-      end
-
-      def same_type_as(other)
-        self.return_type == other.return_type
-      end
-
-      def return_type
-        raise 'subclass responsibility'
-      end
-
       OPERATORS_MAPPING = {
           :equal => :==,
           :not_equal => '!='.to_sym,
@@ -56,8 +36,38 @@ module Gobstones
         end
       end
 
+      def same_type_as(other)
+        self.return_type == other.return_type
+      end
+
+      def return_type
+        raise 'subclass responsibility'
+      end
+
+      def if_true(block, context)
+        not_boolean_type_error
+      end
+
+      def if_false(block, context)
+        not_boolean_type_error
+      end
+
+      def is_true?
+        not_boolean_type_error
+      end
+
+      def not
+        not_boolean_type_error
+      end
+
+      private
+
+      def not_boolean_type_error
+        raise Gobstones::Runner::GobstonesTypeError, "#{self} is not a boolean"
+      end
+
     end
 
   end
 
-end
+end

data/lib/gobstones/lang/literals/number.rb

@@ -46,4 +46,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/lang/program.rb

@@ -1,4 +1,5 @@
 require 'gobstones/runner/execution_context'
+require 'gobstones/modules/equal_by_class'
 
 module Gobstones
 
@@ -6,6 +7,8 @@ module Gobstones
 
     class Program
 
+      include Gobstones::EqualByClass
+
       attr_reader :definitions, :main_definition
 
       def initialize(definitions, main_definition)
@@ -14,15 +17,21 @@ module Gobstones
       end
 
       def ==(other)
-        self.class == other.class &&
+        super(other) &&
         self.definitions == other.definitions &&
         self.main_definition == other.main_definition
       end
 
       def evaluate
-        context = Gobstones::Runner::ProgramExecutionContext.for self
-        main_definition.evaluate context
-        context
+        create_context.tap do |context|
+          main_definition.evaluate context
+        end
+      end
+
+      private
+
+      def create_context
+        Gobstones::Runner::ProgramExecutionContext.for self
       end
 
     end

data/lib/gobstones/modules/equal_by_class.rb

@@ -10,4 +10,4 @@ module Gobstones
 
   end
 
-end
+end

data/lib/gobstones/parser/ast/ast.rb

@@ -53,9 +53,9 @@ module Gobstones
         sub_exps.elements.inject(left.value) do |memo, node|
           case node.op.text_value
           when '+'
-            memo = Add.new memo, node.right.value
+            Add.new memo, node.right.value
           when '-'
-            memo = Sub.new memo, node.right.value
+            Sub.new memo, node.right.value
           end
         end
       end
@@ -67,7 +67,7 @@ module Gobstones
       else
         # it is a nested exp
         sub_exps.elements.inject(left.value) do |memo, node|
-          memo = Mul.new memo, node.right.value
+          Mul.new memo, node.right.value
         end
       end
     end
@@ -87,7 +87,7 @@ module Gobstones
       else
         # it is a nested exp
         sub_exps.elements.inject(left.value) do |memo, node|
-          memo = Pow.new memo, node.right.value
+          Pow.new memo, node.right.value
         end
       end
     end
@@ -105,7 +105,7 @@ module Gobstones
     ast_node(:AndExprNode) { And.new left.value, right.value }
     ast_node(:OrExprNode) { Or.new left.value, right.value }
 
-    ast_node(:ParenthesesExprNode) { ParenthesesExpr.new gexp.value }
+    ast_node(:ParenthesesExprNode) { EnclosedByParensExpression.new gexp.value }
     ast_node(:FuncCallNode) do
       FunctionCall.new func_name.text_value, gexp_tuple.value
     end
@@ -137,8 +137,12 @@ module Gobstones
       SingleAssignment.new var_name.value, gexp.value
     end
 
+    ast_node :MultipleAssignmentNode do
+      MultipleAssignment.new var_tuple.value, gexp.value
+    end
+
     ast_node :CmdBlockNode do
-      CmdBlock.new create_commands(commands)
+      CommandBlock.new create_commands(commands)
     end
 
     ast_node :IfCmdNode do
@@ -177,7 +181,7 @@ module Gobstones
     end
 
     ast_node(:FunctionNode) do
-      cmd_block = CmdBlock.new create_commands(commands)
+      cmd_block = CommandBlock.new create_commands(commands)
       Function.new func_name.text_value, var_tuple.value,
         cmd_block, func_return.value
     end
@@ -191,7 +195,7 @@ module Gobstones
     end
 
     ast_node(:MainDefNode) do
-      cmd_block = CmdBlock.new create_commands(commands)
+      cmd_block = CommandBlock.new create_commands(commands)
       return_st = ret.empty? ? NoReturnStatement.new : ret.value
       Main.new cmd_block, return_st
     end

data/lib/gobstones/parser/grammar/gobstones.treetop

@@ -53,7 +53,7 @@ grammar Gobstones
   rule simple_cmd
     skip_cmd / boom_cmd / poner_cmd / sacar_cmd / mover_cmd /
     ir_al_origen_cmd / vaciar_tablero_cmd / proc_call /
-    cmd_block / single_assignment # / multiple_assignment
+    cmd_block / single_assignment / multiple_assignment
   end
 
   rule skip_cmd
@@ -96,9 +96,9 @@ grammar Gobstones
     var_name space* ':=' space* gexp <SingleAssignmentNode>
   end
 
-  # TODO implement
-  # rule multiple_assignment
-  # end
+  rule multiple_assignment
+    var_tuple space* ':=' space* gexp <MultipleAssignmentNode>
+  end
 
   rule complex_cmd
     if_cmd / while_cmd / repeat_with_cmd # / case_cmd