loxxy 0.1.04 → 0.1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16614a276ddf1553d4373e5da9ab78d7f03f2fc8cadec6190c28bb27bdd95b99
-  data.tar.gz: 98903f6ec0c9e010fd429f6b1753b34f52b4cfc67c7eafd21b1103c6ac429bba
+  metadata.gz: c8eae41b5b093b55c02a81bbe81b08202eb4ecd64c1dd288246c0cd4af44c627
+  data.tar.gz: 208158a80e89e789d74c66f295ee4cbec6d37e6d9f3185dedfbcaa30a156fe35
 SHA512:
-  metadata.gz: 8278546ef246d8f4d5db72b18d5c91dfa3dc1d7f18f81b7491ca01df38a64495a3b5eb26df0fa18b652f59d56784efb8fe9348b5b65d091aa27a09e6b8f144a4
-  data.tar.gz: deaa7b43f225788b9366610572f5994eec8950a8e66c8159b83a18b874139d322270f274c4753dc28b6926b7c295d42a2f77600211dfbd0df0e24b82e1a155b5
+  metadata.gz: dc1393417a3cdb013fdbcc085dcb3ba7dda45784e73a26ef44c1ee21b4322a9a18063d16c0cae7d3266be829ce31c6090773ba1631712211c388d84b21e0161d
+  data.tar.gz: 2f07cb2e882fbff31b73eee169a99849729b8f4136888335b2915a183ff32ed8aa78a66d93ea7765f0b09f0747b4b09cfae2aece5ca7478f41892b173a0ce2ab

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.1.05] - 2021-03-05
+- Test for Fibbonacci recursive function is now passing.
+
+### Fixed
+- Method `BackEnd::Function#call` a call doesn't no more generate of TWO scopes
+
 ## [0.1.04] - 2021-02-28
 
 ### Added

data/lib/loxxy/back_end/engine.rb

@@ -200,18 +200,7 @@ module Loxxy
         when NativeFunction
           stack.push callee.call # Pass arguments
         when Function
-          new_env = Environment.new(symbol_table.current_env)
-          symbol_table.enter_environment(new_env)
-          callee.parameters&.each do |param_name|
-            local = Variable.new(param_name, stack.pop)
-            symbol_table.insert(local)
-          end
-          catch(:return) do
-            callee.call(aVisitor)
-            throw(:return)
-          end
-
-          symbol_table.leave_environment
+          callee.call(self, aVisitor)
         else
           raise Loxxy::RuntimeError, 'Can only call functions and classes.'
         end

data/lib/loxxy/back_end/function.rb

@@ -22,7 +22,7 @@ module Loxxy
       def initialize(aName, parameterList, aBody, aStack)
         @name = aName.dup
         @parameters = parameterList
-        @body = aBody
+        @body = aBody.kind_of?(Ast::LoxNoopExpr) ? aBody : aBody.subnodes[0]
         @stack = aStack
       end
 
@@ -30,8 +30,21 @@ module Loxxy
         stack.push self
       end
 
-      def call(aVisitor)
-        body.empty? ? Datatype::Nil.instance : body.accept(aVisitor)
+      def call(engine, aVisitor)
+        new_env = Environment.new(engine.symbol_table.current_env)
+        engine.symbol_table.enter_environment(new_env)
+
+        parameters&.each do |param_name|
+          local = Variable.new(param_name, stack.pop)
+          engine.symbol_table.insert(local)
+        end
+
+        catch(:return) do
+          (body.nil? || body.kind_of?(Ast::LoxNoopExpr)) ? Datatype::Nil.instance : body.accept(aVisitor)
+          throw(:return)
+        end
+
+        engine.symbol_table.leave_environment
       end
 
       # Logical negation.

data/lib/loxxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loxxy
-  VERSION = '0.1.04'
+  VERSION = '0.1.05'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.04
+  version: 0.1.05
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley