loxxy 0.2.05 → 0.3.03

data/lib/loxxy/back_end/environment.rb

@@ -25,11 +25,15 @@ module Loxxy
       # @return [Hash{String => Variable}] Pairs of the kind
       attr_reader :defns
 
+      # @return [Array<LoxNode>] stack of values needed in evaluating an expression
+      attr_reader :expr_stack
+
       # Construct a environment instance.
       # @param aParent [Environment, NilClass] Parent environment to this one.
       def initialize(aParent = nil)
         @enclosing = aParent
         @defns = {}
+        @expr_stack = []
       end
 
       # Add a new variable to the environment.

data/lib/loxxy/back_end/lox_class.rb

@@ -7,17 +7,15 @@ module Loxxy
   module BackEnd
     # Runtime representation of a Lox class.
     class LoxClass
-      # rubocop: disable Style/AccessorGrouping
-
       # @return [String] The name of the class
       attr_reader :name
       attr_reader :superclass
 
       # @return [Hash{String => LoxFunction}] the list of methods
       attr_reader :meths
-      attr_reader :stack
 
-      # rubocop: enable Style/AccessorGrouping
+      # @return [Loxxy::BackEnd::Engine]
+      attr_reader :engine
 
       # Create a class with given name
       # @param aName [String] The name of the class
@@ -28,11 +26,11 @@ module Loxxy
         theMethods.each do |func|
           meths[func.name] = func
         end
-        @stack = anEngine.stack
+        @engine = anEngine
       end
 
       def accept(_visitor)
-        stack.push self
+        engine.expr_stack.push self
       end
 
       def arity
@@ -46,9 +44,9 @@ module Loxxy
         if initializer
           constructor = initializer.bind(instance)
           constructor.call(engine, visitor)
+        else
+          engine.expr_stack.push(instance)
         end
-
-        engine.stack.push(instance)
       end
 
       # @param aName [String] the method name to search for

data/lib/loxxy/back_end/lox_function.rb

@@ -13,7 +13,7 @@ module Loxxy
       # @return [Array<>] the parameters
       attr_reader :parameters
       attr_reader :body
-      attr_reader :stack
+      attr_reader :engine
       attr_reader :closure
       attr_accessor :is_initializer
 
@@ -23,7 +23,7 @@ module Loxxy
         @name = aName.dup
         @parameters = parameterList
         @body = aBody.kind_of?(Ast::LoxNoopExpr) ? aBody : aBody.subnodes[0]
-        @stack = anEngine.stack
+        @engine = anEngine
         @closure = anEngine.symbol_table.current_env
         @is_initializer = false
         anEngine.symbol_table.current_env.embedding = true
@@ -34,28 +34,34 @@ module Loxxy
       end
 
       def accept(_visitor)
-        stack.push self
+        engine.expr_stack.push self
       end
 
-      def call(engine, aVisitor)
+      def call(_engine, aVisitor)
         new_env = Environment.new(closure)
         engine.symbol_table.enter_environment(new_env)
 
         parameters&.each do |param_name|
-          local = Variable.new(param_name, stack.pop)
+          local = Variable.new(param_name, engine.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)
+          body.accept(aVisitor) unless body.nil? || body.kind_of?(Ast::LoxNoopExpr)
+          # implicit return at end of function...
+          engine.stack.push(Datatype::Nil.instance) unless is_initializer
         end
+        # Compensate for deeply nested return
+        engine.symbol_table.leave_environment while engine.current_env != new_env
+
         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
+        # engine.expr_stack.clear
+        engine.expr_stack.push(engine.stack.pop) unless engine.stack.empty?
       end
 
       def bind(anInstance)

data/lib/loxxy/back_end/lox_instance.rb

@@ -23,7 +23,7 @@ module Loxxy
       end
 
       def accept(_visitor)
-        engine.stack.push self
+        engine.expr_stack.push self
       end
 
       # Text representation of a Lox instance

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
@@ -96,17 +96,17 @@ 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
 
@@ -117,6 +117,9 @@ module Loxxy
 
       # 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
 
@@ -130,6 +133,7 @@ module Loxxy
       end
 
       def after_set_expr(aSetExpr, aVisitor)
+        aSetExpr.value.accept(aVisitor)
         # Evaluate object part
         aSetExpr.object.accept(aVisitor)
       end
@@ -138,7 +142,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
 
@@ -160,7 +164,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
 
@@ -175,11 +179,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
@@ -209,9 +213,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/lx_string.rb

@@ -47,11 +47,10 @@ module Loxxy
 
       def validated_value(aValue)
         unless aValue.is_a?(String)
-          raise StandardError, "Invalid number value #{aValue}"
+          raise StandardError, "Invalid string value #{aValue}"
         end
 
-        # Remove double quotes delimiter
-        aValue.gsub(/(^")|("$)/, '')
+        aValue
       end
     end # class
   end # module

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

@@ -61,6 +61,20 @@ module Loxxy
         print return super this true var while
       ].map { |x| [x, x] }.to_h
 
+      # Single character that have a special meaning when escaped
+      # @return [{Char => String}]
+      @@escape_chars = {
+        ?a => "\a",
+        ?b => "\b",
+        ?e => "\e",
+        ?f => "\f",
+        ?n => "\n",
+        ?r => "\r",
+        ?s => "\s",
+        ?t => "\t",
+        ?v => "\v"
+      }.freeze
+
       # Constructor. Initialize a tokenizer for Lox input.
       # @param source [String] Lox text to tokenize.
       def initialize(source = nil)
@@ -84,14 +98,13 @@ 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
 
       private
 
-      # rubocop: disable Lint/DuplicateBranch
       def _next_token
         skip_intertoken_spaces
         curr_ch = scanner.peek(1)
@@ -99,27 +112,20 @@ 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 scanner.scan(/"/) # Start of string detected...
+          token = build_string_token
+        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]
           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
           col = scanner.pos - @line_start + 1
           _erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
@@ -128,12 +134,12 @@ module Loxxy
 
         return token
       end
-      # rubocop: enable Lint/DuplicateBranch
 
       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)
@@ -157,8 +163,6 @@ module Loxxy
             value = Datatype::Nil.instance
           when 'NUMBER'
             value = Datatype::Number.new(aLexeme)
-          when 'STRING'
-            value = Datatype::LXString.new(unescape_string(aLexeme))
           when 'TRUE'
             value = Datatype::True.instance
           else
@@ -168,27 +172,47 @@ 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 = ?\
+      # precondition: current position at leading quote
+      def build_string_token
+        scan_pos = scanner.pos
+        line = @lineno
+        column_start = scan_pos - @line_start
+        literal = +''
+        loop do
+          substr = scanner.scan(/[^"\\\r\n]*/)
+          if scanner.eos?
+            pos_start = "line #{line}:#{column_start}"
+            raise ScanError, "Error: [#{pos_start}]: Unterminated string."
           else
-            result << ch
+            literal << substr
+            special = scanner.scan(/["\\\r\n]/)
+            case special
+            when '"' # Terminating quote found
+              break
+            when "\r"
+              next_line
+              special << scanner.scan(/./) if scanner.match?(/\n/)
+              literal << special
+            when "\n"
+              next_line
+              literal << special
+            when '\\'
+              ch = scanner.scan(/./)
+              next unless ch
+
+              escaped = @@escape_chars[ch]
+              if escaped
+                literal << escaped
+              else
+                literal << ch
+              end
+            end
           end
         end
-
-        result
+        pos = Rley::Lexical::Position.new(line, column_start)
+        lox_string = Datatype::LXString.new(literal)
+        lexeme = scanner.string[scan_pos - 1..scanner.pos - 1]
+        Literal.new(lox_string, lexeme, 'STRING', pos)
       end
 
       # Skip non-significant whitespaces and comments.

data/lib/loxxy/version.rb

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

data/spec/back_end/engine_spec.rb

@@ -35,8 +35,8 @@ module Loxxy
         let(:lit_expr) { Ast::LoxLiteralExpr.new(sample_pos, greeting) }
 
         it "should react to 'after_var_stmt' event" do
-          # Precondition: value to assign is on top of stack
-          subject.stack.push(greeting)
+          # Precondition: value to assign is on top of expr stack
+          subject.expr_stack.push(greeting)
 
           expect { subject.after_var_stmt(var_decl) }.not_to raise_error
           current_env = subject.symbol_table.current_env
@@ -46,7 +46,17 @@ module Loxxy
 
         it "should react to 'before_literal_expr' event" do
           expect { subject.before_literal_expr(lit_expr) }.not_to raise_error
-          expect(subject.stack.pop).to eq(greeting)
+          expect(subject.expr_stack.pop).to eq(greeting)
+        end
+      end
+
+      context 'Built-in functions:' do
+        it 'should provide built-in functions' do
+          symb_table = subject.symbol_table
+          %w[clock getc chr exit print_error].each do |name|
+            fun_var = symb_table.current_env.defns[name]
+            expect(fun_var.value).to be_kind_of(BackEnd::Engine::NativeFunction)
+          end
         end
       end
     end # describe