loxxy 0.1.03 → 0.1.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf956c6e2d6736535acd1e9b0cb29df6b55a8d9002be073cb70bbf753fb06c9
-  data.tar.gz: 1f635dc69e588f01406cd988bf98d12b9ea398f36e249113a37b089788ef21cb
+  metadata.gz: 16614a276ddf1553d4373e5da9ab78d7f03f2fc8cadec6190c28bb27bdd95b99
+  data.tar.gz: 98903f6ec0c9e010fd429f6b1753b34f52b4cfc67c7eafd21b1103c6ac429bba
 SHA512:
-  metadata.gz: dce93451a9efc548df45683f5772a5d5509c25a57969465f3ff9f48f8b5adcc642b7bb92b25d43658869b5b62d3108796964226c35130cb1492335dc6eaf8fe1
-  data.tar.gz: 881dfd881db0d2ec3e56b91ad14bc6dd0e0b91ba3839fa1efe09c3636aac575856e3e8c4d4a64a55e913a757a4f1d275cc843734ceda3a23ef597591cb282f3f
+  metadata.gz: 8278546ef246d8f4d5db72b18d5c91dfa3dc1d7f18f81b7491ca01df38a64495a3b5eb26df0fa18b652f59d56784efb8fe9348b5b65d091aa27a09e6b8f144a4
+  data.tar.gz: deaa7b43f225788b9366610572f5994eec8950a8e66c8159b83a18b874139d322270f274c4753dc28b6926b7c295d42a2f77600211dfbd0df0e24b82e1a155b5

data/CHANGELOG.md

@@ -1,5 +1,20 @@
+## [0.1.04] - 2021-02-28
+
+### Added
+- Class `Ast::LoxReturnStmt` a node that represents a return statement
+- Method `Ast::ASTBuilder#reduce_return_stmt`
+- Method `Ast::ASTVisitor#visit_return_stmt` for visiting an `Ast::LoxReturnStmt` node
+- Method `BackEnd::Engine#after_return_stmt` to handle return statement
+- Method `BackEnd::Function#!` implementing the logical negation of a function (as value).
+- Test suite for logical operators (in project repository)
+- Test suite for block code
+- Test suite for call and function declaration (initial)
+
+### Changed
+- Method `BackEnd::Engine#after_call_expr` now generate a `catch` and `throw` events
+
 ## [0.1.03] - 2021-02-26
-- Runtime argument chacking for arithmetic and comparison operators
+- Runtime argument checking for arithmetic and comparison operators
 
 ### Added
 - Test suite for arithmetic and comparison operators (in project repository)
@@ -221,11 +236,11 @@
 - The interpreter can evaluate substraction between two numbers.
 
 ### Added
-- Method `Datatype::Number#-` implmenting the subtraction operation
+- Method `Datatype::Number#-` implementing the subtraction operation
 
 ### Changed
 - File `README.md` minor editorial changes.
-- File `lx_string_spec.rb` Added test for string concatentation
+- File `lx_string_spec.rb` Added test for string concatenation
 - File `number_spec.rb` Added tests for addition and subtraction operations
 - File `interpreter_spec.rb` Added tests for subtraction operation
 

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -12,6 +12,7 @@ require_relative 'lox_logical_expr'
 require_relative 'lox_assign_expr'
 require_relative 'lox_block_stmt'
 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'

data/lib/loxxy/ast/ast_builder.rb

@@ -221,6 +221,11 @@ module Loxxy
         Ast::LoxPrintStmt.new(tokens[1].position, theChildren[1])
       end
 
+      # rule('returnStmt' => 'RETURN expression_opt SEMICOLON')
+      def reduce_return_stmt(_production, _range, tokens, theChildren)
+        Ast::LoxReturnStmt.new(tokens[1].position, theChildren[1])
+      end
+
       # rule('whileStmt' => 'WHILE LEFT_PAREN expression RIGHT_PAREN statement').as ''
       def reduce_while_stmt(_production, _range, tokens, theChildren)
         Ast::LoxWhileStmt.new(tokens[1].position, theChildren[2], theChildren[4])

data/lib/loxxy/ast/ast_visitor.rb

@@ -91,6 +91,14 @@ module Loxxy
         broadcast(:after_print_stmt, aPrintStmt)
       end
 
+      # Visit event. The visitor is about to visit a return statement.
+      # @param aReturnStmt [AST::LOXReturnStmt] the return statement node to visit
+      def visit_return_stmt(aReturnStmt)
+        broadcast(:before_return_stmt, aReturnStmt)
+        traverse_subnodes(aReturnStmt)
+        broadcast(:after_return_stmt, aReturnStmt, self)
+      end
+
       # Visit event. The visitor is about to visit a while statement node.
       # @param aWhileStmt [AST::LOXWhileStmt] the while statement node to visit
       def visit_while_stmt(aWhileStmt)

data/lib/loxxy/ast/lox_return_stmt.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'lox_compound_expr'
+
+module Loxxy
+  module Ast
+    class LoxReturnStmt < LoxCompoundExpr
+      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
+      # @param anExpression [Ast::LoxNode] expression to return
+      def initialize(aPosition, anExpression)
+        super(aPosition, [anExpression])
+      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
+    end # class
+  end # module
+end # module

data/lib/loxxy/back_end/engine.rb

@@ -19,7 +19,7 @@ module Loxxy
       # @return [BackEnd::SymbolTable]
       attr_reader :symbol_table
 
-      # @return [Array<Datatype::BuiltinDatatyp>] Stack for the values of expr
+      # @return [Array<Datatype::BuiltinDatatype>] Data stack for the expression results
       attr_reader :stack
 
      # @return [Hash { Symbol => UnaryOperator}]
@@ -98,6 +98,10 @@ module Loxxy
         @ostream.print tos ? tos.to_str : 'nil'
       end
 
+      def after_return_stmt(_returnStmt, _aVisitor)
+        throw(:return)
+      end
+
       def after_while_stmt(aWhileStmt, aVisitor)
         loop do
           condition = stack.pop
@@ -192,21 +196,32 @@ module Loxxy
         callee = stack.pop
         aCallExpr.arguments.reverse_each { |arg| arg.accept(aVisitor) }
 
-        if callee.kind_of?(NativeFunction)
+        case callee
+        when NativeFunction
           stack.push callee.call # Pass arguments
-        else
+        when Function
           new_env = Environment.new(symbol_table.current_env)
           symbol_table.enter_environment(new_env)
           callee.parameters&.each do |param_name|
             local = Variable.new(param_name, stack.pop)
             symbol_table.insert(local)
           end
-          callee.call(aVisitor)
+          catch(:return) do
+            callee.call(aVisitor)
+            throw(:return)
+          end
 
           symbol_table.leave_environment
+        else
+          raise Loxxy::RuntimeError, 'Can only call functions and classes.'
         end
       end
 
+      def complete_call
+        callee = ret_stack.pop
+        symbol_table.leave_environment if callee.kind_of?(Function)
+      end
+
       def after_grouping_expr(_groupingExpr)
         # Do nothing: work was already done by visiting /evaluating the subexpression
       end
@@ -255,7 +270,8 @@ module Loxxy
         negate_op = UnaryOperator.new('-', [Datatype::Number])
         unary_operators[:-@] = negate_op
 
-        negation_op = UnaryOperator.new('!', [Datatype::BuiltinDatatype])
+        negation_op = UnaryOperator.new('!', [Datatype::BuiltinDatatype,
+          BackEnd::Function])
         unary_operators[:!] = negation_op
       end
 

data/lib/loxxy/back_end/function.rb

@@ -34,6 +34,13 @@ module Loxxy
         body.empty? ? Datatype::Nil.instance : body.accept(aVisitor)
       end
 
+      # Logical negation.
+      # As a function is a truthy thing, its negation is thus false.
+      # @return [Datatype::False]
+      def !
+        Datatype::False.instance
+      end
+
       # Text representation of a Lox function
       def to_str
         "<fn #{name}>"

data/lib/loxxy/front_end/grammar.rb

@@ -74,7 +74,7 @@ module Loxxy
       rule('elsePart_opt' => [])
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'
-      rule('returnStmt' => 'RETURN expression_opt SEMICOLON')
+      rule('returnStmt' => 'RETURN expression_opt 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'

data/lib/loxxy/front_end/scanner.rb

@@ -92,6 +92,7 @@ module Loxxy
 
       private
 
+      # rubocop: disable Lint/DuplicateBranch
       def _next_token
         skip_intertoken_spaces
         curr_ch = scanner.peek(1)
@@ -125,6 +126,7 @@ module Loxxy
 
         return token
       end
+      # rubocop: enable Lint/DuplicateBranch
 
       def build_token(aSymbolName, aLexeme)
         begin

data/lib/loxxy/version.rb

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

data/spec/interpreter_spec.rb

@@ -424,6 +424,20 @@ LOX_END
         expect(sample_cfg[:ostream].string).to eq('<fn foo><native fn>')
       end
 
+      it 'should support return statements' do
+        program = <<-LOX_END
+          fun max(a, b) {
+            if (a > b) return a;
+
+            return b;
+          }
+
+          max(3, 2);
+        LOX_END
+        result = subject.evaluate(program)
+        expect(result).to eq(3)
+      end
+
       it 'should print the hello world message' do
         expect { subject.evaluate(hello_world) }.not_to raise_error
         expect(sample_cfg[:ostream].string).to eq('Hello, world!')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.03
+  version: 0.1.04
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -103,6 +103,7 @@ files:
 - lib/loxxy/ast/lox_node.rb
 - lib/loxxy/ast/lox_noop_expr.rb
 - lib/loxxy/ast/lox_print_stmt.rb
+- lib/loxxy/ast/lox_return_stmt.rb
 - lib/loxxy/ast/lox_seq_decl.rb
 - lib/loxxy/ast/lox_unary_expr.rb
 - lib/loxxy/ast/lox_var_stmt.rb