loxxy 0.2.01 → 0.2.06

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/error.rb

@@ -7,6 +7,9 @@ module Loxxy
   # Error occurring while Loxxy executes some invalid Lox code.
   class RuntimeError < Error; end
 
+  # Error occurring while Loxxy scans invalid input.
+  class ScanError < Error; end
+
   # Error occurring while Loxxy parses some invalid Lox code.
   class SyntaxError < Error; end
 end

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

@@ -2,6 +2,7 @@
 
 require 'strscan'
 require 'rley'
+require_relative '../error'
 require_relative '../datatype/all_datatypes'
 require_relative 'literal'
 
@@ -53,15 +54,13 @@ 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
 
-      class ScanError < StandardError; end
-
       # Constructor. Initialize a tokenizer for Lox input.
       # @param source [String] Lox text to tokenize.
       def initialize(source = nil)
@@ -85,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
@@ -100,28 +99,31 @@ 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)/))
+        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...
+          col = scanner.pos - @line_start + 1
+          raise ScanError, "Error: [line #{lineno}:#{col}]: Unterminated string."
         else # Unknown token
-          erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
-          sequel = scanner.scan(/.{1,20}/)
-          erroneous += sequel unless sequel.nil?
-          raise ScanError, "Unknown token #{erroneous} on line #{lineno}"
+          col = scanner.pos - @line_start + 1
+          _erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
+          raise ScanError, "Error: [line #{lineno}:#{col}]: Unexpected character."
         end
 
         return token
@@ -131,7 +133,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)
@@ -156,7 +159,7 @@ module Loxxy
           when 'NUMBER'
             value = Datatype::Number.new(aLexeme)
           when 'STRING'
-            value = Datatype::LXString.new(aLexeme)
+            value = Datatype::LXString.new(unescape_string(aLexeme))
           when 'TRUE'
             value = Datatype::True.instance
           else
@@ -166,6 +169,29 @@ module Loxxy
         return [value, symb]
       end
 
+      # Replace any sequence sequence by their "real" value.
+      def unescape_string(aText)
+        result = +''
+        previous = nil
+
+        aText.each_char do |ch|
+          if previous
+            if ch == ?n
+              result << "\n"
+            else
+              result << ch
+            end
+            previous = nil
+          elsif ch == '\\'
+            previous = ?\
+          else
+            result << ch
+          end
+        end
+
+        result
+      end
+
       # Skip non-significant whitespaces and comments.
       # Advance the scanner until something significant is found.
       def skip_intertoken_spaces

data/lib/loxxy/version.rb

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

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.'
 
@@ -189,6 +210,26 @@ LOX_END
           end
         end
 
+        it 'should recognize escaped quotes' do
+          embedded_quotes = %q{she said: \"Hello\"}
+          result = subject.send(:unescape_string, embedded_quotes)
+          expect(result).to eq('she said: "Hello"')
+        end
+
+        it 'should recognize escaped backslash' do
+          embedded_backslash = 'backslash>\\\\'
+          result = subject.send(:unescape_string, embedded_backslash)
+          expect(result).to eq('backslash>\\')
+        end
+
+        # rubocop: disable Style/StringConcatenation
+        it 'should recognize newline escape sequence' do
+          embedded_newline = 'line1\\nline2'
+          result = subject.send(:unescape_string, embedded_newline)
+          expect(result).to eq('line1' + "\n" + 'line2')
+        end
+        # rubocop: enable Style/StringConcatenation
+
         it 'should recognize a nil token' do
           subject.start_with('nil')
           token_nil = subject.tokens[0]
@@ -197,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
@@ -237,6 +285,20 @@ LOX_END
           ]
           match_expectations(subject, expectations)
         end
+
+        it 'should complain if it finds an unterminated string' do
+          subject.start_with('var a = "Unfinished;')
+          err = Loxxy::ScanError
+          err_msg = 'Error: [line 1:21]: Unterminated string.'
+          expect { subject.tokens }.to raise_error(err, err_msg)
+        end
+
+        it 'should complain if it finds an unexpected character' do
+          subject.start_with('var a = ?1?;')
+          err = Loxxy::ScanError
+          err_msg = 'Error: [line 1:9]: Unexpected character.'
+          expect { subject.tokens }.to raise_error(err, err_msg)
+        end
       end # context
     end # describe
   end # module

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
@@ -480,6 +504,18 @@ LOX_END
         snippet
       end
 
+      it 'should support field assignment expression' do
+        program = <<-LOX_END
+          class Foo {}
+
+          var foo = Foo();
+
+          print foo.bar = "bar value"; // expect: bar value
+        LOX_END
+        expect { subject.evaluate(program) }.not_to raise_error
+        expect(sample_cfg[:ostream].string).to eq('bar value')
+      end
+
       it 'should support class declaration' do
         program = <<-LOX_END
           #{duck_class}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.2.01
+  version: 0.2.06
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -91,6 +91,7 @@ files:
 - lib/loxxy.rb
 - lib/loxxy/ast/all_lox_nodes.rb
 - lib/loxxy/ast/ast_builder.rb
+- lib/loxxy/ast/ast_visitee.rb
 - lib/loxxy/ast/ast_visitor.rb
 - lib/loxxy/ast/lox_assign_expr.rb
 - lib/loxxy/ast/lox_binary_expr.rb
@@ -98,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,41 +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
-
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_for_stmt(self)
-      end
-
-      # Accessor to the condition expression
-      # @return [LoxNode]
-      def condition
-        subnodes[0]
-      end
-    end # class
-  end # module
-end # module