loxxy 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665b2f201c4e369bb46b4b62cd8398f8d1f6f563b073fb6e1595b767f306c627
-  data.tar.gz: 7bd3ca2024f2f05150d3fd8af9cdaee28d6dc4d2bbe48ebfe6ae9fd78166fc7f
+  metadata.gz: 2c7d720e2638407882bfd3f34384748a872086e1b1f7a3849f0e029e8672fc1c
+  data.tar.gz: c3aa7ebe4a625ef1b0a257cc750430b9a0aa404bb39dab900b409b2987e09dea
 SHA512:
-  metadata.gz: 0cffb636754ac0140aa7873955c75d8e6a048a0806cacf22484de91bacecb4fdb7d55127f7ff6e2f5602ff02f1eb9f24de788a6be0053768c68f12b9cdd0caab
-  data.tar.gz: 331fb47a8a46a9ea6a086556814b95aba7d7a4d7a3c600f82acacfd38dd567c657ca79f6ce683e17e64e8104167692a2b49e7628bac9d8536a5bd0625ceab347
+  metadata.gz: 1eb8bb6575dd39834c55ce3ad359fbdb9a2129f91d25bc39ea093c5a4ca2aa38300ab28e673b39991678c304aea64ffda473707f9d317980b976c8f98fc3a55f
+  data.tar.gz: d3dd5baae665ab27a60a13b7392e9d57ef32ff72a37892d8f08e314888a1bfcc3db9ceeb071a28c00dda44f4bce7afed6aadf6c33c411a93d561a30fef833edd

data/CHANGELOG.md

@@ -1,3 +1,72 @@
+## [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.
+
+### 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
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_if__else_stmt` parse action specific for if with else branch
+
+### Fixed
+- File `grammar.rb` changed rules to cope with `dangling else` issue
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_if_stmt` parse action for if without else branch
+- File `README.md` removed the section about the `dangling else` issue.
+
+
+## [0.1.14] - 2021-04-05
+- `Loxxy` now implements the 'this' keyword
+
+### New
+- Class `Ast::LoxThisExpr` a syntax node that represents an occurrence of the `this` keyword
+- Method `Ast::ASTBuilder#reduce_this_expr` parse action for this keyword
+- Method `Ast::Visitor#visit_this_expr` visit of an `Ast::LoxThisExpr` node
+- Method `BackEnd::Engine#after_this_expr` runtime action for this keyword (i.e. refers to current instance)
+- Method `BackEnd::LoxFunction#bind` implementation of bound method
+
+### Changed
+- Class `BackEnd::Resolver` implementing semantic actions for `this` keyword
+- File `grammar.rb` added name to a syntax rule
+
+## [0.1.13] - 2021-04-05
+- `Loxxy` now implements method calls
+
+### New
+- Class `Ast::LoxGetExpr` a syntax node that represents a read access to an object property
+- Class `Ast::LoxSetExpr` a syntax node that represents a write access to an object property
+- Method `Ast::ASTBuilder#reduce_set_expr` parse action for write access to an object property
+- Method `Ast::ASTBuilder#reduce_get_expr` parse action for read access to an object property
+- Method `Ast::Visitor#visit_set_expr` visit of an `Ast::LoxSetExpr` node
+- Method `Ast::Visitor#visit_get_expr` visit of an `Ast::LoxGetExpr` node
+- Method `BackEnd::Engine#after_set_expr` runtime action for property setting
+- Method `BackEnd::Engine#after_get_expr` runtime action for property getting
+- Method `BackEnd::LoxInstance#set` implementation of write accessor
+- Method `BackEnd::LoxInstance#get` implementation of read accessor
+- Method `BackEnd::Resolver#after_set_expr` resolve action for property setting
+- Method `BackEnd::Resolver#after_get_expr` resolve action for property getting
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_assign_expr` expanded to support write access to an object property
+- Class `LoxClassStmt`: methods are now aggregate under the `body` attribute
+- Class `LoxFunStmt`: has a new attribute `is_method` and inherits from `Ast::LoxNode`
+- Method `BackEnd::Engine#after_class_stmt` methods are aggregated into the classes
+- Method `BackEnd::Engine#after_fun_stmt` extension for method
+- File `grammar.rb` added names to two syntax rules
+
+
 ## [0.1.12] - 2021-04-03
 - Intermediate version: `Loxxy` does instance creation (default constructor)
 

data/README.md

@@ -177,8 +177,8 @@ Loxxy supports single line C-style comments.
 ### Keywords
 Loxxy implements the following __Lox__ reserved keywords:
 ```lang-none
-and, else, false, for, fun, if,
-nil, or, print, true, var, while
+and, class, else, false, for, fun, if,
+nil, or, print, return, this, true, var, while
 ```
 
 ### Datatypes
@@ -331,30 +331,6 @@ print "else-branch";
 ```
 
 As for other languages, the `else` part is optional.
-##### Warning: nested `if`...`else`
-Call it a bug ... Nested `if` `else` control flow structure aren't yet supported by __Loxxy__.  
-The culprit has a name: [the dangling else](https://en.wikipedia.org/wiki/Dangling_else). 
-
-The problem in a nutshell: in a nested if ... else ... statement like this:
-``` javascript
-'if (true) if (false) print "bad"; else print "good";
-```
-... there is an ambiguity.  
-Indeed, according to the __Lox__ grammar, the `else` could be bound 
-either to the first `if` or to the second one.
-This ambiguity is usually lifted by applying an ad-hoc rule: an `else` is aways bound to the most 
-recent (rightmost) `if`.  
-Being a generic parsing library, `Rley` doesn't apply any of these supplemental rules.  
-As a consequence,it complains about the found ambiguity and stops the parsing...
-Although `Rley` can cope with ambiguities, this requires the use of an advanced data structure
-called `Shared Packed Parse Forest (SPPF)`.
-SPPF are much more complex to handle than the "common" parse trees present in most compiler or interpreter books.
-Therefore, a future version of `Rley` will incorporate the capability to define disambuiguation rules.  
-
-In the meantime, the `Loxxy` will progress on other __Lox__ features like:
-- Block structures...
-- Iteration structures (`for` and `while` loops)
-
 
 ####  Print Statement
 

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require_relative 'lox_fun_stmt'
+require_relative 'lox_this_expr'
 require_relative 'lox_variable_expr'
 require_relative 'lox_literal_expr'
 require_relative 'lox_noop_expr'
+require_relative 'lox_get_expr'
 require_relative 'lox_call_expr'
 require_relative 'lox_grouping_expr'
 require_relative 'lox_unary_expr'
 require_relative 'lox_binary_expr'
 require_relative 'lox_logical_expr'
+require_relative 'lox_set_expr'
 require_relative 'lox_assign_expr'
 require_relative 'lox_block_stmt'
 require_relative 'lox_while_stmt'

data/lib/loxxy/ast/ast_builder.rb

@@ -233,11 +233,20 @@ module Loxxy
         return_first_child(range, tokens, theChildren)
       end
 
-      # rule('ifStmt' => 'IF ifCondition statement elsePart_opt')
+      # rule('ifStmt' => 'IF ifCondition statement ELSE statement')
+      # rule('unbalancedStmt' => 'IF ifCondition statement ELSE unbalancedStmt')
+      def reduce_if_else_stmt(_production, _range, tokens, theChildren)
+        condition = theChildren[1]
+        then_stmt = theChildren[2]
+        else_stmt = theChildren[4]
+        LoxIfStmt.new(tokens[0].position, condition, then_stmt, else_stmt)
+      end
+
+      # rule('unbalancedStmt' => 'IF ifCondition stmt').as ''
       def reduce_if_stmt(_production, _range, tokens, theChildren)
         condition = theChildren[1]
         then_stmt = theChildren[2]
-        else_stmt = theChildren[3]
+        else_stmt = nil
         LoxIfStmt.new(tokens[0].position, condition, then_stmt, else_stmt)
       end
 
@@ -269,10 +278,22 @@ module Loxxy
 
       # rule('assignment' => 'owner_opt IDENTIFIER EQUAL assignment')
       def reduce_assign_expr(_production, _range, tokens, theChildren)
-        var_name = theChildren[1].token.lexeme.dup
-        Ast::LoxAssignExpr.new(tokens[1].position, var_name, theChildren[3])
+        name_assignee = theChildren[1].token.lexeme.dup
+        if theChildren[0].kind_of?(Ast::LoxSetExpr)
+          theChildren[0].property = name_assignee
+          theChildren[0].subnodes << theChildren[3]
+          theChildren[0]
+        else
+          Ast::LoxAssignExpr.new(tokens[1].position, name_assignee, theChildren[3])
+        end
       end
 
+      # rule('owner_opt' => 'call DOT')
+      def reduce_set_expr(_production, _range, tokens, theChildren)
+        Ast::LoxSetExpr.new(tokens[1].position, theChildren[0])
+      end
+
+
       # rule('comparisonTest_plus' => 'comparisonTest_plus comparisonTest term').as 'comparison_t_plus_more'
       # TODO: is it meaningful to implement this rule?
 
@@ -317,6 +338,11 @@ module Loxxy
         LoxCallExpr.new(tokens[0].position, args)
       end
 
+      # rule('refinement' => 'DOT IDENTIFIER').as 'get_expr'
+      def reduce_get_expr(_production, _range, tokens, theChildren)
+        LoxGetExpr.new(tokens[0].position, theChildren[1].token.lexeme)
+      end
+
       # rule('primary' => 'LEFT_PAREN expression RIGHT_PAREN')
       def reduce_grouping_expr(_production, _range, tokens, theChildren)
         subexpr = theChildren[1]
@@ -337,6 +363,11 @@ module Loxxy
         LoxVariableExpr.new(tokens[0].position, var_name)
       end
 
+      # rule('primary' => 'THIS')
+      def reduce_this_expr(_production, _range, tokens, _children)
+        LoxThisExpr.new(tokens[0].position)
+      end
+
       # rule('function' => 'IDENTIFIER LEFT_PAREN params_opt RIGHT_PAREN block').as 'function'
       def reduce_function(_production, _range, _tokens, theChildren)
         first_child = theChildren.first

data/lib/loxxy/ast/ast_visitor.rb

@@ -68,7 +68,7 @@ module Loxxy
       end
 
       # Visit event. The visitor is about to visit a class declaration.
-      # @param aXlassStmt [AST::LOXClassStmt] the for statement node to visit
+      # @param aClassStmt [AST::LOXClassStmt] the for statement node to visit
       def visit_class_stmt(aClassStmt)
         broadcast(:before_class_stmt, aClassStmt)
         traverse_subnodes(aClassStmt) # The methods are visited here...
@@ -131,6 +131,13 @@ module Loxxy
         broadcast(:after_assign_expr, anAssignExpr, self)
       end
 
+      # @param aSetExpr [AST::LOXGetExpr] the get expression node to visit
+      def visit_set_expr(aSetExpr)
+        broadcast(:before_set_expr, aSetExpr)
+        traverse_subnodes(aSetExpr)
+        broadcast(:after_set_expr, aSetExpr, self)
+      end
+
       # Visit event. The visitor is about to visit a logical expression.
       # Since logical expressions may take shorcuts by not evaluating all their
       # sub-expressiosns, they are responsible for visiting or not their children.
@@ -169,6 +176,12 @@ module Loxxy
         broadcast(:after_call_expr, aCallExpr, self)
       end
 
+      # @param aGetExpr [AST::LOXGetExpr] the get expression node to visit
+      def visit_get_expr(aGetExpr)
+        broadcast(:before_get_expr, aGetExpr)
+        broadcast(:after_get_expr, aGetExpr, self)
+      end
+
       # Visit event. The visitor is about to visit a grouping expression.
       # @param aGroupingExpr [AST::LoxGroupingExpr] grouping expression to visit
       def visit_grouping_expr(aGroupingExpr)
@@ -192,6 +205,13 @@ module Loxxy
         broadcast(:after_variable_expr, aVariableExpr, self)
       end
 
+      # Visit event. The visitor is about to visit the this keyword.
+      # @param aThisExpr [Ast::LoxThisExpr] this expression
+      def visit_this_expr(aThisExpr)
+        broadcast(:before_this_expr, aThisExpr)
+        broadcast(:after_this_expr, aThisExpr, self)
+      end
+
       # Visit event. The visitor is about to visit the given terminal datatype value.
       # @param aValue [Ast::BuiltinDattype] the built-in datatype value
       def visit_builtin(aValue)
@@ -203,7 +223,6 @@ module Loxxy
       # @param aFunStmt [AST::LoxFunStmt] function declaration to visit
       def visit_fun_stmt(aFunStmt)
         broadcast(:before_fun_stmt, aFunStmt, self)
-        traverse_subnodes(aFunStmt)
         broadcast(:after_fun_stmt, aFunStmt, self)
       end
 

data/lib/loxxy/ast/lox_class_stmt.rb

@@ -5,14 +5,19 @@ require_relative 'lox_compound_expr'
 module Loxxy
   module Ast
     class LoxClassStmt < LoxCompoundExpr
+      # @return [String] the class name
       attr_reader :name
 
+      # @return [Array<Ast::LoxFunStmt>] the methods
+      attr_reader :body
+
       # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
       # @param condExpr [Loxxy::Ast::LoxNode] iteration condition
-      # @param theBody [Loxxy::Ast::LoxNode]
+      # @param theBody [Array<Loxxy::Ast::LoxNode>]
       def initialize(aPosition, aName, theMethods)
-        super(aPosition, theMethods)
+        super(aPosition, [])
         @name = aName.dup
+        @body = theMethods
       end
 
       # Part of the 'visitee' role in Visitor design pattern.
@@ -20,8 +25,6 @@ module Loxxy
       def accept(visitor)
         visitor.visit_class_stmt(self)
       end
-
-      alias body subnodes
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_fun_stmt.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 
-require_relative 'lox_compound_expr'
+require_relative 'lox_node'
 
 module Loxxy
   module Ast
     # rubocop: disable Style/AccessorGrouping
-    class LoxFunStmt < LoxCompoundExpr
+    class LoxFunStmt < LoxNode
       attr_reader :name
       attr_reader :params
       attr_reader :body
+      attr_accessor :is_method
 
       # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
       # @param aName [String]
       # @param arguments [Array<String>]
       # @param body [Ast::LoxBlockStmt]
       def initialize(aPosition, aName, paramList, aBody)
-        super(aPosition, [])
+        super(aPosition)
         @name = aName.dup
         @params = paramList
         @body = aBody
+        @is_method = false
       end
 
       # Part of the 'visitee' role in Visitor design pattern.

data/lib/loxxy/ast/lox_get_expr.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative 'lox_node'
+
+module Loxxy
+  module Ast
+    class LoxGetExpr < LoxNode
+      # @return [Ast::LoxNode] the object to which the property belongs to
+      attr_accessor :object
+
+      # @return [String] Name of an object property
+      attr_reader :property
+
+      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
+      # @param aPropertyName [String] Name of an object property
+      def initialize(aPosition, aPropertyName)
+        super(aPosition)
+        @property = aPropertyName
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param visitor [ASTVisitor] the visitor
+      def accept(visitor)
+        visitor.visit_get_expr(self)
+      end
+
+      alias callee= object=
+    end # class
+  end # module
+end # module

data/lib/loxxy/ast/lox_set_expr.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'lox_compound_expr'
+
+module Loxxy
+  module Ast
+    class LoxSetExpr < LoxCompoundExpr
+      # @return [Ast::LoxNode] the object to which the property belongs to
+      attr_reader :object
+
+      # @return [String] Name of an object property
+      attr_accessor :property
+
+      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
+      # @param anObject [Ast::LoxNode] The object which the given property is being set
+      def initialize(aPosition, anObject)
+        super(aPosition, [])
+        @object = anObject
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param visitor [ASTVisitor] the visitor
+      def accept(visitor)
+        visitor.visit_set_expr(self)
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/ast/lox_this_expr.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'lox_node'
+
+module Loxxy
+  module Ast
+    # A node in a parse tree that represents the occurrence of 'this' keyword.
+    class LoxThisExpr < LoxNode
+      # Duck-typing: behaves like a LoxVarExpr
+      # @return [String] return the this keyword
+      def name
+        'this'
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param _visitor [LoxxyTreeVisitor] the visitor
+      def accept(aVisitor)
+        aVisitor.visit_this_expr(self)
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/back_end/engine.rb

@@ -69,24 +69,27 @@ module Loxxy
         # Do nothing, subnodes were already evaluated
       end
 
-      def after_class_stmt(aClassStmt, _visitor)
-        klass = LoxClass.new(aClassStmt.name, aClassStmt.methods, self)
+      def after_class_stmt(aClassStmt, aVisitor)
+        # Convert LoxFunStmt into LoxFunction
+        meths = aClassStmt.body.map do |func_node|
+          func_node.is_method = true
+          func_node.accept(aVisitor)
+          mth = stack.pop
+          mth.is_initializer = true if mth.name == 'init'
+          mth
+        end
+
+        klass = LoxClass.new(aClassStmt.name, meths, self)
         new_var = Variable.new(aClassStmt.name, klass)
         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)
@@ -153,6 +156,18 @@ module Loxxy
         variable.assign(value)
       end
 
+      def after_set_expr(aSetExpr, aVisitor)
+        value = stack.pop
+        # Evaluate object part
+        aSetExpr.object.accept(aVisitor)
+        assignee = stack.pop
+        unless assignee.kind_of?(LoxInstance)
+          raise StandardError, 'Only instances have fields.'
+        end
+
+        assignee.set(aSetExpr.property, value)
+      end
+
       def after_logical_expr(aLogicalExpr, visitor)
         op = aLogicalExpr.operator
         operand1 = stack.pop # only first operand was evaluated
@@ -221,20 +236,28 @@ 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
       end
 
+      def after_get_expr(aGetExpr, aVisitor)
+        aGetExpr.object.accept(aVisitor)
+        instance = stack.pop
+        unless instance.kind_of?(LoxInstance)
+          raise StandardError, 'Only instances have properties.'
+        end
+
+        stack.push instance.get(aGetExpr.property)
+      end
+
       def after_grouping_expr(_groupingExpr)
         # Do nothing: work was already done by visiting /evaluating the subexpression
       end
@@ -242,7 +265,7 @@ module Loxxy
       def after_variable_expr(aVarExpr, aVisitor)
         var_name = aVarExpr.name
         var = variable_lookup(aVarExpr)
-        raise StandardError, "Unknown variable #{var_name}" unless var
+        raise StandardError, "Undefined variable '#{var_name}'." unless var
 
         var.value.accept(aVisitor) # Evaluate variable value then push on stack
       end
@@ -252,6 +275,11 @@ module Loxxy
         stack.push(literalExpr.literal)
       end
 
+      def after_this_expr(aThisExpr, aVisitor)
+        var = variable_lookup(aThisExpr)
+        var.value.accept(aVisitor) # Evaluate this value then push on stack
+      end
+
       # @param aValue [Ast::BuiltinDattype] the built-in datatype value
       def before_visit_builtin(aValue)
         stack.push(aValue)
@@ -259,8 +287,12 @@ module Loxxy
 
       def after_fun_stmt(aFunStmt, _visitor)
         function = LoxFunction.new(aFunStmt.name, aFunStmt.params, aFunStmt.body, self)
-        new_var = Variable.new(aFunStmt.name, function)
-        symbol_table.insert(new_var)
+        if aFunStmt.is_method
+          stack.push function
+        else
+          new_var = Variable.new(aFunStmt.name, function)
+          symbol_table.insert(new_var)
+        end
       end
 
       private

data/lib/loxxy/back_end/environment.rb

@@ -37,7 +37,6 @@ module Loxxy
       # @return [BackEnd::Variable] the variable
       def insert(anEntry)
         e = validated_entry(anEntry)
-        # e.suffix = default_suffix if e.kind_of?(BackEnd::Variable)
         defns[e.name] = e
 
         e

data/lib/loxxy/back_end/lox_class.rb

@@ -10,15 +10,18 @@ module Loxxy
       # @return [String] The name of the class
       attr_reader :name
 
-      # @return [Array<>] the list of methods
-      attr_reader :methods
+      # @return [Hash{String => LoxFunction}] the list of methods
+      attr_reader :meths
       attr_reader :stack
 
       # Create a class with given name
       # @param aName [String] The name of the class
       def initialize(aName, theMethods, anEngine)
         @name = aName.dup
-        @methods = theMethods
+        @meths = {}
+        theMethods.each do |func|
+          meths[func.name] = func
+        end
         @stack = anEngine.stack
       end
 
@@ -27,14 +30,26 @@ 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
 
+      # @param aName [String] the method name to search for
+      def find_method(aName)
+        meths[aName]
+      end
+
       # Logical negation.
       # As a function is a truthy thing, its negation is thus false.
       # @return [Datatype::False]

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,10 +50,24 @@ 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
 
+      def bind(anInstance)
+        new_env = Environment.new(closure)
+        this = Variable.new('this', anInstance)
+        new_env.insert(this)
+        bound_method = dup
+        bound_method.instance_variable_set(:@closure, new_env)
+
+        bound_method
+      end
+
       # Logical negation.
       # As a function is a truthy thing, its negation is thus false.
       # @return [Datatype::False]

data/lib/loxxy/back_end/lox_instance.rb

@@ -6,26 +6,49 @@ module Loxxy
   module BackEnd
     # Runtime representation of a Lox object (instance).
     class LoxInstance
-      # @return BackEnd::LoxClass] the class this this object belong
+      # @return BackEnd::LoxClass] the class that this object is an instance of
       attr_reader :klass
 
-      attr_reader :stack
+      attr_reader :engine
+
+      # @return [Hash{String => BuiltinDatatype | LoxFunction | LoxInstance }]
+      attr_reader :fields
 
       # Create an instance from given class
       # @param aClass [BackEnd::LoxClass] the class this this object belong
       def initialize(aClass, anEngine)
         @klass = aClass
-        @stack = anEngine.stack
+        @engine = anEngine
+        @fields = {}
       end
 
       def accept(_visitor)
-        stack.push self
+        engine.stack.push self
       end
 
       # Text representation of a Lox instance
       def to_str
         "#{klass.to_str} instance"
       end
+
+      # Look up the value of property with given name
+      # aName [String] name of object property
+      def get(aName)
+        return fields[aName] if fields.include? aName
+
+        method = klass.find_method(aName)
+        unless method
+          raise StandardError, "Undefined property '#{aName}'."
+        end
+
+        method.bind(self)
+      end
+
+      # Set the value of property with given name
+      # aName [String] name of object property
+      def set(aName, aValue)
+        fields[aName] = aValue
+      end
     end # class
   end # module
 end # module

data/lib/loxxy/back_end/resolver.rb

@@ -26,10 +26,15 @@ module Loxxy
       # @return [Symbol] must be one of: :none, :function
       attr_reader :current_function
 
+      # An indicator that tells we're in the middle of a class declaration
+      # @return [Symbol] must be one of: :none, :class
+      attr_reader :current_class
+
       def initialize
         @scopes = []
         @locals = {}
         @current_function = :none
+        @current_class = :none
       end
 
       # Given an abstract syntax parse tree visitor, launch the visit
@@ -58,8 +63,18 @@ module Loxxy
         declare(aClassStmt.name)
       end
 
-      def after_class_stmt(aClassStmt, _visitor)
+      def after_class_stmt(aClassStmt, aVisitor)
+        previous_class = current_class
+        @current_class = :class
         define(aClassStmt.name)
+        begin_scope
+        define('this')
+        aClassStmt.body.each do |fun_stmt|
+          mth_type = fun_stmt.name == 'init' ? :initializer : :method
+          resolve_function(fun_stmt, mth_type, aVisitor)
+        end
+        end_scope
+        @current_class = previous_class
       end
 
       def before_for_stmt(aForStmt)
@@ -78,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
@@ -88,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)
@@ -109,6 +129,11 @@ module Loxxy
         resolve_local(anAssignExpr, aVisitor)
       end
 
+      def after_set_expr(aSetExpr, aVisitor)
+        # Evaluate object part
+        aSetExpr.object.accept(aVisitor)
+      end
+
       # Variable expressions require their variables resolved
       def before_variable_expr(aVarExpr)
         var_name = aVarExpr.name
@@ -127,6 +152,23 @@ module Loxxy
         aCallExpr.arguments.reverse_each { |arg| arg.accept(aVisitor) }
       end
 
+      def after_get_expr(aGetExpr, aVisitor)
+        # Evaluate object part
+        aGetExpr.object.accept(aVisitor)
+      end
+
+      def before_this_expr(_thisExpr)
+        if current_class == :none
+          msg = "Error at 'this': Can't use 'this' outside of a class."
+          raise StandardError, msg
+        end
+      end
+
+      def after_this_expr(aThisExpr, aVisitor)
+        # 'this' behaves closely to a local variable
+        resolve_local(aThisExpr, aVisitor)
+      end
+
       # function declaration creates a new scope for its body & binds its parameters for that scope
       def before_fun_stmt(aFunStmt, aVisitor)
         declare(aFunStmt.name)

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/front_end/grammar.rb

@@ -35,7 +35,7 @@ module Loxxy
       rule('declaration' => 'classDecl')
       rule('declaration' => 'funDecl')
       rule('declaration' => 'varDecl')
-      rule('declaration' => 'statement')
+      rule('declaration' => 'stmt')
 
       rule('classDecl' => 'CLASS classNaming class_body').as 'class_decl'
       rule('classNaming' => 'IDENTIFIER LESS IDENTIFIER')
@@ -52,6 +52,8 @@ module Loxxy
       rule('varDecl' => 'VAR IDENTIFIER EQUAL expression SEMICOLON').as 'var_initialization'
 
       # Statements: produce side effects, but don't introduce bindings
+      rule('stmt' => 'statement')
+      rule('stmt' => 'unbalancedStmt') # Tweak to cope with "dangling else" problem
       rule('statement' => 'exprStmt')
       rule('statement' => 'forStmt')
       rule('statement' => 'ifStmt')
@@ -70,10 +72,10 @@ module Loxxy
       rule('forTest' => 'expression_opt SEMICOLON').as 'for_test'
       rule('forUpdate' => 'expression_opt')
 
-      rule('ifStmt' => 'IF ifCondition statement elsePart_opt').as 'if_stmt'
+      rule('ifStmt' => 'IF ifCondition statement ELSE statement').as 'if_else_stmt'
+      rule('unbalancedStmt' => 'IF ifCondition stmt').as 'if_stmt'
+      rule('unbalancedStmt' => 'IF ifCondition statement ELSE unbalancedStmt').as 'if_else_stmt'
       rule('ifCondition' => 'LEFT_PAREN expression RIGHT_PAREN').as 'keep_symbol2'
-      rule('elsePart_opt' => 'ELSE statement').as 'keep_symbol2'
-      rule('elsePart_opt' => [])
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'
       rule('returnStmt' => 'RETURN expression_opt SEMICOLON').as 'return_stmt'
@@ -87,7 +89,7 @@ module Loxxy
       rule('expression' => 'assignment')
       rule('assignment' => 'owner_opt IDENTIFIER EQUAL assignment').as 'assign_expr'
       rule('assignment' => 'logic_or')
-      rule('owner_opt' => 'call DOT')
+      rule('owner_opt' => 'call DOT').as 'set_expr'
       rule('owner_opt' => [])
       rule('logic_or' => 'logic_and')
       rule('logic_or' => 'logic_and disjunct_plus').as 'logical_expr'
@@ -132,11 +134,11 @@ module Loxxy
       rule('refinement_plus' => 'refinement_plus refinement').as 'refinement_plus_more'
       rule('refinement_plus' => 'refinement').as 'refinement_plus_end'
       rule('refinement' => 'LEFT_PAREN arguments_opt RIGHT_PAREN').as 'call_arglist'
-      rule('refinement' => 'DOT IDENTIFIER')
+      rule('refinement' => 'DOT IDENTIFIER').as 'get_expr'
       rule('primary' => 'TRUE').as 'literal_expr'
       rule('primary' => 'FALSE').as 'literal_expr'
       rule('primary' => 'NIL').as 'literal_expr'
-      rule('primary' => 'THIS')
+      rule('primary' => 'THIS').as 'this_expr'
       rule('primary' => 'NUMBER').as 'literal_expr'
       rule('primary' => 'STRING').as 'literal_expr'
       rule('primary' => 'IDENTIFIER').as 'variable_expr'

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.12'
+  VERSION = '0.1.17'
 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/front_end/parser_spec.rb

@@ -305,6 +305,83 @@ LOX_END
           expect(expr.operands[1].operands[1].literal.value).to eq(5)
         end
       end # context
+
+      context 'Object orientation:' do
+        it 'should parse object property get access' do
+          input = 'print someObject.someProperty;'
+          ptree = subject.parse(input)
+          expr = ptree.root.subnodes[0]
+          expect(expr).to be_kind_of(Ast::LoxPrintStmt)
+          get_expr = expr.subnodes[0]
+          expect(get_expr).to be_kind_of(Ast::LoxGetExpr)
+          expect(get_expr.object.name).to eq('someObject')
+          expect(get_expr.property).to eq('someProperty')
+        end
+
+        it 'should parse nested call expressions' do
+          input = 'print egg.scramble(3).with(cheddar);'
+          # From section 12.3.1, one expects something like:
+          # LoxCallExpr
+          # +- arguments = ['cheddar']
+          # +- callee = LoxGetExpr
+          #    +- property = 'with'
+          #    +- object = LoxCallExpr
+          #       +- arguments = [3]
+          #       +- callee = LoxGetExpr
+          #          +- property = 'scramble'
+          #          +- object = variable 'egg'
+          ptree = subject.parse(input)
+          print_stmt = ptree.root.subnodes[0]
+          expect(print_stmt).to be_kind_of(Ast::LoxPrintStmt)
+          outer_call = print_stmt.subnodes[0]
+          expect(outer_call).to be_kind_of(Ast::LoxCallExpr)
+          expect(outer_call.arguments[0].name).to eq('cheddar')
+          expect(outer_call.callee).to be_kind_of(Ast::LoxGetExpr)
+          expect(outer_call.callee.property).to eq('with')
+          inner_call = outer_call.callee.object
+          expect(inner_call).to be_kind_of(Ast::LoxCallExpr)
+          expect(inner_call.arguments[0].literal).to eq(3)
+          expect(inner_call.callee).to be_kind_of(Ast::LoxGetExpr)
+          expect(inner_call.callee.property).to eq('scramble')
+          expect(inner_call.callee.object.name).to eq('egg')
+        end
+
+        it 'should parse object property set access' do
+          input = 'someObject.someProperty = value;'
+          ptree = subject.parse(input)
+          expr = ptree.root.subnodes[0]
+          expect(expr).to be_kind_of(Ast::LoxSetExpr)
+          expect(expr.object.name).to eq('someObject')
+          expect(expr.property).to eq('someProperty')
+          expect(expr.subnodes[0]).to be_kind_of(Ast::LoxVariableExpr)
+          expect(expr.subnodes[0].name).to eq('value')
+        end
+
+        it 'should parse complex set access' do
+          input = 'breakfast.omelette.filling.meat = ham;'
+          # From section 12.3.2, one expects something like:
+          # LoxSetExpr
+          # +- property = 'meat'
+          # +- subnodes[0] = LoxVariableExpr 'ham'
+          # +- object = LoxGetExpr
+          #    +- property = 'filling'
+          #    +- object = LoxGetExpr
+          #       +- property = 'omelette'
+          #       +- object = LoxVariableExpr 'breakfast'
+          ptree = subject.parse(input)
+          expr = ptree.root.subnodes[0]
+          expect(expr).to be_kind_of(Ast::LoxSetExpr)
+          expect(expr.property).to eq('meat')
+          expect(expr.subnodes[0]).to be_kind_of(Ast::LoxVariableExpr)
+          expect(expr.subnodes[0].name).to eq('ham')
+          expect(expr.object).to be_kind_of(Ast::LoxGetExpr)
+          expect(expr.object.property).to eq('filling')
+          expect(expr.object.object).to be_kind_of(Ast::LoxGetExpr)
+          expect(expr.object.object.property).to eq('omelette')
+          expect(expr.object.object.object).to be_kind_of(Ast::LoxVariableExpr)
+          expect(expr.object.object.object.name).to eq('breakfast')
+        end
+      end # context
     end # describe
   end # module
 end # module

data/spec/front_end/raw_parser_spec.rb

@@ -76,8 +76,11 @@ LOX_END
           expect(decls.symbol.name).to eq('declaration_plus')
           stmt = decls.subnodes[0].subnodes[0]
           expect(stmt).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(stmt.symbol.name).to eq('statement')
-          prnt_stmt = stmt.subnodes[0]
+          expect(stmt.symbol.name).to eq('stmt')
+          statement = stmt.subnodes[0]
+          expect(statement).to be_kind_of(Rley::PTree::NonTerminalNode)
+          expect(statement.symbol.name).to eq('statement')
+          prnt_stmt = statement.subnodes[0]
           expect(prnt_stmt).to be_kind_of(Rley::PTree::NonTerminalNode)
           expect(prnt_stmt.subnodes.size).to eq(3)
           expect(prnt_stmt.subnodes[0]).to be_kind_of(Rley::PTree::TerminalNode)

data/spec/interpreter_spec.rb

@@ -227,19 +227,20 @@ module Loxxy
           # Evaluate the 'then' expression if the condition is true.
           ['if (true) print "then-branch";', 'then-branch'],
           ['if (false) print "ignored";', ''],
-          # TODO: test with then block body
-          # TODO: test with assignment in if condition
+          ['if (nil) print "ignored";', ''],
+          ['if (true) { print "block"; }', 'block'],
+          ['var a = false; if (a = true) print a;', 'true'],
 
           # Evaluate the 'else' expression if the condition is false.
           ['if (true) print "then-branch"; else print "else-branch";', 'then-branch'],
           ['if (false) print "then-branch"; else print "else-branch";', 'else-branch'],
           ['if (0) print "then-branch"; else print "else-branch";', 'then-branch'],
-          ['if (nil) print "then-branch"; else print "else-branch";', 'else-branch']
-          # TODO: test with else block body
+          ['if (nil) print "then-branch"; else print "else-branch";', 'else-branch'],
+          ['if (false) nil; else { print "else-branch"; }', 'else-branch'],
 
-          # TODO: A dangling else binds to the right-most if.
-          # ['if (true) if (false) print "bad"; else print "good";', 'good'],
-          # ['if (false) if (true) print "bad"; else print "worse";', 'bad']
+          # A dangling else binds to the right-most if.
+          ['if (true) if (false) print "bad"; else print "good";', 'good'],
+          ['if (false) if (true) print "bad"; else print "worse";', '']
         ].each do |(source, predicted)|
           io = StringIO.new
           cfg = { ostream: io }
@@ -451,44 +452,144 @@ LOX_END
       end
       # rubocop: enable Style/StringConcatenation
 
-      it 'should support class declaration' do
+      it 'should print the hello world message' do
         program = <<-LOX_END
+          var greeting = "Hello"; // Declaring a variable
+          print greeting + ", " + "world!"; // ... Playing with concatenation
+        LOX_END
+        expect { subject.evaluate(program) }.not_to raise_error
+        expect(sample_cfg[:ostream].string).to eq('Hello, world!')
+      end
+    end # context
+
+    context 'Object orientation:' do
+      let(:duck_class) do
+        snippet = <<-LOX_END
           class Duck {
             noise() {
-              quack();
+              this.quack();
             }
 
             quack() {
               print "quack";
             }
           }
-          print Duck;
+        LOX_END
+
+        snippet
+      end
+
+      it 'should support class declaration' do
+        program = <<-LOX_END
+          #{duck_class}
+
+          print Duck; // Class names can appear in statements
         LOX_END
         expect { subject.evaluate(program) }.not_to raise_error
         expect(sample_cfg[:ostream].string).to eq('Duck')
       end
 
-      it 'should support instance creation' do
+      it 'should support default instance creation' do
         program = <<-LOX_END
-          class Duck {
-            quack() {
-              print "quack";
-            }
-          }
-          var daffy = Duck();
+          #{duck_class}
+
+          var daffy = Duck(); // Default constructor
           print daffy;
         LOX_END
         expect { subject.evaluate(program) }.not_to raise_error
         expect(sample_cfg[:ostream].string).to eq('Duck instance')
       end
 
-      it 'should print the hello world message' do
+      it 'should support calls to method' do
         program = <<-LOX_END
-          var greeting = "Hello"; // Declaring a variable
-          print greeting + ", " + "world!"; // ... Playing with concatenation
+          #{duck_class}
+
+          var daffy = Duck(); // Default constructor
+          daffy.quack();
         LOX_END
         expect { subject.evaluate(program) }.not_to raise_error
-        expect(sample_cfg[:ostream].string).to eq('Hello, world!')
+        expect(sample_cfg[:ostream].string).to eq('quack')
+      end
+
+      it "should support the 'this' keyword" do
+        program = <<-LOX_END
+          class Egotist {
+            speak() {
+              print this;
+            }
+          }
+
+          var method = Egotist().speak;
+          method(); // Output: Egotist instance
+        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
+
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -97,6 +97,7 @@ files:
 - lib/loxxy/ast/lox_compound_expr.rb
 - lib/loxxy/ast/lox_for_stmt.rb
 - lib/loxxy/ast/lox_fun_stmt.rb
+- lib/loxxy/ast/lox_get_expr.rb
 - lib/loxxy/ast/lox_grouping_expr.rb
 - lib/loxxy/ast/lox_if_stmt.rb
 - lib/loxxy/ast/lox_literal_expr.rb
@@ -106,6 +107,8 @@ files:
 - lib/loxxy/ast/lox_print_stmt.rb
 - lib/loxxy/ast/lox_return_stmt.rb
 - lib/loxxy/ast/lox_seq_decl.rb
+- lib/loxxy/ast/lox_set_expr.rb
+- lib/loxxy/ast/lox_this_expr.rb
 - lib/loxxy/ast/lox_unary_expr.rb
 - lib/loxxy/ast/lox_var_stmt.rb
 - lib/loxxy/ast/lox_variable_expr.rb