gobstones 0.0.1.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826a27b2e6a5676f89fa8c32624c62df0dde077d
-  data.tar.gz: 17f89df81a1a217fe6b7a493e30fddb6b7c92a4f
+  metadata.gz: 03e20b75d2bb5c93639777a71d19068ae2b69984
+  data.tar.gz: fb74916def49acc055a0a028546e0e514b2542cb
 SHA512:
-  metadata.gz: 6283b4c01c03a10bc7bf264ff84c2ce9c90b38d1feb10b65f1b5e7364e32e336580cfc13a640215b3dc692671b09bfcc4128c77d5b1827c64041ad766d3ac4a2
-  data.tar.gz: 261974cfa283b2cca01f5c6ad5b2a050cc7d5bf643b4620345e4c246ad0f8722f0bfe4367fe6abdf9f67e8a9d68311daa42141cea22951bbb2c87494baf31955
+  metadata.gz: c3f831d15b2ce307ee9f0c5305e51f17ade931bb27b0ca042ea4f8f58316d290cc40966a9b1e76a4baa0e45d791b3a0341fd20e2606f104d965f6741af67ceca
+  data.tar.gz: 6ffabbf50a90cddd4d4dfa8c814d234307af73b1e70906613df903264d17f89dd5564e4bbdebbdd928edfa34240ad987d4737ad096f77370a32f25c259527353

data/.gitignore

@@ -1,6 +1,4 @@
 .rvmrc
-*.swp
-.rake_t_cache
 coverage/
-tags
 .idea/
+examples/*.test.gbs

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p195
+2.2.0

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.0
   - 1.9.3

data/CHANGELOG

@@ -1,4 +1,24 @@
-v 0.0.1
-=======
+v 0.0.2 (2015.01.10)
+====================
+
+New features:
+
+* Support evaluation of function calls
+* Support expression between parentheses
+* Add multiple assignment to the language
+* Add some runtime type checks
+
+Bug fixes:
+
+* repeatWith command issue (f0e5fa00a178ffad825c6cfdafbfbd333e331f9b)
+
+Infrastructure:
+
+* Support Ruby 2.2.0 and 1.9.3
+* Upgrade dependencies to latest stable versions
+* Lots of refactorings and new specs (now 316)
+
+v 0.0.1 (2013.10.26)
+====================
 
 First version.

data/Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'treetop', '~> 1.4'
-gem 'rake', '~> 10.1'
+gem 'rake', '~> 10.4'
 
 group :test do
   gem 'autotest-standalone', '~> 4.5'
-  gem 'rspec', '~> 2'
+  gem 'rspec', '~> 3.1'
   gem 'simplecov', '~> 0.7', :require => false
 end
 
-gem 'coveralls', :require => false
+gem 'coveralls', '~> 0.7', :require => false

data/Gemfile.lock

@@ -2,46 +2,51 @@ GEM
   remote: https://rubygems.org/
   specs:
     autotest-standalone (4.5.11)
-    coveralls (0.7.0)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.4)
-    mime-types (1.25)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
-    rake (10.1.0)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    mime-types (2.4.3)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    rake (10.4.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    simplecov (0.7.1)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    tins (0.12.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
+    tins (0.13.2)
+    treetop (1.5.3)
+      polyglot (~> 0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   autotest-standalone (~> 4.5)
-  coveralls
-  rake (~> 10.1)
-  rspec (~> 2)
+  coveralls (~> 0.7)
+  rake (~> 10.4)
+  rspec (~> 3.1)
   simplecov (~> 0.7)
   treetop (~> 1.4)

data/bin/gobstones

@@ -9,4 +9,4 @@ if gbs_file
   Gobstones::CLI::Runner.run(gbs_file)
 else
   puts 'No Gobstones program specified'
-end
+end

data/gobstones.gemspec

@@ -3,7 +3,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'gobstones'
-  spec.version = '0.0.1.1'
+  spec.version = '0.0.2'
   spec.licenses = ['GPLv3']
   spec.authors = ['Nahuel Garbezza']
   spec.email = ['n.garbezza@gmail.com']
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.6'
 
-  spec.add_development_dependency 'rspec', '~> 2'
+  spec.add_development_dependency 'rspec', '~> 3'
 
   spec.files = `git ls-files`.split $/
   spec.test_files = spec.files.grep %r{^spec/}

data/lib/gobstones/cli/board_template

@@ -36,4 +36,4 @@
   0 |         |         |         |         |         |         |         |         |         | 0
     |         |         |         |         |         |         |         |         |         |  
     +---------+---------+---------+---------+---------+---------+---------+---------+---------+  
-         0         1         2         3         4         5         6         7         8       
+         0         1         2         3         4         5         6         7         8

data/lib/gobstones/cli/printer.rb

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

data/lib/gobstones/cli/runner.rb

@@ -23,6 +23,8 @@ module Gobstones
         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
         raise e
@@ -35,7 +37,7 @@ module Gobstones
       end
 
       def parse_program
-        @parser.parse(@code)
+        @parser.parse @code
       end
 
       def handle_parse_error(parse_error)
@@ -45,8 +47,12 @@ module Gobstones
         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}"
+      end
+
     end
 
   end
 
-end
+end

data/lib/gobstones/extensions/all.rb

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

data/lib/gobstones/extensions/boolean.rb

@@ -14,4 +14,4 @@ class FalseClass
     Gobstones::Lang::False.new
   end
 
-end
+end

data/lib/gobstones/extensions/fixnum.rb

@@ -6,4 +6,4 @@ class Fixnum
     Gobstones::Lang::Number.new self
   end
 
-end
+end

data/lib/gobstones/extensions/string.rb

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

data/lib/gobstones/lang/all.rb

@@ -2,4 +2,4 @@ require 'gobstones/lang/literals/all'
 require 'gobstones/lang/expressions/all'
 require 'gobstones/lang/commands/all'
 require 'gobstones/lang/definitions/all'
-require 'gobstones/lang/program'
+require 'gobstones/lang/program'

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

@@ -1,13 +1,14 @@
-require 'gobstones/lang/commands/assignments'
 require 'gobstones/lang/commands/boom_cmd'
 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/multiple_assignment'
 require 'gobstones/lang/commands/poner_cmd'
 require 'gobstones/lang/commands/procedure_call'
 require 'gobstones/lang/commands/repeat_with_cmd'
 require 'gobstones/lang/commands/sacar_cmd'
+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/while_cmd'

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

@@ -1,4 +1,5 @@
 require 'gobstones/runner/errors/boom_error'
+require 'gobstones/modules/equal_by_class'
 
 module Gobstones
 
@@ -6,6 +7,8 @@ module Gobstones
 
     class Boom
 
+      include Gobstones::EqualByClass
+
       attr_reader :message
 
       def initialize(message)
@@ -13,11 +16,11 @@ module Gobstones
       end
 
       def ==(other)
-        self.class == other.class &&
+        super(other) &&
         self.message == other.message
       end
 
-      def evaluate(context=nil)
+      def evaluate(context)
         raise Gobstones::Runner::BoomError, message
       end
 
@@ -25,4 +28,4 @@ module Gobstones
 
   end
 
-end
+end

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

@@ -4,7 +4,7 @@ module Gobstones
 
   module Lang
 
-    class CmdBlock
+    class CommandBlock
 
       include Gobstones::EqualByClass
 

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

@@ -1,9 +1,13 @@
+require 'gobstones/modules/equal_by_class'
+
 module Gobstones
 
   module Lang
 
     class ConditionalCmd
 
+      include Gobstones::EqualByClass
+
       attr_reader :condition, :then_block
 
       def initialize(condition, then_block)
@@ -11,7 +15,7 @@ module Gobstones
       end
 
       def ==(other)
-        self.class == other.class &&
+        super(other) &&
         self.condition == other.condition &&
         self.then_block == other.then_block
       end

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

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

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

@@ -7,7 +7,9 @@ module Gobstones
     class Mover < OneArgExpression
 
       def evaluate(context)
-        context.head.move arg.evaluate(context)
+        with_evaluated_argument_in(context) do |result|
+          context.head.move result
+        end
       end
 
       def undo(context)
@@ -15,7 +17,7 @@ module Gobstones
       end
 
       def opposite
-        Mover.new arg.opposite
+        Mover.new argument.opposite
       end
 
     end

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

@@ -0,0 +1,35 @@
+require 'gobstones/modules/equal_by_class'
+
+module Gobstones
+
+  module Lang
+
+    class MultipleAssignment
+
+      include Gobstones::EqualByClass
+
+      attr_reader :var_tuple, :expression
+
+      def initialize(var_tuple, expression)
+        @var_tuple, @expression = var_tuple, expression
+      end
+
+      def ==(other)
+        super(other) &&
+        self.var_tuple == other.var_tuple &&
+        self.expression == other.expression
+      end
+
+      def evaluate(context)
+        # TODO implement as many simple assignments?
+        function_call_result = expression.evaluate(context)
+        function_call_result.length.times do |index|
+          context.set var_tuple.variable_at(index), function_call_result[index]
+        end
+      end
+
+    end
+
+  end
+
+end

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

@@ -9,7 +9,9 @@ module Gobstones
     class Poner < OneArgExpression
 
       def evaluate(context)
-        context.head.put arg.evaluate(context)
+        with_evaluated_argument_in(context) do |result|
+          context.head.put result
+        end
       rescue RuntimeError => e
         raise Gobstones::Runner::GobstonesTypeError, e.message
       end
@@ -17,15 +19,17 @@ module Gobstones
       def undo(context)
         # TODO maybe the command should use the original context
         # instead of this one (when it was executed)
-        context.head.take_out arg.evaluate(context)
+        with_evaluated_argument_in(context) do |result|
+          context.head.take_out result
+        end
       end
 
       def opposite
-        Sacar.new arg
+        Sacar.new argument
       end
 
     end
 
   end
 
-end
+end