loxxy 0.4.05 → 0.4.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f3b49ca1158cd6922cb5ece2340f53efec793e5877a96f94aebc0eee34235d
-  data.tar.gz: ade953da452fbf9ad6552e8dbfb035161c79c2bffcd0d531c4e79cf6d785c51c
+  metadata.gz: e7e447625d999f4b95129d7feff1586c6759cb929a8faaa82e3ecc94105d0268
+  data.tar.gz: 00a4801454ffd09b2d4e810fd15d0f9b40fea13f46e6d4eed7eba4cab8d35ebe
 SHA512:
-  metadata.gz: bc0ff7ac6da9846a5a70ead053ceeee2eb390f778a70932392fcbe10ce70c7e147f11983baee96dc5aed924de492d744c3b6b61c8d03f389a74432a56b3916a5
-  data.tar.gz: 40e36a53abc6ce121299952ff98f71175198271659f3a7dabf1cbd0f8e79bdc4c76242f47a4707c513f9ca63459bd4495d56de2287136cedb5cadac14ed4fca3
+  metadata.gz: 4a59f746cb7b8086ff3e1252c3fc0846229cb6927dcc4d62ad261c5e0c2fec4b1a75176cab6788cedb5c57a2fe9e7bec94d92d7dc63a2c455609a18761f78043
+  data.tar.gz: 66f72710a3f422e4431c88c44b56419f727711c1fbf339491f1fcb2f8f18edb0f4a21ce49a66ee4325ccf3b2576b0b94490d74f96c922a9d340d476e43660881

data/.rubocop.yml

@@ -162,6 +162,9 @@ Lint/UnusedMethodArgument:
 Lint/UselessAccessModifier:
   Enabled: true
 
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+
 Lint/Void:
   Enabled: false
 
@@ -201,6 +204,9 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+
 Naming/ConstantName:
   Enabled: false
 
@@ -427,6 +433,12 @@ Style/EndlessMethod:
 Style/ExplicitBlockArgument:
   Enabled: true
 
+Style/FileRead: # new in 1.24
+  Enabled: true
+
+Style/FileWrite: # new in 1.24
+  Enabled: true
+
 Style/GlobalStdStream:
   Enabled: true
 
@@ -438,12 +450,19 @@ Style/HashConversion:
 
 Style/HashLikeCase:
   Enabled: true
-
+  
 Style/IfWithBooleanLiteralBranches:
   Enabled: true
+  
+Style/MapToHash: # new in 1.24
+  Enabled: true 
+
+Style/OpenStructUse: # new in 1.23
+  Enabled: true  
 
 Style/OptionalBooleanParameter:
   Enabled: true
+  
 
 Style/RedundantAssignment:
   Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## [0.4.08] - 2022-04-09
+- Refactoring of the `Scanner` class.
+
+### Changed
+- `Frontend::Scanner` class: major code refactoring. 
+
+## [0.4.07] - 2021-11-21
+- Minor fixes; dependency towards Rubies 3+ allowed...
+
+### Fixed
+- File `loxxy.gemspec` dependency on Ruby version relaxed to support Ruby 3+
+- File `resolver.rb` Fixed a typo in standard Lox error message.
+- File `collide_with_paramaeter.lox` Fixed typo in error message.
+- File `duplicate_local.lox` Fixed typo in error message.
+- File `duplicate_parameter.lox` Fixed typo in error message.
+
+
+## [0.4.06] - 2021-11-01
+- Code update to cope with `Rley` v.0.8.08 changes
+
+### Changed
+- File `AST::AstBuilder` some `reduce_` to cope implementation change of ? quantifier
+- Method `AST::LoxCallExpr#initialize` call to `Array#flatten` with argList argument
+- File `loxxy.gemspec` dependency towards `rely` minimal version number is now `0.8.08`
+- Some spec files updated after `rley` changes of ?, *, + quantifiers
+
+### Removed
+- File `front_end/literal.rb`: obsolete
+
+
 ## [0.4.05] - 2021-10-10
 - Removal of `Literal` class, code restyling to please Rubocop 1.22
 
@@ -16,7 +46,7 @@
 - File `grammar.rb` use `match_closest` constraint from Rley to cope with dangling else statement
 
 ## [0.4.02] - 2021-09-10
-- Fixes in`AST::AstBuilder` class to  cope with changes in Rley 0.8.03
+- Fixes in`AST::AstBuilder` class to cope with changes in Rley 0.8.03
 
 ### Changed
 - File `loxxy.gemspec` forced dependency to Rley 0.8.03

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2021 Dimitri Geshef
+Copyright (c) 2020-2022 Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/loxxy/ast/ast_builder.rb

@@ -222,10 +222,8 @@ module Loxxy
         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
+        [init, test, update&.first]
       end
 
       # rule('forInitialization' => 'SEMICOLON')
@@ -234,8 +232,8 @@ module Loxxy
       end
 
       # rule('forTest' => 'expression? SEMICOLON')
-      def reduce_for_test(_production, range, tokens, theChildren)
-        return_first_child(range, tokens, theChildren)
+      def reduce_for_test(_production, _range, _tokens, theChildren)
+        theChildren[0]&.first
       end
 
       # rule('ifStmt' => 'IF ifCondition statement ELSE statement')
@@ -262,7 +260,8 @@ module Loxxy
 
       # rule('returnStmt' => 'RETURN expression? SEMICOLON')
       def reduce_return_stmt(_production, _range, tokens, theChildren)
-        Ast::LoxReturnStmt.new(tokens[1].position, theChildren[1])
+        ret_expr = theChildren[1].nil? ? nil : theChildren[1].first
+        Ast::LoxReturnStmt.new(tokens[1].position, ret_expr)
       end
 
       # rule('whileStmt' => 'WHILE LEFT_PAREN expression RIGHT_PAREN statement').as ''
@@ -275,7 +274,7 @@ module Loxxy
         decls = nil
         if theChildren[1]
           pos = tokens[1].position
-          decls = LoxSeqDecl.new(tokens[1].position, theChildren[1])
+          decls = LoxSeqDecl.new(pos, theChildren[1].flatten)
         else
           pos = tokens[0].position
         end
@@ -377,15 +376,16 @@ module Loxxy
         LoxSuperExpr.new(theChildren[0].token.position, theChildren[2].token.lexeme)
       end
 
-      # rule('function' => 'IDENTIFIER LEFT_PAREN params_opt RIGHT_PAREN block').as 'function'
+      # rule('function' => 'IDENTIFIER LEFT_PAREN parameters? RIGHT_PAREN block').as 'function'
       def reduce_function(_production, _range, _tokens, theChildren)
         first_child = theChildren.first
         pos = first_child.token.position
-        if theChildren[2] && theChildren[2].size > 255
+        params = theChildren[2] ? theChildren[2].flatten : []
+        if params.size > 255
           msg = "Can't have more than 255 parameters."
           raise Loxxy::SyntaxError, msg
         end
-        LoxFunStmt.new(pos, first_child.token.lexeme, theChildren[2], theChildren[4])
+        LoxFunStmt.new(pos, first_child.token.lexeme, params, theChildren[4])
       end
 
       # rule('parameters' => 'IDENTIFIER (COMMA IDENTIFIER)*').as 'parameters'
@@ -399,7 +399,7 @@ module Loxxy
 
       # rule('arguments' => 'expression (COMMA expression)*')
       def reduce_arguments(_production, _range, _tokens, theChildren)
-        return [theChildren[0]] unless theChildren[1]
+        return [theChildren[0]] if theChildren[1].empty?
 
         successors = theChildren[1].map(&:last)
         successors.unshift(theChildren[0])

data/lib/loxxy/ast/ast_visitor.rb

@@ -244,7 +244,6 @@ module Loxxy
 
         # Let's proceed with the visit of subnodes
         subnodes.each { |a_node| a_node.accept(self) }
-
         broadcast(:after_subnodes, aParentNode, subnodes)
       end
 

data/lib/loxxy/ast/lox_call_expr.rb

@@ -12,7 +12,7 @@ module Loxxy
       # @param argList [Array<Loxxy::Ast::LoxNode>]
       def initialize(aPosition, argList)
         super(aPosition, [])
-        @arguments = argList
+        @arguments = argList.flatten
       end
 
       define_accept # Add `accept` method as found in Visitor design pattern

data/lib/loxxy/ast/lox_return_stmt.rb

@@ -6,7 +6,7 @@ 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
+      # @param anExpression [Ast::LoxNode, NilClass] expression to return
       def initialize(aPosition, anExpression)
         expr = anExpression || Datatype::Nil.instance
         super(aPosition, [expr])

data/lib/loxxy/back_end/resolver.rb

@@ -220,7 +220,7 @@ module Loxxy
         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."
+          msg = "Error at '#{aVarName}': Already a variable with this name in this scope."
           raise Loxxy::RuntimeError, msg
         elsif curr_scope.size == 255 && current_function != :none
           msg = "Error at '#{aVarName}': Too many local variables in function."

data/lib/loxxy/front_end/grammar.rb

@@ -5,7 +5,7 @@ require 'rley' # Load the gem
 module Loxxy
   module FrontEnd
     ########################################
-    # Grammar for Lox language
+    # Grammar for the Lox language
     # Authoritative grammar at:
     #   https://craftinginterpreters.com/appendix-i.html
     builder = Rley::grammar_builder do

data/lib/loxxy/front_end/scanner.rb

@@ -20,6 +20,15 @@ module Loxxy
     # Delimiters: e.g. parentheses '(',  ')'
     # Separators: e.g. comma
     class Scanner
+      PATT_BLOCK_COMMENT_BEGIN = /\/\*/.freeze
+      PATT_BLOCK_COMMENT_END = /\*\//.freeze
+      PATT_COMPARISON = /[!=><]=?/.freeze
+      PATT_IDENTIFIER = /[a-zA-Z_][a-zA-Z_0-9]*/.freeze
+      PATT_LINE_COMMENT = /\/\/[^\r\n]*/.freeze
+      PATT_NEWLINE = /(?:\r\n)|\r|\n/.freeze
+      PATT_NUMBER = /\d+(?:\.\d+)?/.freeze
+      PATT_WHITESPACE = /[ \t\f]+/.freeze
+
       # @return [StringScanner] Low-level input scanner
       attr_reader(:scanner)
 
@@ -31,7 +40,7 @@ module Loxxy
 
       # One or two special character tokens.
       # These are enumerated in section 4.2.1 Token type
-      @@lexeme2name = {
+      Lexeme2name = {
         '(' => 'LEFT_PAREN',
         ')' => 'RIGHT_PAREN',
         '{' => 'LEFT_BRACE',
@@ -77,16 +86,16 @@ module Loxxy
       # Constructor. Initialize a tokenizer for Lox input.
       # @param source [String] Lox text to tokenize.
       def initialize(source = nil)
-        @scanner = StringScanner.new('')
-        start_with(source) if source
+        reset
+        input = source || ''
+        @scanner = StringScanner.new(input)
       end
 
       # Reset the tokenizer and make the given text, the current input.
       # @param source [String] Lox text to tokenize.
       def start_with(source)
+        reset
         @scanner.string = source
-        @lineno = 1
-        @line_start = 0
       end
 
       # Scan the source and return an array of tokens.
@@ -99,39 +108,79 @@ module Loxxy
         end
         tok_sequence << build_token('EOF', nil)
 
-        return tok_sequence
+        tok_sequence
       end
 
       private
 
-      def _next_token
-        skip_intertoken_spaces
-        curr_ch = scanner.peek(1)
-        return nil if curr_ch.nil? || curr_ch.empty?
+      def reset
+        @state = :default
+        @lineno = 1
+        @line_start = 0
+      end
 
+      def _next_token
+        nesting_level = 0
         token = nil
 
-        if '(){},.;+-/*'.include? curr_ch
-          # Single delimiter or separator character
-          token = build_token(@@lexeme2name[curr_ch], scanner.getch)
-        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(/[a-zA-Z_][a-zA-Z_0-9]*/))
-          keyw = @@keywords[lexeme]
-          tok_type = keyw ? keyw.upcase : 'IDENTIFIER'
-          token = build_token(tok_type, lexeme)
-        else # Unknown token
-          col = scanner.pos - @line_start + 1
-          _erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
-          raise ScanError, "Error: [line #{lineno}:#{col}]: Unexpected character."
-        end
+        # Loop until end of input reached or token found
+        until token || scanner.eos?
+          if scanner.skip(PATT_NEWLINE)
+            next_line_scanned
+            next
+          end
 
-        return token
+          case @state
+            when :default
+              next if scanner.skip(PATT_WHITESPACE) # Skip whitespaces
+
+              curr_ch = scanner.peek(1)
+
+              token = if scanner.skip(PATT_LINE_COMMENT)
+                next
+              elsif scanner.skip(PATT_BLOCK_COMMENT_BEGIN)
+                @state = :in_block_comment
+                nesting_level = 1
+                next
+              elsif '(){},.;+-/*'.include? curr_ch
+                # Single delimiter or separator character
+                build_token(Lexeme2name[curr_ch], scanner.getch)
+              elsif (lexeme = scanner.scan(PATT_COMPARISON))
+                # One or two special character tokens
+                build_token(Lexeme2name[lexeme], lexeme)
+              elsif scanner.scan(/"/) # Start of string detected...
+                build_string_token
+              elsif (lexeme = scanner.scan(PATT_NUMBER))
+                build_token('NUMBER', lexeme)
+              elsif (lexeme = scanner.scan(PATT_IDENTIFIER))
+                keyw = @@keywords[lexeme]
+                tok_type = keyw ? keyw.upcase : 'IDENTIFIER'
+                build_token(tok_type, lexeme)
+              else # Unknown token
+                col = scanner.pos - @line_start + 1
+                _erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
+                raise ScanError, "Error: [line #{lineno}:#{col}]: Unexpected character."
+              end
+
+            when :in_block_comment
+              comment_part = scanner.scan_until(/(?:\/\*)|(?:\*\/)|(?:(?:\r\n)|\r|\n)/)
+              unterminated_comment unless comment_part
+
+              case scanner.matched
+                when PATT_NEWLINE
+                  next_line_scanned
+                when PATT_BLOCK_COMMENT_END
+                  nesting_level -= 1
+                  @state = :default if nesting_level.zero?
+                when PATT_BLOCK_COMMENT_BEGIN
+                  nesting_level += 1
+              end
+              next
+          end # case
+        end # until
+
+        unterminated_comment unless nesting_level.zero?
+        token
       end
 
       def build_token(aSymbolName, aLexeme)
@@ -214,56 +263,12 @@ module Loxxy
         Rley::Lexical::Literal.new(lox_string, lexeme, 'STRING', pos)
       end
 
-      # Skip non-significant whitespaces and comments.
-      # Advance the scanner until something significant is found.
-      def skip_intertoken_spaces
-        loop do
-          ws_found = scanner.skip(/[ \t\f]+/) ? true : false
-          nl_found = scanner.skip(/(?:\r\n)|\r|\n/)
-          if nl_found
-            ws_found = true
-            next_line
-          end
-          cmt_found = false
-          if scanner.scan(/\/(\/|\*)/)
-            cmt_found = true
-            case scanner.matched
-              when '//'
-                scanner.skip(/[^\r\n]*(?:(?:\r\n)|\r|\n)?/)
-                next_line
-              when '/*'
-                skip_block_comment
-                next
-            end
-          end
-          break unless ws_found || cmt_found
-        end
-
-        scanner.pos
-      end
-
-      def skip_block_comment
-        nesting_level = 1
-        loop do
-          comment_part = scanner.scan_until(/(?:\/\*)|(?:\*\/)|(?:(?:\r\n)|\r|\n)/)
-          unless comment_part
-            msg = "Unterminated '/* ... */' block comment on line #{lineno}"
-            raise ScanError, msg
-          end
-
-          case scanner.matched
-            when /(?:(?:\r\n)|\r|\n)/
-              next_line
-            when '*/'
-              nesting_level -= 1
-              break if nesting_level.zero?
-            when '/*'
-              nesting_level += 1
-          end
-        end
+      def unterminated_comment
+        msg = "Unterminated '/* ... */' block comment on line #{lineno}"
+        raise ScanError, msg
       end
 
-      def next_line
+      def next_line_scanned
         @lineno += 1
         @line_start = scanner.pos
       end

data/lib/loxxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loxxy
-  VERSION = '0.4.05'
+  VERSION = '0.4.08'
 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.5'
+  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.8.06'
+  spec.add_dependency 'rley', '~> 0.8.08'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'

data/spec/front_end/raw_parser_spec.rb

@@ -28,7 +28,7 @@ module Loxxy
           expect(aParseTree.root.symbol.name).to eq('program')
           (decls, eof) = aParseTree.root.subnodes
           expect(decls).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(decls.symbol.name).to eq('declaration_star')
+          expect(decls.symbol.name).to eq('rep_declaration_star')
           expect(decls.subnodes).to be_empty
           expect(eof).to be_kind_of(Rley::PTree::TerminalNode)
           expect(eof.symbol.name).to eq('EOF')
@@ -76,9 +76,9 @@ LOX_END
           expect(root.symbol.name).to eq('program')
           (decls, eof) = root.subnodes
           expect(decls).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(decls.symbol.name).to eq('declaration_star')
+          expect(decls.symbol.name).to eq('rep_declaration_star')
           expect(decls.subnodes[0]).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(decls.subnodes[0].symbol.name).to eq('declaration_star')
+          expect(decls.subnodes[0].symbol.name).to eq('rep_declaration_star')
           expect(decls.subnodes[1]).to be_kind_of(Rley::PTree::NonTerminalNode)
           expect(decls.subnodes[1].symbol.name).to eq('declaration')
           statement = decls.subnodes[1].subnodes[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.4.05
+  version: 0.4.08
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.06
+        version: 0.8.08
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.06
+        version: 0.8.08
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: An implementation of the Lox programming language.