loxxy 0.2.03 → 0.3.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb84858746525e4b5f6821e8168066f4af75b639e8320710cd36213ac72a65ed
-  data.tar.gz: 6ef7b9c8edcfdd1cda3aadfedeff6fef99c1194e92782c3dfe1b1abcc8052e96
+  metadata.gz: f6a77cf0f7f4cd0c445d597c534ecc1de82a31222d54a3d0da30330ccbcb216e
+  data.tar.gz: c10cab44247a3f7d75382c7a6bbfbc7938bce368ba14ea48878643ea7778aca5
 SHA512:
-  metadata.gz: 901731bc9670cab315c53e864430636c14c70b9c15d2218d81ae5657b40e5261b79d7ae7ff7937a638931a0c89af8d75f99a65973dd4cbd9a3418588f6388e87
-  data.tar.gz: fdedef4073b56af0e5bd2f348b15149dd80ab96d8814b5f0f114529372594ae661203509306603b6be8773976f577aaf73466d6a778a4596f11fd0d383c88dd6
+  metadata.gz: 5f76a5a66ff5ecdc76207802e195c7becdaf214cb687f9a62be1b58dc56d3ea0a9b3320bb2b8a105a72e3ff79801e3065eb3c10cab6246de2a4a5e74f4ebb722
+  data.tar.gz: eafb0e81fa6c6b5c8c3c2a017907b14e3a4ebadd04ec51cb9d79030905562e86ecf37d9e68511ff52ab4ae45eb598f8c7de4fa6344f90034f21635b8f2c983ff

data/CHANGELOG.md

@@ -1,3 +1,71 @@
+## [0.3.01] - 2021-05-08
+- Fix in `Scanner` class, added more tests in test suite.
+
+### New
+- Added the new subfolder `extra` under `test_suite`. It will contain tests for non-standard features or tests not covered in standard test suite.
+
+### Fixed
+- Class `FrontEnd::Scanner`: Couldn't correctly recognize a plus preceding directly a number literal
+
+## [0.3.00] - 2021-05-07
+- Milestone: `Loxxy` passes all reference test suite.
+
+### Fixed
+- Method `BackEnd::Resolver#before_variable_expr`: Standard `Lox` allows re-declaration of a variable at top-level scope 
+
+ 
+## [0.2.06] - 2021-05-04
+- Nearly passing the 'official' test suite, fixing non-compliant behavior, specialized exceptions for errors
+
+### New
+- Module `LoxFileTester` module that hosts methods that simplify the tests of `Lox` source file. 
+
+### Changed
+- Folder `test_suite` vastly reorganized. Sub-folder `baseline` contains spec files testing the `Lox` files from official implementation
+- Class `BackEnd::Engine` replaced most `StandardError` by `Loxxy::RuntimeError` exception.
+- Class `BackEnd::Resolver` replaced most `StandardError` by `Loxxy::RuntimeError` exception.
+- Method `Datatype::Number#/` now handles correctly expression like `0/0` (integer divide)
+
+### Fixed
+- `0/0` expression results in a ZeroDivisionError exception, in Lox this result to a NaN (Not a Number). Now, `Loxxy` is aligned to standard `Lox`
+- `FrontEnd::Scanner` now always treats expression like `-123` as the unary or binary minus operator applied to a positive number. 
+
+## [0.2.05] - 2021-04-26
+- `Loxxy` now transforms for loops into while loops (desugaring), fix in Scanner class
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_for_stmt` converts 'for' loops into 'while' loops
+- Method `Ast::ASTBuilder#reduce_for_control takes care of case for(expr1;;expr2) now test expression is set to true
+
+### Fixed
+- Method `FrontEnd::Scanner#next_token` keyword recognition was case insensitive
+
+### Removed
+- Method `Ast::Visitor#visitor_for_stmt`
+- Method `BackEnd::Engine#after_for_stmt`
+- Method `BackEnd::Resolver#before_for_stmt`
+- Method `BackEnd::Resolver#after_for_stmt`
+
+
+## [0.2.04] - 2021-04-25
+- `Loxxy` passes the test suite for `for` statements
+
+### Fixed
+- Method `BackEnd::Engine#after_for_stmt` now a for(;;) executes the body once; a for without test will execute forever
+- Method `BackEnd::Resolver#after_for_stmt now accepts nil test expression
+
+## [0.2.03] - 2021-04-24
+- Fixes for the set (field) expressions, `accept` methods for AST nodes are meta-programmed 
+
+### New
+- Module `Ast::Visitee` provides the `define_accept` method that generate `accept` method with meta-programming
+
+### Fixed
+- Method `BackEnd::Engine#before_set_expr` methos method that ensure that the receiver is evaluated first, then the assigned value
+- Method `BackEnd::Engine#after_set_expr` now pushes the value assigned to the field also onto the stack
+- Class `BackEnd::Engine` a number of StnadardError exceptions are replaced by Loxxy::RuntimeError
+
+
 ## [0.2.02] - 2021-04-21
 - Improvements in the scanner class (escape sequence for quotes and newlines), error messages closer to jlox.
 

data/README.md

@@ -19,11 +19,17 @@ Although __Lox__ is fairly simple, it is far from being a toy language:
 ### Loxxy gem features
 - Complete tree-walking interpreter including lexer, parser and resolver
 - 100% pure Ruby with clean design (not a port from some other language)
+- Passes the `jox` (THE reference `Lox` implementation) test suite  
 - Minimal runtime dependency (Rley gem). Won't drag a bunch of gems...  
 - Ruby API for integrating a Lox interpreter with your code.
 - A command-line interpreter `loxxy`
 - Open for your language extensions...
 
+### Why `Loxxy` ?
+- If programming languages are one of your subject interest...
+- ... and you wanted learn how to implement one in Ruby...
+- ... then `Loxxy` can help to understand and experiment in this rewarding craft.
+
 ## How to start in 1, 2, 3...?
 ... in less than 3 minutes...
 

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -19,7 +19,6 @@ 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'
 require_relative 'lox_var_stmt'
 require_relative 'lox_class_stmt'
 require_relative 'lox_seq_decl'

data/lib/loxxy/ast/ast_builder.rb

@@ -225,16 +225,39 @@ module Loxxy
       end
 
       # rule('forStmt' => 'FOR LEFT_PAREN forControl RIGHT_PAREN statement')
-      def reduce_for_stmt(_production, _range, _tokens, theChildren)
-        for_stmt = theChildren[2]
-        for_stmt.body_stmt = theChildren[4]
+      def reduce_for_stmt(_production, _range, tokens, theChildren)
+        # Following 'Crafting Interpreters', we replace the for statement by a while loop
+        return theChildren[4] if theChildren[2].compact.empty? # for(;;) => execute body once
+
+        (init, test, update) = theChildren[2]
+        if update
+          new_body = LoxSeqDecl.new(tokens[0].position, [theChildren[4], update])
+          stmt = Ast::LoxBlockStmt.new(tokens[1].position, new_body)
+        else
+          stmt = theChildren[4]
+        end
+        while_stmt = Ast::LoxWhileStmt.new(tokens[0].position, test, stmt)
+
+        if init
+          block_body = LoxSeqDecl.new(tokens[0].position, [init, while_stmt])
+          for_stmt = Ast::LoxBlockStmt.new(tokens[1].position, block_body)
+        else
+          for_stmt = while_stmt
+        end
+
         for_stmt
       end
 
       # rule('forControl' => 'forInitialization forTest forUpdate')
       def reduce_for_control(_production, _range, tokens, theChildren)
         (init, test, update) = theChildren
-        Ast::LoxForStmt.new(tokens[0].position, init, test, update)
+        if test.nil? && update
+          # when test expr is nil but update expr is not, then force test to be true
+          test = LoxLiteralExpr.new(tokens[0].position, Datatype::True.instance)
+          [init, test, update]
+        else
+          theChildren
+        end
       end
 
       # rule('forInitialization' => 'SEMICOLON')

data/lib/loxxy/ast/ast_visitor.rb

@@ -75,14 +75,6 @@ module Loxxy
         broadcast(:after_class_stmt, aClassStmt, self)
       end
 
-      # Visit event. The visitor is about to visit a for statement.
-      # @param aForStmt [AST::LOXForStmt] the for statement node to visit
-      def visit_for_stmt(aForStmt)
-        broadcast(:before_for_stmt, aForStmt)
-        traverse_subnodes(aForStmt) # The condition is visited/evaluated here...
-        broadcast(:after_for_stmt, aForStmt, self)
-      end
-
       # Visit event. The visitor is about to visit a if statement.
       # @param anIfStmt [AST::LOXIfStmt] the if statement node to visit
       def visit_if_stmt(anIfStmt)
@@ -111,7 +103,7 @@ module Loxxy
       # @param aWhileStmt [AST::LOXWhileStmt] the while statement node to visit
       def visit_while_stmt(aWhileStmt)
         broadcast(:before_while_stmt, aWhileStmt)
-        traverse_subnodes(aWhileStmt) # The condition is visited/evaluated here...
+        traverse_subnodes(aWhileStmt) if aWhileStmt.condition # The condition is visited/evaluated here...
         broadcast(:after_while_stmt, aWhileStmt, self)
       end
 

data/lib/loxxy/back_end/engine.rb

@@ -74,7 +74,7 @@ module Loxxy
           aClassStmt.superclass.accept(aVisitor)
           parent = stack.pop
           unless parent.kind_of?(LoxClass)
-            raise StandardError, 'Superclass must be a class.'
+            raise Loxxy::RuntimeError, 'Superclass must be a class.'
           end
         else
           parent = nil
@@ -116,19 +116,6 @@ module Loxxy
         before_block_stmt(aForStmt)
       end
 
-      def after_for_stmt(aForStmt, aVisitor)
-        loop do
-          aForStmt.test_expr.accept(aVisitor)
-          condition = stack.pop
-          break unless condition.truthy?
-
-          aForStmt.body_stmt.accept(aVisitor)
-          aForStmt.update_expr&.accept(aVisitor)
-          stack.pop
-        end
-        after_block_stmt(aForStmt)
-      end
-
       def after_if_stmt(anIfStmt, aVisitor)
         # Retrieve the result of the condition evaluation
         condition = stack.pop
@@ -154,7 +141,7 @@ module Loxxy
           break unless condition.truthy?
 
           aWhileStmt.body.accept(aVisitor)
-          aWhileStmt.condition.accept(aVisitor)
+          aWhileStmt.condition&.accept(aVisitor)
         end
       end
 
@@ -170,7 +157,7 @@ module Loxxy
       def after_assign_expr(anAssignExpr, _visitor)
         var_name = anAssignExpr.name
         variable = variable_lookup(anAssignExpr)
-        raise StandardError, "Unknown variable #{var_name}" unless variable
+        raise Loxxy::RuntimeError, "Undefined variable '#{var_name}'." unless variable
 
         value = stack.last # ToS remains since an assignment produces a value
         variable.assign(value)
@@ -231,7 +218,8 @@ module Loxxy
         operator = binary_operators[op]
         operator.validate_operands(operand1, operand2)
         if operand1.respond_to?(op)
-          stack.push operand1.send(op, operand2)
+          result = operand1.send(op, operand2)
+          stack.push convert2lox_datatype(result)
         else
           msg1 = "`#{op}': Unimplemented operator for a #{operand1.class}."
           raise StandardError, msg1
@@ -244,7 +232,8 @@ module Loxxy
         operator = unary_operators[op]
         operator.validate_operand(operand)
         if operand.respond_to?(op)
-          stack.push operand.send(op)
+          result = operand.send(op)
+          stack.push convert2lox_datatype(result)
         else
           msg1 = "`#{op}': Unimplemented operator for a #{operand.class}."
           raise StandardError, msg1
@@ -312,7 +301,7 @@ module Loxxy
         superklass = variable_lookup(aSuperExpr).value.superclass
         method = superklass.find_method(aSuperExpr.property)
         unless method
-          raise StandardError, "Undefined property '#{aSuperExpr.property}'."
+          raise Loxxy::RuntimeError, "Undefined property '#{aSuperExpr.property}'."
         end
 
         stack.push method.bind(instance)
@@ -367,7 +356,7 @@ module Loxxy
         unary_operators[:-@] = negate_op
 
         negation_op = UnaryOperator.new('!', [Datatype::BuiltinDatatype,
-          BackEnd::LoxFunction])
+          BackEnd::LoxInstance, BackEnd::LoxFunction, BackEnd::LoxClass])
         unary_operators[:!] = negation_op
       end
 
@@ -421,6 +410,15 @@ module Loxxy
           Datatype::Number.new(now)
         end
       end
+
+      def convert2lox_datatype(item)
+        case item
+        when TrueClass then Datatype::True.instance
+        when FalseClass then Datatype::False.instance
+        else
+          item
+        end
+      end
     end # class
   end # module
 end # module

data/lib/loxxy/back_end/resolver.rb

@@ -69,7 +69,7 @@ module Loxxy
         define(aClassStmt.name)
         if aClassStmt.superclass
           if aClassStmt.name == aClassStmt.superclass.name
-            raise StandardError, "'A class can't inherit from itself."
+            raise Loxxy::RuntimeError, "'A class can't inherit from itself."
           end
 
           @current_class = :subclass
@@ -88,17 +88,6 @@ module Loxxy
         @current_class = previous_class
       end
 
-      def before_for_stmt(aForStmt)
-        before_block_stmt(aForStmt)
-      end
-
-      def after_for_stmt(aForStmt, aVisitor)
-        aForStmt.test_expr.accept(aVisitor)
-        aForStmt.body_stmt.accept(aVisitor)
-        aForStmt.update_expr&.accept(aVisitor)
-        after_block_stmt(aForStmt)
-      end
-
       def after_if_stmt(anIfStmt, aVisitor)
         anIfStmt.then_stmt.accept(aVisitor)
         anIfStmt.else_stmt&.accept(aVisitor)
@@ -107,27 +96,30 @@ module Loxxy
       def before_return_stmt(returnStmt)
         if scopes.size < 2
           msg = "Error at 'return': Can't return from top-level code."
-          raise StandardError, msg
+          raise Loxxy::RuntimeError, msg
         end
 
         if current_function == :none
           msg = "Error at 'return': Can't return from outside a function."
-          raise StandardError, msg
+          raise Loxxy::RuntimeError, 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)
+          raise Loxxy::RuntimeError, msg unless returnStmt.subnodes[0].kind_of?(Datatype::Nil)
         end
       end
 
       def after_while_stmt(aWhileStmt, aVisitor)
         aWhileStmt.body.accept(aVisitor)
-        aWhileStmt.condition.accept(aVisitor)
+        aWhileStmt.condition&.accept(aVisitor)
       end
 
       # A variable declaration adds a new variable to current scope
       def before_var_stmt(aVarStmt)
+        # Oddly enough, Lox allows the re-definition of a variable at top-level scope
+        return if scopes.size == 1 && scopes.last[aVarStmt.name]
+
         declare(aVarStmt.name)
       end
 
@@ -149,7 +141,7 @@ module Loxxy
       def before_variable_expr(aVarExpr)
         var_name = aVarExpr.name
         if !scopes.empty? && (scopes.last[var_name] == false)
-          raise StandardError, "Can't read variable #{var_name} in its own initializer"
+          raise Loxxy::RuntimeError, "Can't read variable #{var_name} in its own initializer"
         end
       end
 
@@ -171,7 +163,7 @@ module Loxxy
       def before_this_expr(_thisExpr)
         if current_class == :none
           msg = "Error at 'this': Can't use 'this' outside of a class."
-          raise StandardError, msg
+          raise Loxxy::RuntimeError, msg
         end
       end
 
@@ -186,11 +178,11 @@ module Loxxy
         msg_prefix = "Error at 'super': Can't use 'super' "
         if current_class == :none
           err_msg = msg_prefix + 'outside of a class.'
-          raise StandardError, err_msg
+          raise Loxxy::RuntimeError, err_msg
 
         elsif current_class == :class
           err_msg = msg_prefix + 'in a class without superclass.'
-          raise StandardError, err_msg
+          raise Loxxy::RuntimeError, err_msg
 
         end
         # 'super' behaves closely to a local variable
@@ -220,9 +212,13 @@ module Loxxy
         return if scopes.empty?
 
         curr_scope = scopes.last
+          # Oddly enough, Lox allows variable re-declaration at top-level
         if curr_scope.include?(aVarName)
           msg = "Error at '#{aVarName}': Already variable with this name in this scope."
-          raise StandardError, msg
+          raise Loxxy::RuntimeError, msg
+        elsif curr_scope.size == 255 && current_function != :none
+          msg = "Error at '#{aVarName}': Too many local variables in function."
+          raise Loxxy::RuntimeError, msg
         end
 
         # The initializer is not yet processed.

data/lib/loxxy/datatype/number.rb

@@ -7,6 +7,10 @@ module Loxxy
   module Datatype
     # Class for representing a Lox numeric value.
     class Number < BuiltinDatatype
+      def zero?
+        value.zero?
+      end
+
       # Perform the addition of two Lox numbers or
       # one Lox number and a Ruby Numeric
       # @param other [Loxxy::Datatype::Number, Numeric]
@@ -59,17 +63,28 @@ module Loxxy
       # one Lox number and a Ruby Numeric
       # @param other [Loxxy::Datatype::Number, Numeric]
       # @return [Loxxy::Datatype::Number]
+      # rubocop: disable Lint/BinaryOperatorWithIdenticalOperands
       def /(other)
         case other
-        when Number
-          self.class.new(value / other.value)
-        when Numeric
-          self.class.new(value / other)
+        when Number, Numeric
+          if other.zero?
+            if zero?
+              # NaN case detected
+              self.class.new(0.0 / 0.0)
+            else
+              raise ZeroDivisionError
+            end
+          elsif other.kind_of?(Number)
+            self.class.new(value / other.value)
+          else
+            self.class.new(value / other)
+          end
         else
           err_msg = "'/': Operands must be numbers."
           raise TypeError, err_msg
         end
       end
+      # rubocop: enable Lint/BinaryOperatorWithIdenticalOperands
 
       # Unary minus (return value with changed sign)
       # @return [Loxxy::Datatype::Number]

data/lib/loxxy/front_end/parser.rb

@@ -46,7 +46,7 @@ module Loxxy
           # Stop if the parse failed...
           line1 = "Parsing failed\n"
           line2 = "Reason: #{result.failure_reason.message}"
-          raise StandardError, line1 + line2
+          raise SyntaxError, line1 + line2
         end
 
         return engine.convert(result) # engine.to_ptree(result)

data/lib/loxxy/front_end/scanner.rb

@@ -54,11 +54,11 @@ module Loxxy
         '<=' => 'LESS_EQUAL'
       }.freeze
 
-      # Here are all the implemented Lox keywords (in uppercase)
+      # Here are all the implemented Lox keywords
       # These are enumerated in section 4.2.1 Token type
       @@keywords = %w[
-        AND CLASS ELSE FALSE FUN FOR IF NIL OR
-        PRINT RETURN SUPER THIS TRUE VAR WHILE
+        and class else false fun for if nil or
+        print return super this true var while
       ].map { |x| [x, x] }.to_h
 
       # Constructor. Initialize a tokenizer for Lox input.
@@ -84,7 +84,7 @@ module Loxxy
           token = _next_token
           tok_sequence << token unless token.nil?
         end
-        tok_sequence << build_token('EOF', '')
+        tok_sequence << build_token('EOF', nil)
 
         return tok_sequence
       end
@@ -99,22 +99,19 @@ module Loxxy
 
         token = nil
 
-        if '(){},.;/*'.include? curr_ch
+        if '(){},.;+-/*'.include? curr_ch
           # Single delimiter or separator character
           token = build_token(@@lexeme2name[curr_ch], scanner.getch)
-        elsif (lexeme = scanner.scan(/[+\-](?!\d)/))
-          # Minus or plus character not preceding a digit
-          token = build_token(@@lexeme2name[lexeme], lexeme)
         elsif (lexeme = scanner.scan(/[!=><]=?/))
           # One or two special character tokens
           token = build_token(@@lexeme2name[lexeme], lexeme)
-        elsif (lexeme = scanner.scan(/-?\d+(?:\.\d+)?/))
+        elsif (lexeme = scanner.scan(/\d+(?:\.\d+)?/))
           token = build_token('NUMBER', lexeme)
         elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/))
           token = build_token('STRING', lexeme)
         elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z_0-9]*/))
-          keyw = @@keywords[lexeme.upcase]
-          tok_type = keyw || 'IDENTIFIER'
+          keyw = @@keywords[lexeme]
+          tok_type = keyw ? keyw.upcase : 'IDENTIFIER'
           token = build_token(tok_type, lexeme)
         elsif scanner.scan(/"(?:\\"|[^"])*\z/)
           # Error: unterminated string...
@@ -133,7 +130,8 @@ module Loxxy
       def build_token(aSymbolName, aLexeme)
         begin
           (value, symb) = convert_to(aLexeme, aSymbolName)
-          col = scanner.pos - aLexeme.size - @line_start + 1
+          lex_length = aLexeme ? aLexeme.size : 0
+          col = scanner.pos - lex_length - @line_start + 1
           pos = Rley::Lexical::Position.new(@lineno, col)
           if value
             token = Literal.new(value, aLexeme.dup, symb, pos)

data/lib/loxxy/version.rb

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

data/spec/back_end/environment_spec.rb

@@ -54,20 +54,6 @@ module Loxxy
           expect(var_b).to be_kind_of(Variable)
           expect(var_b.name).to eq('b')
         end
-
-        # it 'should set the suffix of just created variable' do
-          # subject.insert(var('a'))
-          # var_a = subject.defns['a']
-          # expect(var_a.suffix).to eq("_#{subject.object_id.to_s(16)}")
-        # end
-
-        # it 'should complain when variable names collide' do
-          # subject.insert(var('c'))
-          # expect(subject.defns['c']).to be_kind_of(Datatype::Variable)
-          # err = StandardError
-          # err_msg = "Variable with name 'c' already exists."
-          # expect { subject.insert(var('c')) }.to raise_error(err, err_msg)
-        # end
       end # context
     end # describe
   end # module

data/spec/back_end/symbol_table_spec.rb

@@ -106,25 +106,6 @@ module Loxxy
           expect(subject.lookup('q')).to eq(subject.current_env.defns['q'])
         end
 
-        # it 'should allow the search of an entry based on its i_name' do
-          # subject.insert(var('q'))
-          # i_name_x = subject.insert(var('x'))
-          # subject.enter_environment(BackEnd::Environment.new)
-          # i_name_q2 = subject.insert(var('q'))
-          # i_name_y = subject.insert(var('y'))
-
-          # # Search for unknown i_name
-          # expect(subject.lookup_i_name('dummy')).to be_nil
-
-          # curr_scope = subject.current_env
-          # # # Search for existing unique names
-          # expect(subject.lookup_i_name(i_name_y)).to eq(curr_scope.defns['y'])
-          # expect(subject.lookup_i_name(i_name_x)).to eq(subject.root.defns['x'])
-
-          # # Search for redefined name
-          # expect(subject.lookup_i_name(i_name_q2)).to eq(curr_scope.defns['q'])
-        # end
-
         it 'should list all the variables defined in all the szcope chain' do
           subject.insert(var('q'))
           subject.enter_environment(BackEnd::Environment.new)

data/spec/back_end/variable_spec.rb

@@ -38,41 +38,6 @@ module Loxxy
           instance = Variable.new(sample_name)
           expect(instance.value).to eq(Datatype::Nil.instance)
         end
-
-        # it 'should know its default internal name' do
-          # # By default: internal name == label
-          # expect(subject.i_name).to eq(subject.label)
-        # end
-
-        # it 'should have a nil suffix' do
-          # expect(subject.suffix).to be_nil
-        # end
-      end # context
-
-      context 'Provided service:' do
-        let(:sample_suffix) { 'sample-suffix' }
-        it 'should have a label equal to its user-defined name' do
-          # expect(subject.label).to eq(subject.name)
-        end
-
-        it 'should accept a suffix' do
-          # expect { subject.suffix = sample_suffix }.not_to raise_error
-          # expect(subject.suffix).to eq(sample_suffix)
-        end
-
-        it 'should calculate its internal name' do
-          # # Rule: empty suffix => internal name == label
-          # subject.suffix = ''
-          # expect(subject.i_name).to eq(subject.label)
-
-          # # Rule: suffix starting underscore: internal name = label + suffix
-          # subject.suffix = '_10'
-          # expect(subject.i_name).to eq(subject.label + subject.suffix)
-
-          # # Rule: ... otherwise: internal name == suffix
-          # subject.suffix = sample_suffix
-          # expect(subject.i_name).to eq(subject.suffix)
-        end
       end # context
     end # describe
   end # module

data/spec/front_end/scanner_spec.rb

@@ -124,18 +124,15 @@ LOX_END
 
         it 'should recognize number values' do
           input = <<-LOX_END
-          123     987654
-          0       -0
-          123.456 -0.001
-LOX_END
+            123     987654
+            0       123.456
+          LOX_END
 
           expectations = [
             ['123', 123],
             ['987654', 987654],
             ['0', 0],
-            ['-0', 0],
-            ['123.456', 123.456],
-            ['-0.001', -0.001]
+            ['123.456', 123.456]
           ]
 
           subject.start_with(input)
@@ -149,6 +146,30 @@ LOX_END
           end
         end
 
+        it 'should recognize negative number values' do
+          input = <<-LOX_END
+            -0
+            -0.001
+          LOX_END
+
+          expectations = [
+            ['-', '0'],
+            ['-', '0.001']
+          ].flatten
+
+          subject.start_with(input)
+          tokens = subject.tokens
+          tokens.pop
+          i = 0
+          tokens.each_slice(2) do |(sign, lit)|
+            expect(sign.terminal).to eq('MINUS')
+            expect(sign.lexeme).to eq(expectations[i])
+            expect(lit.terminal).to eq('NUMBER')
+            expect(lit.lexeme).to eq(expectations[i + 1])
+            i += 2
+          end
+        end
+
         it 'should recognize leading and trailing dots as distinct tokens' do
           input = '.456 123.'
 
@@ -217,6 +238,13 @@ LOX_END
           expect(token_nil.lexeme).to eq('nil')
           expect(token_nil.value).to be_kind_of(Datatype::Nil)
         end
+
+        it 'should differentiate nil from variable spelled same' do
+          subject.start_with('Nil')
+          similar = subject.tokens[0]
+          expect(similar.terminal).to eq('IDENTIFIER')
+          expect(similar.lexeme).to eq('Nil')
+        end
       end # context
 
       context 'Handling comments:' do

data/spec/interpreter_spec.rb

@@ -148,6 +148,19 @@ module Loxxy
         end
       end
 
+      it 'should ignore spaces surrounding minus in subtraction of two numbers' do
+        [
+          ['1 - 1;', 0],
+          ['1 -1;', 0],
+          ['1- 1;', 0],
+          ['1-1;', 0]
+        ].each do |(source, predicted)|
+          lox = Loxxy::Interpreter.new
+          result = lox.evaluate(source)
+          expect(result.value == predicted).to be_truthy
+        end
+      end
+
       it 'should evaluate the negation of an object' do
         [
           ['!true;', false],
@@ -431,6 +444,17 @@ LOX_END
         expect(result).to eq(3)
       end
 
+      it 'should support return within statements inside a function' do
+        program = <<-LOX_END
+          fun foo() {
+            for (;;) return "done";
+          }
+          print foo(); // output: done
+        LOX_END
+        expect { subject.evaluate(program) }.not_to raise_error
+        expect(sample_cfg[:ostream].string).to eq('done')
+      end
+
       # rubocop: disable Style/StringConcatenation
       it 'should support local functions and closures' do
         program = <<-LOX_END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.2.03
+  version: 0.3.01
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -99,7 +99,6 @@ files:
 - lib/loxxy/ast/lox_call_expr.rb
 - lib/loxxy/ast/lox_class_stmt.rb
 - 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

data/lib/loxxy/ast/lox_for_stmt.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lox_compound_expr'
-
-module Loxxy
-  module Ast
-    class LoxForStmt < LoxCompoundExpr
-      # @return [LoxNode] test expression
-      attr_reader :test_expr
-
-      # @return [LoxNode] update expression
-      attr_reader :update_expr
-
-      # @return [LoxNode] body statement
-      attr_accessor :body_stmt
-
-      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
-      # @param initialization [Loxxy::Ast::LoxNode]
-      # @param testExpr [Loxxy::Ast::LoxNode]
-      # @param updateExpr [Loxxy::Ast::LoxNode]
-      def initialize(aPosition, initialization, testExpr, updateExpr)
-        child = initialization ? [initialization] : []
-        super(aPosition, child)
-        @test_expr = testExpr
-        @update_expr = updateExpr
-      end
-
-      # Accessor to the condition expression
-      # @return [LoxNode]
-      def condition
-        subnodes[0]
-      end
-
-      define_accept # Add `accept` method as found in Visitor design pattern
-    end # class
-  end # module
-end # module