loxxy 0.2.01 → 0.2.06

data/lib/loxxy/ast/lox_literal_expr.rb

@@ -15,11 +15,7 @@ module Loxxy
         @literal = aLiteral
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_literal_expr(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_logical_expr.rb

@@ -16,12 +16,7 @@ module Loxxy
         @operator = anOperator
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_logical_expr(self)
-      end
-
+      define_accept # Add `accept` method as found in Visitor design pattern
       alias operands subnodes
     end # class
   end # module

data/lib/loxxy/ast/lox_node.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'ast_visitee'
+
 module Loxxy
   module Ast
+    # Abstract class.
+    # Instances of its subclasses represent nodes of an abstract syntax tree
+    # that is the product of the parse of an input text.
     class LoxNode
+      # Let nodes take `visitee` role as defined in the Visitor design pattern
+      extend ASTVisitee
+
       # return [Rley::Lexical::Position] Position of the entry in the input stream.
       attr_reader :position
 
@@ -16,7 +24,7 @@ module Loxxy
         # Default: do nothing ...
       end
 
-      # Abstract method.
+      # Abstract method (must be overriden in subclasses).
       # Part of the 'visitee' role in Visitor design pattern.
       # @param _visitor [LoxxyTreeVisitor] the visitor
       def accept(_visitor)

data/lib/loxxy/ast/lox_print_stmt.rb

@@ -11,11 +11,7 @@ module Loxxy
         super(aPosition, [anExpression])
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_print_stmt(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_return_stmt.rb

@@ -12,11 +12,7 @@ module Loxxy
         super(aPosition, [expr])
       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
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_seq_decl.rb

@@ -5,11 +5,7 @@ require_relative 'lox_compound_expr'
 module Loxxy
   module Ast
     class LoxSeqDecl < LoxCompoundExpr
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_seq_decl(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_set_expr.rb

@@ -18,11 +18,7 @@ module Loxxy
         @object = anObject
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_set_expr(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_super_expr.rb

@@ -18,17 +18,13 @@ module Loxxy
         @property = aMethodName
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_super_expr(self)
-      end
-
       # Quack like a LoxVariableExpr
       # @return [String] the `super` keyword
       def name
         'super'
       end
+
+      define_accept # Add `accept` method as found in Visitor design pattern
       alias callee= object=
     end # class
   end # module

data/lib/loxxy/ast/lox_this_expr.rb

@@ -12,11 +12,7 @@ module Loxxy
         'this'
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param _visitor [LoxxyTreeVisitor] the visitor
-      def accept(aVisitor)
-        aVisitor.visit_this_expr(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_unary_expr.rb

@@ -15,12 +15,7 @@ module Loxxy
         @operator = anOperator
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_unary_expr(self)
-      end
-
+      define_accept # Add `accept` method as found in Visitor design pattern
       alias operands subnodes
     end # class
   end # module

data/lib/loxxy/ast/lox_var_stmt.rb

@@ -18,11 +18,7 @@ module Loxxy
         @name = aName
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_var_stmt(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_variable_expr.rb

@@ -16,11 +16,7 @@ module Loxxy
         @name = aName
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_variable_expr(self)
-      end
+      define_accept # Add `accept` method as found in Visitor design pattern
     end # class
   end # module
 end # module

data/lib/loxxy/ast/lox_while_stmt.rb

@@ -16,17 +16,13 @@ module Loxxy
         @body = theBody
       end
 
-      # Part of the 'visitee' role in Visitor design pattern.
-      # @param visitor [Ast::ASTVisitor] the visitor
-      def accept(visitor)
-        visitor.visit_while_stmt(self)
-      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

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,22 +157,26 @@ 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)
       end
 
-      def after_set_expr(aSetExpr, aVisitor)
-        value = stack.pop
-        # Evaluate object part
+      def before_set_expr(aSetExpr, aVisitor)
+        # Evaluate receiver object part
         aSetExpr.object.accept(aVisitor)
+      end
+
+      def after_set_expr(aSetExpr, _visitor)
+        value = stack.pop
         assignee = stack.pop
         unless assignee.kind_of?(LoxInstance)
-          raise StandardError, 'Only instances have fields.'
+          raise Loxxy::RuntimeError, 'Only instances have fields.'
         end
 
         assignee.set(aSetExpr.property, value)
+        stack.push value
       end
 
       def after_logical_expr(aLogicalExpr, visitor)
@@ -227,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
@@ -240,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
@@ -272,7 +265,7 @@ module Loxxy
         aGetExpr.object.accept(aVisitor)
         instance = stack.pop
         unless instance.kind_of?(LoxInstance)
-          raise StandardError, 'Only instances have properties.'
+          raise Loxxy::RuntimeError, 'Only instances have properties.'
         end
 
         stack.push instance.get(aGetExpr.property)
@@ -285,7 +278,7 @@ module Loxxy
       def after_variable_expr(aVarExpr, aVisitor)
         var_name = aVarExpr.name
         var = variable_lookup(aVarExpr)
-        raise StandardError, "Undefined variable '#{var_name}'." unless var
+        raise Loxxy::RuntimeError, "Undefined variable '#{var_name}'." unless var
 
         var.value.accept(aVisitor) # Evaluate variable value then push on stack
       end
@@ -308,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)
@@ -363,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
 
@@ -417,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/lox_instance.rb

@@ -38,7 +38,7 @@ module Loxxy
 
         method = klass.find_method(aName)
         unless method
-          raise StandardError, "Undefined property '#{aName}'."
+          raise Loxxy::RuntimeError, "Undefined property '#{aName}'."
         end
 
         method.bind(self)

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,23 +96,23 @@ 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
@@ -171,7 +160,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 +175,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
@@ -216,14 +205,19 @@ module Loxxy
         scopes.pop
       end
 
+      # rubocop: disable Style/SoleNestedConditional
       def declare(aVarName)
         return if scopes.empty?
 
         curr_scope = scopes.last
-        if curr_scope.include?(aVarName)
-          msg = "Error at '#{aVarName}': Already variable with this name in this scope."
-          raise StandardError, msg
+        if scopes.size > 1 # Not at top-level?
+          # 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 Loxxy::RuntimeError, msg
+          end
         end
+        # rubocop: enable Style/SoleNestedConditional
 
         # The initializer is not yet processed.
         # Mark the variable as 'not yet ready' = exists but may not be referenced yet