loxxy 0.4.07 → 0.4.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd3e438270c62a4863cddfd1b737182993ea205d84985e8862a25c74bb2e8c4
-  data.tar.gz: f6bd428ebc505e238392cbb04e5fb1207eb34752f974ae8f81a23798e4ef51b5
+  metadata.gz: 8ece684c97fd1a382d69d7fb821bd33ca29b662c07230e1f305a9fb50e4abef1
+  data.tar.gz: 0400c4fe48329686f63d34693658c6a8960759ba10173958e0ef0c6b2b75880b
 SHA512:
-  metadata.gz: 77ac1d09cb77b8afab98c21bb2f8544fd2961473efd1acaae3134a2aba0ed7138270aa86f384fe2ce1f76d865c8cd049dc3b8379b954c70992cc53b068244593
-  data.tar.gz: 9fa0e0c3c3d96600bc4e8cd0447383a287be6ff483fb2a843056c87175239bc5fd319e0f11cfe8ab496652a773c91d91f8c05176275b07873f08ffad0de7a1f4
+  metadata.gz: 373db901360190ef0cd84fa3142ec7705922a41d77ec36e3a2f6b8a0b74fbc27c6f0e6de00fc8c38122813a4333758a497b9a88fc372c977a558c8722c19dccb
+  data.tar.gz: a52c9d016e7761ce6b0415cf7c5a409a90106e96c8c18dd8d7e264f87bf43a293d7314bf3854164e809cc1c9cb8354e4c9b97d5d1f2f57d6730e0ecf229e4502

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
     - 'exp/**/*'
     - 'demo/**/*'
 
-Gemspec/DateAssignment:
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
 Layout/ArgumentAlignment:

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## [0.4.07] - 2022-11-21
+## [0.4.09] - 2025-01-16
+- Tested with MRI Ruby 3.4.1.
+- Minor changes
+- [NEW] Added `demo` folder
+- [FIX] Some Rubocop 1.72.0 offences fixed.
+
+## [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
@@ -8,7 +20,6 @@
 - 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
 

data/README.md

@@ -19,8 +19,8 @@ Although __Lox__ is fairly simple, it is far from being a toy language:
 ### Loxxy gem features
 - Complete tree-walking interpreter including lexer, parser and resolver
 - 100% pure Ruby with clean design (not a port from some other language)
-- Passes the `jox` (THE reference `Lox` implementation) test suite
-- Can run a Lox imterpreter implemented in ... `Lox` [LoxLox](https://github.com/benhoyt/loxlox),
+- Passes the `jlox` (THE reference `Lox` implementation) test suite
+- Can run a Lox interpreter implemented in ... `Lox` [LoxLox](https://github.com/benhoyt/loxlox),
 - Minimal runtime dependency (Rley gem). Won't drag a bunch of gems...  
 - Ruby API for integrating a Lox interpreter with your code.
 - A command-line interpreter `loxxy`
@@ -55,7 +55,7 @@ And then execute:
 Create a text file and enter the following lines:
 ```javascript
 // hello.lox
-// Your firs Lox program
+// Your first Lox program
 print "Hello, world.";
 ```
 
@@ -326,7 +326,9 @@ lox_input = <<-LOX_END
   print "Hello, world!";
 LOX_END
 
-
+lox = Loxxy::Interpreter.new
+lox.evaluate(lox_program) # => Hello, world!
+```
 
 ## Suppported Lox language features
 

data/lib/loxxy/ast/ast_builder.rb

@@ -188,7 +188,7 @@ module Loxxy
       # rule('varDecl' => 'VAR IDENTIFIER (EQUAL expression)? SEMICOLON')
       def reduce_var_declaration(_production, _range, tokens, theChildren)
         var_name = theChildren[1].token.lexeme.dup
-        init_val = theChildren[2] ? theChildren[2].last : nil
+        init_val = theChildren[2]&.last
         Ast::LoxVarStmt.new(tokens[1].position, var_name, init_val)
       end
 
@@ -260,7 +260,7 @@ module Loxxy
 
       # rule('returnStmt' => 'RETURN expression? SEMICOLON')
       def reduce_return_stmt(_production, _range, tokens, theChildren)
-        ret_expr = theChildren[1].nil? ? nil : theChildren[1].first
+        ret_expr = theChildren[1]&.first
         Ast::LoxReturnStmt.new(tokens[1].position, ret_expr)
       end
 

data/lib/loxxy/back_end/resolver.rb

@@ -178,7 +178,6 @@ module Loxxy
         resolve_local(aThisExpr, aVisitor)
       end
 
-      # rubocop: disable Style/CaseLikeIf
       # rubocop: disable Style/StringConcatenation
       def after_super_expr(aSuperExpr, aVisitor)
         msg_prefix = "Error at 'super': Can't use 'super' "
@@ -195,7 +194,6 @@ module Loxxy
         resolve_local(aSuperExpr, aVisitor)
       end
       # rubocop: enable Style/StringConcatenation
-      # rubocop: enable Style/CaseLikeIf
 
       # function declaration creates a new scope for its body & binds its parameters for that scope
       def before_fun_stmt(aFunStmt, aVisitor)

data/lib/loxxy/datatype/number.rb

@@ -63,7 +63,6 @@ module Loxxy
       # one Lox number and a Ruby Numeric
       # @param other [Loxxy::Datatype::Number, Numeric]
       # @return [Loxxy::Datatype::Number]
-      # rubocop: disable Lint/BinaryOperatorWithIdenticalOperands
       def /(other)
         case other
         when Number, Numeric
@@ -84,7 +83,6 @@ module Loxxy
           raise TypeError, err_msg
         end
       end
-      # rubocop: enable Lint/BinaryOperatorWithIdenticalOperands
 
       # Unary minus (return value with changed sign)
       # @return [Loxxy::Datatype::Number]

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',
@@ -58,7 +67,7 @@ module Loxxy
       @@keywords = %w[
         and class else false fun for if nil or
         print return super this true var while
-      ].map { |x| [x, x] }.to_h
+      ].to_h { |x| [x, x] }
 
       # Single character that have a special meaning when escaped
       # @return [{Char => String}]
@@ -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.07'
+  VERSION = '0.4.09'
 end

data/loxxy.gemspec

@@ -10,12 +10,10 @@ module PkgExtending
     file_list = Dir[
       '.rubocop.yml',
       '.rspec',
-      '.travis.yml',
       '.yardopts',
       'Gemfile',
       'Rakefile',
       'CHANGELOG.md',
-      'CODE_OF_CONDUCT.md',
       'LICENSE.txt',
       'README.md',
       'loxxy.gemspec',
@@ -48,7 +46,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.6'
 
   spec.bindir        = 'bin'
   spec.executables   = ['loxxy']
@@ -58,10 +56,11 @@ Gem::Specification.new do |spec|
   PkgExtending.pkg_documentation(spec)
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.08'
+  spec.add_dependency 'rley', '~> 0.8.10'
 
   # Development dependencies
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 2.5.0'
+  spec.add_development_dependency 'rake', '~> 13.1.0'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'yard', '~> 0.9.34'
 end

data/spec/back_end/engine_spec.rb

@@ -15,7 +15,7 @@ module Loxxy
       subject { Engine.new(sample_options) }
 
       context 'Initialization:' do
-        it 'should accept a option Hash at initialization' do
+        it 'should accept an option Hash at initialization' do
           expect { Engine.new(sample_options) }.not_to raise_error
         end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.4.07
+  version: 0.4.09
 platform: ruby
 authors:
 - Dimitri Geshef
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,56 +15,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.08
+        version: 0.8.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.08
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.34
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.34
 description: |2
     A Ruby implementation of the Lox programming language. Lox is a dynamically typed,
     object-oriented programming language that features first-class functions, closures,
@@ -80,7 +93,6 @@ extra_rdoc_files:
 files:
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -163,7 +175,6 @@ homepage: https://github.com/famished-tiger/loxxy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - --charset=UTF-8 --exclude="examples|spec"
 require_paths:
@@ -172,15 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An implementation of the Lox programming language.
 test_files:

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.1.4