loxxy 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3994a3225b7dbc4a39d24cc646c20e4a7a19b074e85fe2dd9bc87d9ca1d61cb
-  data.tar.gz: 965c328057f51fb7d13886255955e782e51b1f030f3053a6f5f6f4534962855b
+  metadata.gz: 60e57ef9264b4239571378ddcbefe044ff63192534ce94fc99b9a3b1c1813f02
+  data.tar.gz: 94c26f57455d0e267354f68655e86288dd00f5c322df3e4d1b6f5478cad0eb17
 SHA512:
-  metadata.gz: 9db05948e45f7903ca71d7d0e3722f3c9b1fd3f50931e17b6bb1666c34cf03e1dc7f6cf32abee461dd6e6ec6824cd89b8ef5b2b56ae41fcd40068228d8cbaba2
-  data.tar.gz: eaa762982bd89f2b4cb85e8d6831017e702b87501b7c29132f25f79fa592bf804ec95736f518d304f43caf814aa55eeadd5041ffcba1afa3aaaed631d23027af
+  metadata.gz: 8e5d6f864c1a340aecc7a362d8f2c311dc553869fc72b40d287736df2b62715eb208b2b299f1106dba5645dc4bb859f1d96fbfa79441c83c0e5faa223dd6642d
+  data.tar.gz: 452f9815e8812d9313c228697410a4c7433ec12c58269da305999f1de2822c89ad0b9a0f4e72865c333ddbee725b0ff102b4bc14ab4c51dcf7dba2784a08074a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.1.16] - 2021-04-10
+- Fixed an issue in name lookup. All the `this` test suite is passing.
+
+### Changed
+- Method `BackEnd::Engine#after_var_stmt` now it creates the variable and pouts it in the symbol table
+
+### Removed
+- Method `BackEnd::Engine#before_var_stmt` it generated bug when assigning a value to a var, when that var name occurred elsewhere
+
 ## [0.1.15] - 2021-04-08
 - Fixed the `dangling else`by tweaking the grammar rules
 

data/lib/loxxy/back_end/engine.rb

@@ -82,18 +82,12 @@ module Loxxy
         symbol_table.insert(new_var)
       end
 
-      def before_var_stmt(aVarStmt)
+      def after_var_stmt(aVarStmt)
         new_var = Variable.new(aVarStmt.name, Datatype::Nil.instance)
         symbol_table.insert(new_var)
-      end
-
-      def after_var_stmt(aVarStmt)
-        var_name = aVarStmt.name
-        variable = symbol_table.lookup(var_name)
-        raise StandardError, "Unknown variable #{var_name}" unless variable
 
         value = stack.pop
-        variable.assign(value)
+        new_var.assign(value)
       end
 
       def before_for_stmt(aForStmt)

data/lib/loxxy/back_end/symbol_table.rb

@@ -85,7 +85,7 @@ module Loxxy
           name2envs[name] = [current_env]
         end
 
-        anEntry.name # anEntry.i_name
+        anEntry.name
       end
 
       # Search for the object with the given name
@@ -99,23 +99,6 @@ module Loxxy
         sc.defns[aName]
       end
 
-      # Search for the object with the given i_name
-      # @param anIName [String]
-      # @return [BackEnd::Variable]
-      # def lookup_i_name(anIName)
-        # found = nil
-        # environment = current_env
-
-        # begin
-          # found = environment.defns.values.find { |e| e.i_name == anIName }
-          # break if found
-
-          # environment = environment.parent
-        # end while environment
-
-        # found
-      # end
-
       # Return all variables defined in the current .. root chain.
       # Variables are sorted top-down and left-to-right.
       def all_variables

data/lib/loxxy/interpreter.rb

@@ -24,6 +24,15 @@ module Loxxy
     # @param lox_input [String] Lox program to evaluate
     # @return [Loxxy::Datatype::BuiltinDatatype]
     def evaluate(lox_input)
+      raw_evaluate(lox_input).first
+    end
+
+    # Evaluate the given Lox program.
+    # Return the pair [result, a BackEnd::Engine instance]
+    #   where result is the value of the last executed expression (if any)
+    # @param lox_input [String] Lox program to evaluate
+    # @return Loxxy::Datatype::BuiltinDatatype, Loxxy::BackEnd::Engine]
+    def raw_evaluate(lox_input)
       # Front-end scans, parses the input and blurps an AST...
       parser = FrontEnd::Parser.new
 
@@ -34,7 +43,9 @@ module Loxxy
       # Back-end launches the tree walking & responds to visit events
       # by executing the code determined by the visited AST node.
       engine = BackEnd::Engine.new(config)
-      engine.execute(visitor)
+      result = engine.execute(visitor)
+
+      [result, engine]
     end
   end # class
 end # module

data/lib/loxxy/version.rb

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

data/spec/back_end/engine_spec.rb

@@ -34,15 +34,7 @@ module Loxxy
         let(:var_decl) { Ast::LoxVarStmt.new(sample_pos, 'greeting', greeting) }
         let(:lit_expr) { Ast::LoxLiteralExpr.new(sample_pos, greeting) }
 
-        it "should react to 'before_var_stmt' event" do
-          expect { subject.before_var_stmt(var_decl) }.not_to raise_error
-          current_env = subject.symbol_table.current_env
-          expect(current_env.defns['greeting']).to be_kind_of(Variable)
-        end
-
         it "should react to 'after_var_stmt' event" do
-          # Precondition: `before_var_stmt` is called...
-          expect { subject.before_var_stmt(var_decl) }.not_to raise_error
           # Precondition: value to assign is on top of stack
           subject.stack.push(greeting)
 

data/spec/interpreter_spec.rb

@@ -525,6 +525,48 @@ LOX_END
         expect { subject.evaluate(program) }.not_to raise_error
         expect(sample_cfg[:ostream].string).to eq('Egotist instance')
       end
+
+      it 'should support a closure nested in a method' do
+        lox_snippet = <<-LOX_END
+        class Foo {
+          getClosure() {
+            fun closure() {
+              return this.toString();
+            }
+            return closure;
+          }
+
+          toString() { return "foo"; }
+        }
+
+        var closure = Foo().getClosure();
+        closure;
+        LOX_END
+        # Expected result: Backend::LoxFunction('closure')
+        # Expected function's closure ()environment layout):
+        # Environment('global')
+        #   defns
+        #   +- ['clock'] => BackEnd::Engine::NativeFunction
+        #   *- ['Foo'] => BackEnd::LoxClass
+        # Environment
+        #   defns
+        #   ['this'] => BackEnd::LoxInstance
+        # Environment
+        #   defns
+        #   +- ['closure'] => Backend::LoxFunction
+        result = subject.evaluate(lox_snippet)
+        expect(result).to be_kind_of(BackEnd::LoxFunction)
+        expect(result.name).to eq('closure')
+        closure = result.closure
+        expect(closure).to be_kind_of(Loxxy::BackEnd::Environment)
+        expect(closure.defns['closure'].value).to eq(result)
+        expect(closure.enclosing).to be_kind_of(Loxxy::BackEnd::Environment)
+        expect(closure.enclosing.defns['this'].value).to be_kind_of(Loxxy::BackEnd::LoxInstance)
+        global_env = closure.enclosing.enclosing
+        expect(global_env).to be_kind_of(Loxxy::BackEnd::Environment)
+        expect(global_env.defns['clock'].value).to be_kind_of(BackEnd::Engine::NativeFunction)
+        expect(global_env.defns['Foo'].value).to be_kind_of(BackEnd::LoxClass)
+      end
     end # context
   end # describe
   # rubocop: enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley