loxxy 0.2.04 → 0.2.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d628b0737a29bab0869827af50a363846200bfab7baddc63279e0e3fb904fa75
-  data.tar.gz: d617939297fe24cf267fb66c198cbc172e05a7df4472eac546bd9b5e27eef0cd
+  metadata.gz: ce7eeb0247e67176d1dc4c67066eff4398ffaa8b75755b289eb3e53932d3006b
+  data.tar.gz: 84f7c781c10b0f6f07cfb5bab98d2ab9d78340cf5b20426822226cbe5c266a94
 SHA512:
-  metadata.gz: dde10867e0a0243a5c0e2349a37df2ec76178aa2a7da625abd42363175301bf773d8d56aa249dde380361b13af5181c33a8ed65a4cf1bd2bbdaf2c946b534f99
-  data.tar.gz: 204243d4d781f54820a66d483d791676d144b3a4af7febbb2a1a27041c651d2ea4a0015e2bf3408754c9ea31dc0f66b4c6b0d8ad6175edc5912391331f95e9e1
+  metadata.gz: ad3cce2c2f3bcf8c0c3ae30b1dc050764c654e276a2d482934c2efd7ad6120b0db7e415003bd8d2f887ed118f723eee7c882f231ceadea773236d1d01e478db9
+  data.tar.gz: d5e25c250ac629d76e01468fbb59a2fcb287b2a112fda9f2432e83df48a889581ecbe38723ab7371ba6ae3cdd94367051249907994caa78bfa852e7b328a0811

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [0.2.05] - 2021-04-26
+- `Loxxy` now transforms for loops into while loops (desugaring), fix in Scanner class
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_for_stmt` converts 'for' loops into 'while' loops
+- Method `Ast::ASTBuilder#reduce_for_control takes care of case for(expr1;;expr2) now test expression is set to true
+
+### Fixed
+- Method `FrontEnd::Scanner#next_token` keyword recognition was case insensitive
+
+### Removed
+- Method `Ast::Visitor#visitor_for_stmt`
+- Method `BackEnd::Engine#after_for_stmt`
+- Method `BackEnd::Resolver#before_for_stmt`
+- Method `BackEnd::Resolver#after_for_stmt`
+
+
 ## [0.2.04] - 2021-04-25
 - `Loxxy` passes the test suite for `for` statements
 

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -19,7 +19,6 @@ 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'
 require_relative 'lox_var_stmt'
 require_relative 'lox_class_stmt'
 require_relative 'lox_seq_decl'

data/lib/loxxy/ast/ast_builder.rb

@@ -225,16 +225,39 @@ module Loxxy
       end
 
       # rule('forStmt' => 'FOR LEFT_PAREN forControl RIGHT_PAREN statement')
-      def reduce_for_stmt(_production, _range, _tokens, theChildren)
-        for_stmt = theChildren[2]
-        for_stmt.body_stmt = theChildren[4]
+      def reduce_for_stmt(_production, _range, tokens, theChildren)
+        # Following 'Crafting Interpreters', we replace the for statement by a while loop
+        return theChildren[4] if theChildren[2].compact.empty? # for(;;) => execute body once
+
+        (init, test, update) = theChildren[2]
+        if update
+          new_body = LoxSeqDecl.new(tokens[0].position, [theChildren[4], update])
+          stmt = Ast::LoxBlockStmt.new(tokens[1].position, new_body)
+        else
+          stmt = theChildren[4]
+        end
+        while_stmt = Ast::LoxWhileStmt.new(tokens[0].position, test, stmt)
+
+        if init
+          block_body = LoxSeqDecl.new(tokens[0].position, [init, while_stmt])
+          for_stmt = Ast::LoxBlockStmt.new(tokens[1].position, block_body)
+        else
+          for_stmt = while_stmt
+        end
+
         for_stmt
       end
 
       # rule('forControl' => 'forInitialization forTest forUpdate')
       def reduce_for_control(_production, _range, tokens, theChildren)
         (init, test, update) = theChildren
-        Ast::LoxForStmt.new(tokens[0].position, init, test, update)
+        if test.nil? && update
+          # when test expr is nil but update expr is not, then force test to be true
+          test = LoxLiteralExpr.new(tokens[0].position, Datatype::True.instance)
+          [init, test, update]
+        else
+          theChildren
+        end
       end
 
       # rule('forInitialization' => 'SEMICOLON')

data/lib/loxxy/ast/ast_visitor.rb

@@ -75,14 +75,6 @@ module Loxxy
         broadcast(:after_class_stmt, aClassStmt, self)
       end
 
-      # Visit event. The visitor is about to visit a for statement.
-      # @param aForStmt [AST::LOXForStmt] the for statement node to visit
-      def visit_for_stmt(aForStmt)
-        broadcast(:before_for_stmt, aForStmt)
-        traverse_subnodes(aForStmt) # The condition is visited/evaluated here...
-        broadcast(:after_for_stmt, aForStmt, self)
-      end
-
       # Visit event. The visitor is about to visit a if statement.
       # @param anIfStmt [AST::LOXIfStmt] the if statement node to visit
       def visit_if_stmt(anIfStmt)
@@ -111,7 +103,7 @@ module Loxxy
       # @param aWhileStmt [AST::LOXWhileStmt] the while statement node to visit
       def visit_while_stmt(aWhileStmt)
         broadcast(:before_while_stmt, aWhileStmt)
-        traverse_subnodes(aWhileStmt) # The condition is visited/evaluated here...
+        traverse_subnodes(aWhileStmt) if aWhileStmt.condition # The condition is visited/evaluated here...
         broadcast(:after_while_stmt, aWhileStmt, self)
       end
 

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,28 +116,6 @@ module Loxxy
         before_block_stmt(aForStmt)
       end
 
-      def after_for_stmt(aForStmt, aVisitor)
-        iterating = false
-
-        loop do
-          if aForStmt.test_expr
-            aForStmt.test_expr.accept(aVisitor)
-            condition = stack.pop
-            break unless condition.truthy?
-          elsif iterating
-            # when both test and update expressions are nil => execute body once
-            break unless aForStmt.update_expr
-          else
-            iterating = true
-          end
-
-          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
@@ -163,7 +141,7 @@ module Loxxy
           break unless condition.truthy?
 
           aWhileStmt.body.accept(aVisitor)
-          aWhileStmt.condition.accept(aVisitor)
+          aWhileStmt.condition&.accept(aVisitor)
         end
       end
 
@@ -179,7 +157,7 @@ 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)

data/lib/loxxy/back_end/resolver.rb

@@ -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)
@@ -123,7 +112,7 @@ module Loxxy
 
       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

data/lib/loxxy/front_end/scanner.rb

@@ -54,11 +54,11 @@ 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
 
       # Constructor. Initialize a tokenizer for Lox input.
@@ -113,8 +113,8 @@ module Loxxy
         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...

data/lib/loxxy/version.rb

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

data/spec/front_end/scanner_spec.rb

@@ -217,6 +217,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.2.04
+  version: 0.2.05
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -99,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,37 +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
-
-      # 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