loxxy 0.3.01 → 0.4.01

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

@@ -22,8 +22,16 @@ module Loxxy
         @fields = {}
       end
 
-      def accept(_visitor)
-        engine.stack.push self
+      # In Lox, only false and Nil have false value...
+      # @return [FalseClass]
+      def falsey?
+        false # Default implementation
+      end
+
+      # Any instance is truthy
+      # @return [TrueClass]
+      def truthy?
+        true # Default implementation
       end
 
       # Text representation of a Lox instance
@@ -31,6 +39,10 @@ module Loxxy
         "#{klass.to_str} instance"
       end
 
+      def accept(_visitor)
+        engine.expr_stack.push self
+      end
+
       # Look up the value of property with given name
       # aName [String] name of object property
       def get(aName)

data/lib/loxxy/back_end/resolver.rb

@@ -133,10 +133,16 @@ module Loxxy
       end
 
       def after_set_expr(aSetExpr, aVisitor)
+        aSetExpr.value.accept(aVisitor)
         # Evaluate object part
         aSetExpr.object.accept(aVisitor)
       end
 
+      def after_logical_expr(aLogicalExpr, aVisitor)
+        # Force the visit of second operand (resolver should ignore shortcuts)
+        aLogicalExpr.operands.last.accept(aVisitor)
+      end
+
       # Variable expressions require their variables resolved
       def before_variable_expr(aVarExpr)
         var_name = aVarExpr.name

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

@@ -7,9 +7,9 @@ module Loxxy
   module FrontEnd
     ########################################
     # Grammar for Lox language
-    # Authoritave grammar at:
+    # Authoritative grammar at:
     #   https://craftinginterpreters.com/appendix-i.html
-    builder = Rley::Syntax::GrammarBuilder.new do
+    builder = Rley::grammar_builder do
       # Punctuators, separators...
       add_terminals('LEFT_PAREN', 'RIGHT_PAREN', 'LEFT_BRACE', 'RIGHT_BRACE')
       add_terminals('COMMA', 'DOT', 'MINUS', 'PLUS')
@@ -26,30 +26,21 @@ module Loxxy
       add_terminals('EOF')
 
       # Top-level rule that matches an entire Lox program
-      rule('program' => 'EOF').as 'null_program'
-      rule('program' => 'declaration_plus EOF').as 'lox_program'
+      rule('program' => 'declaration* EOF').as 'lox_program'
 
       # Declarations: bind an identifier to something
-      rule('declaration_plus' => 'declaration_plus declaration').as 'declaration_plus_more'
-      rule('declaration_plus' => 'declaration').as 'declaration_plus_end'
       rule('declaration' => 'classDecl')
       rule('declaration' => 'funDecl')
       rule('declaration' => 'varDecl')
       rule('declaration' => 'stmt')
 
       rule('classDecl' => 'CLASS classNaming class_body').as 'class_decl'
-      rule('classNaming' => 'IDENTIFIER LESS IDENTIFIER').as 'class_subclassing'
-      rule('classNaming' => 'IDENTIFIER').as 'class_name'
-      rule('class_body' => 'LEFT_BRACE methods_opt RIGHT_BRACE').as 'class_body'
-      rule('methods_opt' => 'method_plus')
-      rule('methods_opt' => [])
-      rule('method_plus' => 'method_plus function').as 'method_plus_more'
-      rule('method_plus' => 'function').as 'method_plus_end'
+      rule('classNaming' => 'IDENTIFIER (LESS IDENTIFIER)?').as 'class_naming'
+      rule('class_body' => 'LEFT_BRACE function* RIGHT_BRACE').as 'class_body'
 
       rule('funDecl' => 'FUN function').as 'fun_decl'
 
-      rule('varDecl' => 'VAR IDENTIFIER SEMICOLON').as 'var_declaration'
-      rule('varDecl' => 'VAR IDENTIFIER EQUAL expression SEMICOLON').as 'var_initialization'
+      rule('varDecl' => 'VAR IDENTIFIER (EQUAL expression)? SEMICOLON').as 'var_declaration'
 
       # Statements: produce side effects, but don't introduce bindings
       rule('stmt' => 'statement')
@@ -65,12 +56,11 @@ module Loxxy
       rule('exprStmt' => 'expression SEMICOLON').as 'exprStmt'
 
       rule('forStmt' => 'FOR LEFT_PAREN forControl RIGHT_PAREN statement').as 'for_stmt'
-      rule('forControl' => 'forInitialization forTest forUpdate').as 'for_control'
+      rule('forControl' => 'forInitialization forTest expression?').as 'for_control'
       rule('forInitialization' => 'varDecl')
       rule('forInitialization' => 'exprStmt')
       rule('forInitialization' => 'SEMICOLON').as 'empty_for_initialization'
-      rule('forTest' => 'expression_opt SEMICOLON').as 'for_test'
-      rule('forUpdate' => 'expression_opt')
+      rule('forTest' => 'expression? SEMICOLON').as 'for_test'
 
       rule('ifStmt' => 'IF ifCondition statement ELSE statement').as 'if_else_stmt'
       rule('unbalancedStmt' => 'IF ifCondition stmt').as 'if_stmt'
@@ -78,19 +68,14 @@ module Loxxy
       rule('ifCondition' => 'LEFT_PAREN expression RIGHT_PAREN').as 'keep_symbol2'
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'
-      rule('returnStmt' => 'RETURN expression_opt SEMICOLON').as 'return_stmt'
+      rule('returnStmt' => 'RETURN expression? 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'
+      rule('block' => 'LEFT_BRACE declaration* RIGHT_BRACE').as 'block_stmt'
 
       # Expressions: produce values
-      rule('expression_opt' => 'expression')
-      rule('expression_opt' => [])
       rule('expression' => 'assignment')
-      rule('assignment' => 'owner_opt IDENTIFIER EQUAL assignment').as 'assign_expr'
+      rule('assignment' => '(call DOT)? IDENTIFIER EQUAL assignment').as 'assign_expr'
       rule('assignment' => 'logic_or')
-      rule('owner_opt' => 'call DOT').as 'set_expr'
-      rule('owner_opt' => [])
       rule('logic_or' => 'logic_and')
       rule('logic_or' => 'logic_and disjunct_plus').as 'logical_expr'
       rule('disjunct_plus' => 'disjunct_plus OR logic_and').as 'binary_plus_more'
@@ -130,10 +115,8 @@ module Loxxy
       rule('unaryOp' => 'BANG')
       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').as 'refinement_plus_end'
-      rule('refinement' => 'LEFT_PAREN arguments_opt RIGHT_PAREN').as 'call_arglist'
+      rule('call' => 'primary refinement+').as 'call_expr'
+      rule('refinement' => 'LEFT_PAREN arguments? RIGHT_PAREN').as 'call_arglist'
       rule('refinement' => 'DOT IDENTIFIER').as 'get_expr'
       rule('primary' => 'TRUE').as 'literal_expr'
       rule('primary' => 'FALSE').as 'literal_expr'
@@ -146,15 +129,9 @@ module Loxxy
       rule('primary' => 'SUPER DOT IDENTIFIER').as 'super_expr'
 
       # Utility rules
-      rule('function' => 'IDENTIFIER LEFT_PAREN params_opt RIGHT_PAREN block').as 'function'
-      rule('params_opt' => 'parameters')
-      rule('params_opt' => [])
-      rule('parameters' => 'parameters COMMA IDENTIFIER').as 'parameters_plus_more'
-      rule('parameters' => 'IDENTIFIER').as 'parameters_plus_end'
-      rule('arguments_opt' => 'arguments')
-      rule('arguments_opt' => [])
-      rule('arguments' => 'arguments COMMA expression').as 'arguments_plus_more'
-      rule('arguments' => 'expression').as 'arguments_plus_end'
+      rule('function' => 'IDENTIFIER LEFT_PAREN parameters? RIGHT_PAREN block').as 'function'
+      rule('parameters' => 'IDENTIFIER (COMMA IDENTIFIER)*').as 'parameters'
+      rule('arguments' => 'expression (COMMA expression)*').as 'arguments'
     end
 
     unless defined?(Grammar)

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)
@@ -91,7 +105,6 @@ module Loxxy
 
       private
 
-      # rubocop: disable Lint/DuplicateBranch
       def _next_token
         skip_intertoken_spaces
         curr_ch = scanner.peek(1)
@@ -105,18 +118,14 @@ module Loxxy
         elsif (lexeme = scanner.scan(/[!=><]=?/))
           # One or two special character tokens
           token = build_token(@@lexeme2name[lexeme], lexeme)
+        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(/./)
@@ -125,7 +134,6 @@ module Loxxy
 
         return token
       end
-      # rubocop: enable Lint/DuplicateBranch
 
       def build_token(aSymbolName, aLexeme)
         begin
@@ -155,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
@@ -166,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.3.01'
+  VERSION = '0.4.01'
 end

data/loxxy.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   DESCR_END
   spec.homepage      = 'https://github.com/famished-tiger/loxxy'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '~> 2.4'
+  spec.required_ruby_version = '~> 2.5'
 
   spec.bindir        = 'bin'
   spec.executables   = ['loxxy']
@@ -58,7 +58,7 @@ Gem::Specification.new do |spec|
   PkgExtending.pkg_documentation(spec)
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.7.06'
+  spec.add_dependency 'rley', '~> 0.8.01'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'