loxxy 0.1.02 → 0.1.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddfc01e822c7e68c87d515649f6ef6e2c800c926ca289dfe9f65edeff24e7015
-  data.tar.gz: db5a6a8052c0c15f00920c6d76fcd8c6f9cfe380905c20b53f8e74cc7c6d4f84
+  metadata.gz: f171f0046ff95784ed21b369751ca65d25e0ff757d1b2dccc534087a4b9c4a8d
+  data.tar.gz: 579badf6a30436962cb18e63dfee1ed361cfd152e9fecf54f2bfd25395db086b
 SHA512:
-  metadata.gz: f5a85f8a0a4a762f43a9dd51ab972f924a95ed15ed9e864cef0c60f4815902cbfb905fef624cc100bae9283985f8f6c7f960fbd72bd8d87e9ee3ab211eb7dc24
-  data.tar.gz: 10522ab655b99e31007dccaa479b4ec59a9340160f6768c084c3b96825f4e89f9f1c46c1655117763d66f28004f5d8e2c193315c80a65dd49b733587bd25823a
+  metadata.gz: 0470f022b121ceaff279f75024e07b78a218c3baa4d44e6f9bf54f4ebddf18341b27f697fe68c727eb2d61add2c55e7c102fbf73bfd29ef4fb3965024247f747
+  data.tar.gz: 320dbb075351069f624103f1d93aadf903ec6a5b7bb685871f53227b496760ac67ae9fa1dae85491efd9b94cfeb90eac8f66e104b4f70eaac9b0da081dfde567

data/CHANGELOG.md

@@ -1,8 +1,68 @@
+## [0.1.07] - 2021-03-14
+- `Loxxy` now supports nested functions and closures
+
+### Changed
+- Method `Ast::AstBuilder#reduce_call_expr` now supports nested call expressions (e.g. `getCallback()();` )
+- Class `BackEnd::Environment`: added the attributes `predecessor` and `embedding` to support closures.
+- Class `BackeEnd::LoxFunction`: added the attribute `closure` that is equal to the environment where the function is declared.
+- Constructor `BackEnd::LoxFunction#new` now takes a `BackEnd::Engine`as its fourth parameter
+- Methods `BackEnd::SymbolTable#enter_environment`, `BackEnd::SymbolTable#leave_environment` take into account closures. 
+
+### Fixed
+- Method `Ast::AstBuilder#after_var_stmt` now takes into account the value from the top of stack
+
+
+
+
+## [0.1.06] - 2021-03-06
+- Parameters/arguments checks in function declaration and call
+
+### Changed
+- Method `Ast::AstBuilder#reduce_call_arglist` raises a `Loxxy::RuntimeError` when more than 255 arguments are used.
+- Method `BackEnd::Engine#after_call_expr` raises a `Loxxy::RuntimeError` when argument count doesn't match the arity of function.
+
+- Class `BackEnd::Function` renamed to `LoxFunction`
+
+## [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
+- Class `Ast::LoxReturnStmt` a node that represents a return statement
+- Method `Ast::ASTBuilder#reduce_return_stmt`
+- Method `Ast::ASTVisitor#visit_return_stmt` for visiting an `Ast::LoxReturnStmt` node
+- Method `BackEnd::Engine#after_return_stmt` to handle return statement
+- Method `BackEnd::Function#!` implementing the logical negation of a function (as value).
+- Test suite for logical operators (in project repository)
+- Test suite for block code
+- Test suite for call and function declaration (initial)
+
+### Changed
+- Method `BackEnd::Engine#after_call_expr` now generate a `catch` and `throw` events
+
+## [0.1.03] - 2021-02-26
+- Runtime argument checking for arithmetic and comparison operators
+
+### Added
+- Test suite for arithmetic and comparison operators (in project repository)
+- Class `BackEnd::UnaryOperator`:  runtime argument validation
+- Class `BackEnd::BinaryOperator`: runtime argument validation
+
+### Changed
+- File `console` renamed to `loxxy`. Very basic command-line interface.
+- Custom exception classes 
+- File `README.md` updated list of supported `Lox` keywords.
+
+
 ## [0.1.02] - 2021-02-21
 - Function definition and call documented in `README.md`
 
 ### Changed
-- File `README.md` updated todescribe function definition and function call.
+- File `README.md` updated description of function definition and function call.
 
 ### Fixed
 - Method `BackEnd::Engine#after_print_stmt` now handles of empty stack or nil data.
@@ -207,11 +267,11 @@
 - The interpreter can evaluate substraction between two numbers.
 
 ### Added
-- Method `Datatype::Number#-` implmenting the subtraction operation
+- Method `Datatype::Number#-` implementing the subtraction operation
 
 ### Changed
 - File `README.md` minor editorial changes.
-- File `lx_string_spec.rb` Added test for string concatentation
+- File `lx_string_spec.rb` Added test for string concatenation
 - File `number_spec.rb` Added tests for addition and subtraction operations
 - File `interpreter_spec.rb` Added tests for subtraction operation
 

data/README.md

@@ -15,7 +15,6 @@ a simple language used in Bob Nystrom's online book [Crafting Interpreters](http
 ### Current status
 The project is still in inception and the interpreter is being implemented...  
 Currently it can execute all allowed __Lox__ expressions and statements except:
-- Closures,  
 - Classes and objects.
 
 These will be implemented soon.
@@ -180,7 +179,8 @@ Loxxy supports single line C-style comments.
 ### Keywords
 Loxxy implements the following __Lox__ reserved keywords:
 ```lang-none
-and, false, nil, or, print, true
+and, else, false, for, fun, if,
+nil, or, print, true, var, while
 ```
 
 ### Datatypes

data/bin/loxxy

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'loxxy'
+
+if ARGV[0]
+lox = Loxxy::Interpreter.new
+File.open(ARGV[0], 'r') do |f|
+lox.evaluate(f.read)
+end
+end

data/lib/loxxy.rb

@@ -6,8 +6,6 @@ require_relative 'loxxy/front_end/raw_parser'
 
 # Namespace for all classes and constants of __loxxy__ gem.
 module Loxxy
-  class Error < StandardError; end
-
   # Shorthand method. Returns the sole object that represents
   # a Lox false literal.
   # @return [Loxxy::Datatype::False]

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -12,6 +12,7 @@ require_relative 'lox_logical_expr'
 require_relative 'lox_assign_expr'
 require_relative 'lox_block_stmt'
 require_relative 'lox_while_stmt'
+require_relative 'lox_return_stmt'
 require_relative 'lox_print_stmt'
 require_relative 'lox_if_stmt'
 require_relative 'lox_for_stmt'

data/lib/loxxy/ast/ast_builder.rb

@@ -221,6 +221,11 @@ module Loxxy
         Ast::LoxPrintStmt.new(tokens[1].position, theChildren[1])
       end
 
+      # rule('returnStmt' => 'RETURN expression_opt SEMICOLON')
+      def reduce_return_stmt(_production, _range, tokens, theChildren)
+        Ast::LoxReturnStmt.new(tokens[1].position, theChildren[1])
+      end
+
       # rule('whileStmt' => 'WHILE LEFT_PAREN expression RIGHT_PAREN statement').as ''
       def reduce_while_stmt(_production, _range, tokens, theChildren)
         Ast::LoxWhileStmt.new(tokens[1].position, theChildren[2], theChildren[4])
@@ -255,20 +260,33 @@ module Loxxy
 
       # rule('call' => 'primary refinement_plus').as 'call_expr'
       def reduce_call_expr(_production, _range, _tokens, theChildren)
-        theChildren[1].callee = theChildren[0]
-        theChildren[1]
+        members = theChildren.flatten
+        call_expr = nil
+        loop do
+          (callee, call_expr) = members.shift(2)
+          call_expr.callee = callee
+          members.unshift(call_expr)
+          break if members.size == 1
+        end
+
+        call_expr
+      end
+
+      # rule('refinement_plus' => 'refinement_plus refinement')
+      def reduce_refinement_plus_more(_production, _range, _tokens, theChildren)
+        theChildren[0] << theChildren[1]
       end
 
       # rule('refinement_plus' => 'refinement').
       def reduce_refinement_plus_end(_production, _range, _tokens, theChildren)
-        theChildren[0]
+        theChildren
       end
 
       # rule('refinement' => 'LEFT_PAREN arguments_opt RIGHT_PAREN')
       def reduce_call_arglist(_production, _range, tokens, theChildren)
         args = theChildren[1] || []
         if args.size > 255
-          raise StandardError, "Can't have more than 255 arguments."
+          raise Loxxy::RuntimeError, "Can't have more than 255 arguments."
         end
 
         LoxCallExpr.new(tokens[0].position, args)
@@ -298,6 +316,10 @@ module Loxxy
       def reduce_function(_production, _range, _tokens, theChildren)
         first_child = theChildren.first
         pos = first_child.token.position
+        if theChildren[2] && theChildren[2].size > 255
+          msg = "Can't have more than 255 parameters."
+          raise Loxxy::SyntaxError, msg
+        end
         LoxFunStmt.new(pos, first_child.token.lexeme, theChildren[2], theChildren[4])
       end
 

data/lib/loxxy/ast/ast_visitor.rb

@@ -91,6 +91,14 @@ module Loxxy
         broadcast(:after_print_stmt, aPrintStmt)
       end
 
+      # Visit event. The visitor is about to visit a return statement.
+      # @param aReturnStmt [AST::LOXReturnStmt] the return statement node to visit
+      def visit_return_stmt(aReturnStmt)
+        broadcast(:before_return_stmt, aReturnStmt)
+        traverse_subnodes(aReturnStmt)
+        broadcast(:after_return_stmt, aReturnStmt, self)
+      end
+
       # Visit event. The visitor is about to visit a while statement node.
       # @param aWhileStmt [AST::LOXWhileStmt] the while statement node to visit
       def visit_while_stmt(aWhileStmt)

data/lib/loxxy/ast/lox_return_stmt.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'lox_compound_expr'
+
+module Loxxy
+  module Ast
+    class LoxReturnStmt < LoxCompoundExpr
+      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
+      # @param anExpression [Ast::LoxNode] expression to return
+      def initialize(aPosition, anExpression)
+        super(aPosition, [anExpression])
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param visitor [Ast::ASTVisitor] the visitor
+      def accept(visitor)
+        visitor.visit_return_stmt(self)
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/back_end/binary_operator.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require_relative '../error'
+
+module Loxxy
+  module BackEnd
+    Signature = Struct.new(:parameter_types)
+
+    # A Lox binary operator
+    class BinaryOperator
+      # @return [String] text representation of the operator
+      attr_reader :name
+
+      # @return [Array<Class>]
+      attr_reader :signatures
+
+      # @param aName [String] "name" of operator
+      # @param theSignatures [Array<Signature>] allowed signatures
+      def initialize(aName, theSignatures)
+        @name = aName
+        @signatures = theSignatures
+      end
+
+      # rubocop: disable Style/ClassEqualityComparison
+      def validate_operands(operand1, operand2)
+        compliant = signatures.find do |(type1, type2)|
+          next unless operand1.kind_of?(type1)
+
+          if type2 == :idem
+            (operand2.class == operand1.class)
+          else
+            operand2.kind_of?(type2)
+          end
+        end
+        # rubocop: enable Style/ClassEqualityComparison
+
+        unless compliant
+          err = Loxxy::RuntimeError
+          if signatures.size == 1 && signatures[0].last == :idem
+            raise err, "Operands must be #{datatype_name(signatures[0].first)}s."
+          elsif signatures.size == 2 && signatures.all? { |(_, second)| second == :idem }
+            type1 = datatype_name(signatures[0].first)
+            type2 = datatype_name(signatures[1].first)
+            raise err, "Operands must be two #{type1}s or two #{type2}s."
+          end
+        end
+      end
+
+      private
+
+      def datatype_name(aClass)
+        # (?:(?:[^:](?!:|(?<=LX))))+$
+        aClass.name.sub(/^.+(?=::)::(?:LX)?/, '').downcase
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/back_end/engine.rb

@@ -2,8 +2,10 @@
 
 # Load all the classes implementing AST nodes
 require_relative '../ast/all_lox_nodes'
-require_relative 'function'
+require_relative 'binary_operator'
+require_relative 'lox_function'
 require_relative 'symbol_table'
+require_relative 'unary_operator'
 
 module Loxxy
   module BackEnd
@@ -17,16 +19,26 @@ module Loxxy
       # @return [BackEnd::SymbolTable]
       attr_reader :symbol_table
 
-      # @return [Array<Datatype::BuiltinDatatyp>] Stack for the values of expr
+      # @return [Array<Datatype::BuiltinDatatype>] Data stack for the expression results
       attr_reader :stack
 
+     # @return [Hash { Symbol => UnaryOperator}]
+      attr_reader :unary_operators
+
+      # @return [Hash { Symbol => BinaryOperator}]
+      attr_reader :binary_operators
+
       # @param theOptions [Hash]
       def initialize(theOptions)
         @config = theOptions
         @ostream = config.include?(:ostream) ? config[:ostream] : $stdout
         @symbol_table = SymbolTable.new
         @stack = []
+        @unary_operators = {}
+        @binary_operators = {}
 
+        init_unary_operators
+        init_binary_operators
         init_globals
       end
 
@@ -50,7 +62,7 @@ module Loxxy
       end
 
       def after_var_stmt(aVarStmt)
-        new_var = Variable.new(aVarStmt.name, aVarStmt.subnodes[0])
+        new_var = Variable.new(aVarStmt.name, stack.pop)
         symbol_table.insert(new_var)
       end
 
@@ -86,6 +98,10 @@ module Loxxy
         @ostream.print tos ? tos.to_str : 'nil'
       end
 
+      def after_return_stmt(_returnStmt, _aVisitor)
+        throw(:return)
+      end
+
       def after_while_stmt(aWhileStmt, aVisitor)
         loop do
           condition = stack.pop
@@ -110,9 +126,8 @@ module Loxxy
         variable = symbol_table.lookup(var_name)
         raise StandardError, "Unknown variable #{var_name}" unless variable
 
-        value = stack.pop
+        value = stack.last # ToS remains since an assignment produces a value
         variable.assign(value)
-        stack.push value # An expression produces a value
       end
 
       def after_logical_expr(aLogicalExpr, visitor)
@@ -148,9 +163,11 @@ module Loxxy
       end
 
       def after_binary_expr(aBinaryExpr)
-        op = aBinaryExpr.operator
         operand2 = stack.pop
         operand1 = stack.pop
+        op = aBinaryExpr.operator
+        operator = binary_operators[op]
+        operator.validate_operands(operand1, operand2)
         if operand1.respond_to?(op)
           stack.push operand1.send(op, operand2)
         else
@@ -160,12 +177,14 @@ module Loxxy
       end
 
       def after_unary_expr(anUnaryExpr)
-        op = anUnaryExpr.operator
         operand = stack.pop
+        op = anUnaryExpr.operator
+        operator = unary_operators[op]
+        operator.validate_operand(operand)
         if operand.respond_to?(op)
           stack.push operand.send(op)
         else
-          msg1 = "`#{op}': Unimplemented operator for a #{operand1.class}."
+          msg1 = "`#{op}': Unimplemented operator for a #{operand.class}."
           raise StandardError, msg1
         end
       end
@@ -176,18 +195,18 @@ module Loxxy
         callee = stack.pop
         aCallExpr.arguments.reverse_each { |arg| arg.accept(aVisitor) }
 
-        if callee.kind_of?(NativeFunction)
+        case callee
+        when NativeFunction
           stack.push callee.call # Pass arguments
-        else
-          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)
+        when LoxFunction
+          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(aVisitor)
-
-          symbol_table.leave_environment
+          callee.call(self, aVisitor)
+        else
+          raise Loxxy::RuntimeError, 'Can only call functions and classes.'
         end
       end
 
@@ -214,7 +233,7 @@ module Loxxy
       end
 
       def after_fun_stmt(aFunStmt, _visitor)
-        function = Function.new(aFunStmt.name, aFunStmt.params, aFunStmt.body, stack)
+        function = LoxFunction.new(aFunStmt.name, aFunStmt.params, aFunStmt.body, self)
         new_var = Variable.new(aFunStmt.name, function)
         symbol_table.insert(new_var)
       end
@@ -235,6 +254,48 @@ module Loxxy
         end
       end
 
+      def init_unary_operators
+        negate_op = UnaryOperator.new('-', [Datatype::Number])
+        unary_operators[:-@] = negate_op
+
+        negation_op = UnaryOperator.new('!', [Datatype::BuiltinDatatype,
+          BackEnd::LoxFunction])
+        unary_operators[:!] = negation_op
+      end
+
+      def init_binary_operators
+        plus_op = BinaryOperator.new('+', [[Datatype::Number, :idem],
+          [Datatype::LXString, :idem]])
+        binary_operators[:+] = plus_op
+
+        minus_op = BinaryOperator.new('-', [[Datatype::Number, :idem]])
+        binary_operators[:-] = minus_op
+
+        star_op = BinaryOperator.new('*', [[Datatype::Number, :idem]])
+        binary_operators[:*] = star_op
+
+        slash_op = BinaryOperator.new('/', [[Datatype::Number, :idem]])
+        binary_operators[:/] = slash_op
+
+        equal_equal_op = BinaryOperator.new('==', [[Datatype::BuiltinDatatype, Datatype::BuiltinDatatype]])
+        binary_operators[:==] = equal_equal_op
+
+        not_equal_op = BinaryOperator.new('!=', [[Datatype::BuiltinDatatype, Datatype::BuiltinDatatype]])
+        binary_operators[:!=] = not_equal_op
+
+        less_op = BinaryOperator.new('<', [[Datatype::Number, :idem]])
+        binary_operators[:<] = less_op
+
+        less_equal_op = BinaryOperator.new('<=', [[Datatype::Number, :idem]])
+        binary_operators[:<=] = less_equal_op
+
+        greater_op = BinaryOperator.new('>', [[Datatype::Number, :idem]])
+        binary_operators[:>] = greater_op
+
+        greater_equal_op = BinaryOperator.new('>=', [[Datatype::Number, :idem]])
+        binary_operators[:>=] = greater_equal_op
+      end
+
       def init_globals
         add_native_fun('clock', native_clock)
       end

data/lib/loxxy/back_end/environment.rb

@@ -9,10 +9,17 @@ module Loxxy
     # of a relation or a relation definition.
     # It contains a map of names to the objects they name (e.g. logical var)
     class Environment
-      # The  enclosing (parent) environment.
+      # The enclosing (parent) environment.
       # @return [Environment, NilClass]
       attr_accessor :enclosing
 
+      # The previous environment in the environment chain.
+      # @return [Environment, NilClass]
+      attr_accessor :predecessor
+
+      # @return [Boolean] true if this environment is part of a closure (contains an embedded function)
+      attr_accessor :embedding
+
       # Mapping from user-defined name to related definition
       #  (say, a variable object)
       # @return [Hash{String => Variable}] Pairs of the kind

data/lib/loxxy/back_end/lox_function.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require_relative '../datatype/all_datatypes'
+
+module Loxxy
+  module BackEnd
+    # rubocop: disable Style/AccessorGrouping
+    # Representation of a Lox function.
+    # It is a named slot that can be associated with a value at the time.
+    class LoxFunction
+      # @return [String] The name of the function (if any)
+      attr_reader :name
+
+      # @return [Array<>] the parameters
+      attr_reader :parameters
+      attr_reader :body
+      attr_reader :stack
+      attr_reader :closure
+
+      # Create a function with given name
+      # @param aName [String] The name of the variable
+      def initialize(aName, parameterList, aBody, anEngine)
+        @name = aName.dup
+        @parameters = parameterList
+        @body = aBody.kind_of?(Ast::LoxNoopExpr) ? aBody : aBody.subnodes[0]
+        @stack = anEngine.stack
+        @closure = anEngine.symbol_table.current_env
+        anEngine.symbol_table.current_env.embedding = true
+      end
+
+      def arity
+        parameters ? parameters.size : 0
+      end
+
+      def accept(_visitor)
+        stack.push self
+      end
+
+      def call(engine, aVisitor)
+        # new_env = Environment.new(engine.symbol_table.current_env)
+        new_env = Environment.new(closure)
+        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.
+      # As a function is a truthy thing, its negation is thus false.
+      # @return [Datatype::False]
+      def !
+        Datatype::False.instance
+      end
+
+      # Text representation of a Lox function
+      def to_str
+        "<fn #{name}>"
+      end
+    end # class
+    # rubocop: enable Style/AccessorGrouping
+  end # module
+end # module

data/lib/loxxy/back_end/symbol_table.rb

@@ -44,23 +44,33 @@ module Loxxy
       # to be a child of current environment and to be itself the new current environment.
       # @param anEnv [BackEnd::Environment] the Environment that
       def enter_environment(anEnv)
-        anEnv.enclosing = current_env
+        if anEnv.enclosing && (anEnv.enclosing != current_env)
+          anEnv.predecessor = current_env
+        else
+          anEnv.enclosing = current_env
+        end
         @current_env = anEnv
       end
 
       def leave_environment
-        current_env.defns.each_pair do |nm, _item|
-          environments = name2envs[nm]
-          if environments.size == 1
-            name2envs.delete(nm)
-          else
-            environments.pop
-            name2envs[nm] = environments
+        unless current_env.embedding
+          current_env.defns.each_pair do |nm, _item|
+            environments = name2envs[nm]
+            if environments.size == 1
+              name2envs.delete(nm)
+            else
+              environments.pop
+              name2envs[nm] = environments
+            end
           end
         end
         raise StandardError, 'Cannot remove root environment.' if current_env == root
 
-        @current_env = current_env.enclosing
+        if current_env.predecessor
+          @current_env = current_env.predecessor
+        else
+          @current_env = current_env.enclosing
+        end
       end
 
       # Add an entry with given name to current environment.

data/lib/loxxy/back_end/unary_operator.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative '../error'
+
+module Loxxy
+  module BackEnd
+    # A Lox unary operator
+    class UnaryOperator
+      # @return [String] text representation of the operator
+      attr_reader :name
+
+      # @return [Array<Class>]
+      attr_reader :signatures
+
+      # @param aName [String] "name" of operator
+      # @param theSignatures [Array<Class>] allowed signatures
+      def initialize(aName, theSignatures)
+        @name = aName
+        @signatures = theSignatures
+      end
+
+      def validate_operand(operand1)
+        compliant = signatures.find { |some_type| operand1.kind_of?(some_type) }
+
+        unless compliant
+          err = Loxxy::RuntimeError
+          # if signatures.size == 1
+          raise err, "Operand must be a #{datatype_name(signatures[0])}."
+          # end
+        end
+      end
+
+      private
+
+      def datatype_name(aClass)
+        # (?:(?:[^:](?!:|(?<=LX))))+$
+        aClass.name.sub(/^.+(?=::)::(?:LX)?/, '').downcase
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/error.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Loxxy
+  # Abstract class. Generalization of Loxxy error classes.
+  class Error < StandardError; end
+
+  # Error occurring while Loxxy executes some invalid Lox code.
+  class RuntimeError < Error; end
+
+  # Error occurring while Loxxy parses some invalid Lox code.
+  class SyntaxError < Error; end
+end

data/lib/loxxy/front_end/grammar.rb

@@ -74,7 +74,7 @@ module Loxxy
       rule('elsePart_opt' => [])
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'
-      rule('returnStmt' => 'RETURN expression_opt SEMICOLON')
+      rule('returnStmt' => 'RETURN expression_opt SEMICOLON').as 'return_stmt'
       rule('whileStmt' => 'WHILE LEFT_PAREN expression RIGHT_PAREN statement').as 'while_stmt'
       rule('block' => 'LEFT_BRACE declaration_plus RIGHT_BRACE').as 'block_stmt'
       rule('block' => 'LEFT_BRACE RIGHT_BRACE').as 'block_empty'
@@ -127,7 +127,7 @@ module Loxxy
       rule('unaryOp' => 'MINUS')
       rule('call' => 'primary')
       rule('call' => 'primary refinement_plus').as 'call_expr'
-      rule('refinement_plus' => 'refinement_plus refinement') # .as 'refinement_plus_more'
+      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')

data/lib/loxxy/front_end/scanner.rb

@@ -92,6 +92,7 @@ module Loxxy
 
       private
 
+      # rubocop: disable Lint/DuplicateBranch
       def _next_token
         skip_intertoken_spaces
         curr_ch = scanner.peek(1)
@@ -125,6 +126,7 @@ module Loxxy
 
         return token
       end
+      # rubocop: enable Lint/DuplicateBranch
 
       def build_token(aSymbolName, aLexeme)
         begin

data/lib/loxxy/version.rb

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

data/loxxy.gemspec

@@ -46,8 +46,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = '~> 2.4'
 
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = ['loxxy']
   spec.require_paths = ['lib']
 
   PkgExtending.pkg_files(spec)

data/spec/back_end/engine_spec.rb

@@ -36,6 +36,8 @@ module Loxxy
 
 
         it "should react to 'after_var_stmt' event" do
+          # Precondition: value to assign is on top of stack
+          subject.stack.push(greeting)
           expect { subject.after_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)

data/spec/interpreter_spec.rb

@@ -53,15 +53,6 @@ module Loxxy
     end # context
 
     context 'Evaluating Lox code:' do
-      let(:hello_world) do
-        lox = <<-LOX_END
-        var greeting = "Hello"; // Declaring a variable
-        print greeting + ", " + "world!"; // ... Playing with concatenation
-LOX_END
-
-        lox
-      end
-
       it 'should evaluate core data types' do
         result = subject.evaluate('true; // Not false')
         expect(result).to be_kind_of(Loxxy::Datatype::True)
@@ -269,9 +260,9 @@ LOX_END
 
       it 'should accept variable mention' do
         program = <<-LOX_END
-        var foo = "bar";
-        print foo; // => bar
-LOX_END
+          var foo = "bar";
+          print foo; // => bar
+        LOX_END
         expect { subject.evaluate(program) }.not_to raise_error
         expect(sample_cfg[:ostream].string).to eq('bar')
       end
@@ -424,8 +415,48 @@ LOX_END
         expect(sample_cfg[:ostream].string).to eq('<fn foo><native fn>')
       end
 
+      it 'should support return statements' do
+        program = <<-LOX_END
+          fun max(a, b) {
+            if (a > b) return a;
+
+            return b;
+          }
+
+          max(3, 2);
+        LOX_END
+        result = subject.evaluate(program)
+        expect(result).to eq(3)
+      end
+
+      # rubocop: disable Style/StringConcatenation
+      it 'should support local functions and closures' do
+        program = <<-LOX_END
+          fun makeCounter() {
+            var i = 0;
+            fun count() {
+              i = i + 1;
+              print i;
+            }
+
+            return count;
+          }
+
+          var counter = makeCounter();
+          counter(); // "1".
+          counter(); // "2".
+        LOX_END
+        expect { subject.evaluate(program) }.not_to raise_error
+        expect(sample_cfg[:ostream].string).to eq('1' + '2')
+      end
+      # rubocop: enable Style/StringConcatenation
+
       it 'should print the hello world message' do
-        expect { subject.evaluate(hello_world) }.not_to raise_error
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.02
+  version: 0.1.07
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -69,7 +69,8 @@ dependencies:
 description: An implementation of the Lox programming language. WIP
 email:
 - famished.tiger@yahoo.com
-executables: []
+executables:
+- loxxy
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -83,6 +84,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/loxxy
 - lib/loxxy.rb
 - lib/loxxy/ast/all_lox_nodes.rb
 - lib/loxxy/ast/ast_builder.rb
@@ -101,16 +103,19 @@ files:
 - lib/loxxy/ast/lox_node.rb
 - lib/loxxy/ast/lox_noop_expr.rb
 - 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_unary_expr.rb
 - lib/loxxy/ast/lox_var_stmt.rb
 - lib/loxxy/ast/lox_variable_expr.rb
 - lib/loxxy/ast/lox_while_stmt.rb
+- lib/loxxy/back_end/binary_operator.rb
 - lib/loxxy/back_end/engine.rb
 - lib/loxxy/back_end/entry.rb
 - lib/loxxy/back_end/environment.rb
-- lib/loxxy/back_end/function.rb
+- lib/loxxy/back_end/lox_function.rb
 - lib/loxxy/back_end/symbol_table.rb
+- lib/loxxy/back_end/unary_operator.rb
 - lib/loxxy/back_end/variable.rb
 - lib/loxxy/datatype/all_datatypes.rb
 - lib/loxxy/datatype/boolean.rb
@@ -120,6 +125,7 @@ files:
 - lib/loxxy/datatype/nil.rb
 - lib/loxxy/datatype/number.rb
 - lib/loxxy/datatype/true.rb
+- lib/loxxy/error.rb
 - lib/loxxy/front_end/grammar.rb
 - lib/loxxy/front_end/literal.rb
 - lib/loxxy/front_end/parser.rb

data/lib/loxxy/back_end/function.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../datatype/all_datatypes'
-
-module Loxxy
-  module BackEnd
-    # rubocop: disable Style/AccessorGrouping
-    # Representation of a Lox function.
-    # It is a named slot that can be associated with a value at the time.
-    class Function
-      # @return [String]
-      attr_reader :name
-
-      # @return [Array<>] the parameters
-      attr_reader :parameters
-      attr_reader :body
-      attr_reader :stack
-
-      # Create a variable with given name and initial value
-      # @param aName [String] The name of the variable
-      # @param aValue [Datatype::BuiltinDatatype] the initial assigned value
-      def initialize(aName, parameterList, aBody, aStack)
-        @name = aName.dup
-        @parameters = parameterList
-        @body = aBody
-        @stack = aStack
-      end
-
-      def accept(_visitor)
-        stack.push self
-      end
-
-      def call(aVisitor)
-        body.empty? ? Datatype::Nil.instance : body.accept(aVisitor)
-      end
-
-      # Text representation of a Lox function
-      def to_str
-        "<fn #{name}>"
-      end
-    end # class
-    # rubocop: enable Style/AccessorGrouping
-  end # module
-end # module