loxxy 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e57ef9264b4239571378ddcbefe044ff63192534ce94fc99b9a3b1c1813f02
-  data.tar.gz: 94c26f57455d0e267354f68655e86288dd00f5c322df3e4d1b6f5478cad0eb17
+  metadata.gz: 2c7d720e2638407882bfd3f34384748a872086e1b1f7a3849f0e029e8672fc1c
+  data.tar.gz: c3aa7ebe4a625ef1b0a257cc750430b9a0aa404bb39dab900b409b2987e09dea
 SHA512:
-  metadata.gz: 8e5d6f864c1a340aecc7a362d8f2c311dc553869fc72b40d287736df2b62715eb208b2b299f1106dba5645dc4bb859f1d96fbfa79441c83c0e5faa223dd6642d
-  data.tar.gz: 452f9815e8812d9313c228697410a4c7433ec12c58269da305999f1de2822c89ad0b9a0f4e72865c333ddbee725b0ff102b4bc14ab4c51dcf7dba2784a08074a
+  metadata.gz: 1eb8bb6575dd39834c55ce3ad359fbdb9a2129f91d25bc39ea093c5a4ca2aa38300ab28e673b39991678c304aea64ffda473707f9d317980b976c8f98fc3a55f
+  data.tar.gz: d3dd5baae665ab27a60a13b7392e9d57ef32ff72a37892d8f08e314888a1bfcc3db9ceeb071a28c00dda44f4bce7afed6aadf6c33c411a93d561a30fef833edd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.1.17] - 2021-04-11
+- TODO
+
+### Fixed
+- TODO
+
 ## [0.1.16] - 2021-04-10
 - Fixed an issue in name lookup. All the `this` test suite is passing.
 

data/lib/loxxy/back_end/engine.rb

@@ -74,7 +74,9 @@ module Loxxy
         meths = aClassStmt.body.map do |func_node|
           func_node.is_method = true
           func_node.accept(aVisitor)
-          stack.pop
+          mth = stack.pop
+          mth.is_initializer = true if mth.name == 'init'
+          mth
         end
 
         klass = LoxClass.new(aClassStmt.name, meths, self)
@@ -234,15 +236,13 @@ module Loxxy
         case callee
         when NativeFunction
           stack.push callee.call # Pass arguments
-        when LoxFunction
+        when LoxFunction, LoxClass
           arg_count = aCallExpr.arguments.size
           if arg_count != callee.arity
             msg = "Expected #{callee.arity} arguments but got #{arg_count}."
             raise Loxxy::RuntimeError, msg
           end
           callee.call(self, aVisitor)
-        when LoxClass
-          callee.call(self, aVisitor)
         else
           raise Loxxy::RuntimeError, 'Can only call functions and classes.'
         end

data/lib/loxxy/back_end/lox_class.rb

@@ -30,11 +30,18 @@ module Loxxy
       end
 
       def arity
-        0
+        initializer = find_method('init')
+        initializer ? initializer.arity : 0
       end
 
-      def call(engine, _visitor)
+      def call(engine, visitor)
         instance = LoxInstance.new(self, engine)
+        initializer = find_method('init')
+        if initializer
+          constructor = initializer.bind(instance)
+          constructor.call(engine, visitor)
+        end
+
         engine.stack.push(instance)
       end
 

data/lib/loxxy/back_end/lox_function.rb

@@ -15,6 +15,7 @@ module Loxxy
       attr_reader :body
       attr_reader :stack
       attr_reader :closure
+      attr_accessor :is_initializer
 
       # Create a function with given name
       # @param aName [String] The name of the function
@@ -24,6 +25,7 @@ module Loxxy
         @body = aBody.kind_of?(Ast::LoxNoopExpr) ? aBody : aBody.subnodes[0]
         @stack = anEngine.stack
         @closure = anEngine.symbol_table.current_env
+        @is_initializer = false
         anEngine.symbol_table.current_env.embedding = true
       end
 
@@ -48,6 +50,10 @@ module Loxxy
           (body.nil? || body.kind_of?(Ast::LoxNoopExpr)) ? Datatype::Nil.instance : body.accept(aVisitor)
           throw(:return)
         end
+        if is_initializer
+          enclosing_env = engine.symbol_table.current_env.enclosing
+          engine.stack.push(enclosing_env.defns['this'].value)
+        end
 
         engine.symbol_table.leave_environment
       end

data/lib/loxxy/back_end/lox_instance.rb

@@ -47,10 +47,6 @@ module Loxxy
       # Set the value of property with given name
       # aName [String] name of object property
       def set(aName, aValue)
-        unless fields.include? aName
-          raise StandardError, "Undefined property '#{aName}'."
-        end
-
         fields[aName] = aValue
       end
     end # class

data/lib/loxxy/back_end/resolver.rb

@@ -70,7 +70,8 @@ module Loxxy
         begin_scope
         define('this')
         aClassStmt.body.each do |fun_stmt|
-          resolve_function(fun_stmt, :method, aVisitor)
+          mth_type = fun_stmt.name == 'init' ? :initializer : :method
+          resolve_function(fun_stmt, mth_type, aVisitor)
         end
         end_scope
         @current_class = previous_class
@@ -92,7 +93,7 @@ module Loxxy
         anIfStmt.else_stmt&.accept(aVisitor)
       end
 
-      def before_return_stmt(_returnStmt)
+      def before_return_stmt(returnStmt)
         if scopes.size < 2
           msg = "Error at 'return': Can't return from top-level code."
           raise StandardError, msg
@@ -102,6 +103,11 @@ module Loxxy
           msg = "Error at 'return': Can't return from outside a function."
           raise StandardError, msg
         end
+
+        if current_function == :initializer
+          msg = "Error at 'return': Can't return a value from an initializer."
+          raise StandardError, msg unless returnStmt.subnodes[0].kind_of?(Datatype::Nil)
+        end
       end
 
       def after_while_stmt(aWhileStmt, aVisitor)

data/lib/loxxy/version.rb

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

data/spec/interpreter_spec.rb

@@ -543,7 +543,7 @@ LOX_END
         closure;
         LOX_END
         # Expected result: Backend::LoxFunction('closure')
-        # Expected function's closure ()environment layout):
+        # Expected function's closure (environment layout):
         # Environment('global')
         #   defns
         #   +- ['clock'] => BackEnd::Engine::NativeFunction
@@ -567,6 +567,30 @@ LOX_END
         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
+
+      it 'should support custom initializer' do
+        lox_snippet = <<-LOX_END
+          // From section 3.9.5
+          class Breakfast {
+            init(meat, bread) {
+              this.meat = meat;
+              this.bread = bread;
+            }
+
+            serve(who) {
+              print "Enjoy your " + this.meat + " and " +
+                  this.bread + ", " + who + ".";
+            }
+          }
+
+          var baconAndToast = Breakfast("bacon", "toast");
+          baconAndToast.serve("Dear Reader");
+          // Output: "Enjoy your bacon and toast, Dear Reader."
+        LOX_END
+        expect { subject.evaluate(lox_snippet) }.not_to raise_error
+        predicted = 'Enjoy your bacon and toast, Dear Reader.'
+        expect(sample_cfg[:ostream].string).to eq(predicted)
+      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.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley