loxxy 0.4.03 → 0.4.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a500598bd4afc6d330a6e661bc9686b86de41c921fc7fea04ea0293dd97c057
-  data.tar.gz: 7e3f0335e8f9d7914d36db4e0e306ce053f9df18d5efce5cca1f43d22c866402
+  metadata.gz: 7cd3e438270c62a4863cddfd1b737182993ea205d84985e8862a25c74bb2e8c4
+  data.tar.gz: f6bd428ebc505e238392cbb04e5fb1207eb34752f974ae8f81a23798e4ef51b5
 SHA512:
-  metadata.gz: 51affe131c074f29e887b83de9263cedf31394d9c9254877ddcf971d8e5d41f7035abb50b95af8f98c18a2d9cee06bfb3df7e6c9c97db24e31dbad7fb124c2f5
-  data.tar.gz: 6e16c93754aa0bbe32815b78b2362ade39e7823dafc677cb1c2694f3bdec8c07e59820487464634bde7ab08221da4f83381b38149bd68bfd18987d19565a71ab
+  metadata.gz: 77ac1d09cb77b8afab98c21bb2f8544fd2961473efd1acaae3134a2aba0ed7138270aa86f384fe2ce1f76d865c8cd049dc3b8379b954c70992cc53b068244593
+  data.tar.gz: 9fa0e0c3c3d96600bc4e8cd0447383a287be6ff483fb2a843056c87175239bc5fd319e0f11cfe8ab496652a773c91d91f8c05176275b07873f08ffad0de7a1f4

data/.rubocop.yml

@@ -84,6 +84,9 @@ Layout/TrailingWhitespace:
 Lint/AmbiguousAssignment:
   Enabled: true
 
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+
 Lint/AmbiguousRange:
   Enabled: true
 
@@ -105,6 +108,9 @@ Lint/EmptyClass:
 Lint/EmptyInPattern:
   Enabled: true
 
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+
 Lint/LambdaWithoutLiteralBlock:
   Enabled: true
 
@@ -126,6 +132,9 @@ Lint/RaiseException:
 Lint/RedundantDirGlobSort:
   Enabled: true
 
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+
 Lint/RescueException:
   Enabled: true
 
@@ -153,6 +162,9 @@ Lint/UnusedMethodArgument:
 Lint/UselessAccessModifier:
   Enabled: true
 
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+
 Lint/Void:
   Enabled: false
 
@@ -192,6 +204,9 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+
 Naming/ConstantName:
   Enabled: false
 
@@ -213,6 +228,9 @@ Naming/MethodName:
 Naming/VariableName:
   Enabled: false
 
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
 Style/Alias:
   Enabled: true
 
@@ -293,9 +311,9 @@ Style/InverseMethods:
 
 Style/MissingRespondToMissing:
   Enabled: false
-  
+
 Style/MultilineInPatternThen:
-  Enabled: true  
+  Enabled: true
 
 Style/NegatedIfElseCondition:
   Enabled: true
@@ -306,11 +324,17 @@ Style/Next:
 Style/NilLambda:
   Enabled: true
 
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+
 Style/NumericLiterals:
   Enabled: false
-  
+
 Style/QuotedSymbols:
-  Enabled: true  
+  Enabled: true
 
 Style/RaiseArgs:
   Enabled: true
@@ -323,9 +347,9 @@ Style/RedundantReturn:
 
 Style/RedundantSelf:
   Enabled: true
-  
+
 Style/RedundantSelfAssignmentBranch:
-  Enabled: true  
+  Enabled: true
 
 Style/RegexpLiteral:
   Enabled: false
@@ -333,6 +357,9 @@ Style/RegexpLiteral:
 Style/PercentLiteralDelimiters:
   Enabled: false
 
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
 Style/StderrPuts:
   Enabled: false
 
@@ -406,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
 
@@ -417,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,15 +1,56 @@
+## [0.4.07] - 2022-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
+
+### Changed
+- Class `Scanner` remove all dependencies to `Frontend::Literal` class
+- File `.rubocop.yml` added new cops from Rubocop 1.21 and 1.22
+- File `parser_spec.rb` use of parentheses in ambiguous expressions
+- File `raw_parser_spec.rb` use of parentheses in ambiguous expressions
+- File `loxxy.gemspec` forced dependency to Rley 0.8.06
+
+## [0.4.04] - 2021-09-11
+- Grammar optimization (3 rules less, use of match_closest feature from `Rley`)
+
+### Changed
+- Method `Ast::AstBuilder#reduce_arguments` code re-styling: use shorthand &:
+- 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 inRley 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
 
 ### Fixed
 - Method `Ast::AstBuilder#reduce_class_naming` fixed access to `IDENTIFER` in (LESS IDENTIFER)?
-- Method `Ast::AstBuilder#reduce_var_declaration` fixed access to `expression` in (EQUAL expression)? 
-- Method `Ast::AstBuilder#reduce_assign_expr`fixed access to `call` in (call DOT)? 
-- Method `Ast::AstBuilder#reduce_parameters`fixed access to `IDENTIFIER` in (COMMA IDENTIFIER)* 
-- Method `Ast::AstBuilder#reduce_arguments`fixed access to `expression` in (COMMA expression)* 
+- Method `Ast::AstBuilder#reduce_var_declaration` fixed access to `expression` in (EQUAL expression)?
+- Method `Ast::AstBuilder#reduce_assign_expr`fixed access to `call` in (call DOT)?
+- Method `Ast::AstBuilder#reduce_parameters`fixed access to `IDENTIFIER` in (COMMA IDENTIFIER)*
+- Method `Ast::AstBuilder#reduce_arguments`fixed access to `expression` in (COMMA expression)*
 
 
 
@@ -68,14 +109,14 @@
 - Milestone: `Loxxy` passes all reference test suite.
 
 ### Fixed
-- Method `BackEnd::Resolver#before_variable_expr`: Standard `Lox` allows re-declaration of a variable at top-level scope 
+- Method `BackEnd::Resolver#before_variable_expr`: Standard `Lox` allows re-declaration of a variable at top-level scope
+
 
- 
 ## [0.2.06] - 2021-05-04
 - Nearly passing the 'official' test suite, fixing non-compliant behavior, specialized exceptions for errors
 
 ### New
-- Module `LoxFileTester` module that hosts methods that simplify the tests of `Lox` source file. 
+- Module `LoxFileTester` module that hosts methods that simplify the tests of `Lox` source file.
 
 ### Changed
 - Folder `test_suite` vastly reorganized. Sub-folder `baseline` contains spec files testing the `Lox` files from official implementation
@@ -85,7 +126,7 @@
 
 ### Fixed
 - `0/0` expression results in a ZeroDivisionError exception, in Lox this result to a NaN (Not a Number). Now, `Loxxy` is aligned to standard `Lox`
-- `FrontEnd::Scanner` now always treats expression like `-123` as the unary or binary minus operator applied to a positive number. 
+- `FrontEnd::Scanner` now always treats expression like `-123` as the unary or binary minus operator applied to a positive number.
 
 ## [0.2.05] - 2021-04-26
 - `Loxxy` now transforms for loops into while loops (desugaring), fix in Scanner class
@@ -112,7 +153,7 @@
 - Method `BackEnd::Resolver#after_for_stmt now accepts nil test expression
 
 ## [0.2.03] - 2021-04-24
-- Fixes for the set (field) expressions, `accept` methods for AST nodes are meta-programmed 
+- Fixes for the set (field) expressions, `accept` methods for AST nodes are meta-programmed
 
 ### New
 - Module `Ast::Visitee` provides the `define_accept` method that generate `accept` method with meta-programming
@@ -287,7 +328,7 @@
 - Fix and test suite for return statements
 
 ### CHANGED
-- `Loxxy` reports an error when a return statement occurs in top-level scope 
+- `Loxxy` reports an error when a return statement occurs in top-level scope
 
 ### Fixed
 - A return without explicit value genrated an exception in some cases.
@@ -311,7 +352,7 @@
 - Class `BackEnd::Environment`: added the attributes `predecessor` and `embedding` to support closures.
 - Class `BackeEnd::LoxFunction`: added the attribute `closure` that is equal to the environment where the function is declared.
 - Constructor `BackEnd::LoxFunction#new` now takes a `BackEnd::Engine`as its fourth parameter
-- Methods `BackEnd::SymbolTable#enter_environment`, `BackEnd::SymbolTable#leave_environment` take into account closures. 
+- Methods `BackEnd::SymbolTable#enter_environment`, `BackEnd::SymbolTable#leave_environment` take into account closures.
 
 ### Fixed
 - Method `Ast::AstBuilder#after_var_stmt` now takes into account the value from the top of stack
@@ -357,7 +398,7 @@
 
 ### Changed
 - File `console` renamed to `loxxy`. Very basic command-line interface.
-- Custom exception classes 
+- Custom exception classes
 - File `README.md` updated list of supported `Lox` keywords.
 
 
@@ -388,8 +429,8 @@
 - Method `Ast::ASTVisitor#visit_fun_stmt` for visiting an `Ast::LoxFunStmt` node
 - Method `Ast::LoxBlockStmt#empty?` returns true if the code block is empty
 - Method `BackEnd::Engine#after_fun_stmt`
-- Method `BackEnd::NativeFunction#call` 
-- Method `BackEnd::NativeFunction#to_str` 
+- Method `BackEnd::NativeFunction#call`
+- Method `BackEnd::NativeFunction#to_str`
 - Method `BackEnd::LoxFunction` runtime representation of a Lox function.
 
 ### Changed
@@ -458,7 +499,7 @@
 - Method `Ast::ASTBuilder#reduce_assign_expr` creates an `Ast::LoxAssignExpr` node
 - Method `Ast::ASTVisitor#visit_assign_expr` for visiting an `Ast::LoxAssignExpr` node
 - Method `BackEnd::Engine#after_assign_expr` implementation of the assignment
-- Method `BackEnd::Variable#assign` to assign a value to a variable 
+- Method `BackEnd::Variable#assign` to assign a value to a variable
 
 ## [0.0.23] - 2021-01-20
 - Fix for variables without explicit initialization.
@@ -728,4 +769,4 @@
 
 ## [0.0.1] - 2020-12-27
 ### Added
-- Initial Github commit
+- Initial Github commit

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,9 +399,9 @@ 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 { |seq_node| seq_node.last }
+        successors = theChildren[1].map(&:last)
         successors.unshift(theChildren[0])
       end
     end # class

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

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-
 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
@@ -32,7 +31,7 @@ module Loxxy
       rule('declaration' => 'classDecl')
       rule('declaration' => 'funDecl')
       rule('declaration' => 'varDecl')
-      rule('declaration' => 'stmt')
+      rule('declaration' => 'statement')
 
       rule('classDecl' => 'CLASS classNaming class_body').as 'class_decl'
       rule('classNaming' => 'IDENTIFIER (LESS IDENTIFIER)?').as 'class_naming'
@@ -43,8 +42,6 @@ module Loxxy
       rule('varDecl' => 'VAR IDENTIFIER (EQUAL expression)? SEMICOLON').as 'var_declaration'
 
       # Statements: produce side effects, but don't introduce bindings
-      rule('stmt' => 'statement')
-      # rule('stmt' => 'unbalancedStmt') # Tweak to cope with "dangling else" problem
       rule('statement' => 'exprStmt')
       rule('statement' => 'forStmt')
       rule('statement' => 'ifStmt')
@@ -63,11 +60,7 @@ module Loxxy
       rule('forTest' => 'expression? SEMICOLON').as 'for_test'
 
       rule('ifStmt' => 'IF ifCondition statement ELSE {match_closest: "IF"}  statement').as 'if_else_stmt'
-      rule('ifStmt' => 'IF ifCondition stmt').as 'if_stmt'
-      # rule('unbalancedStmt' => 'IF ifCondition statement ELSE unbalancedStmt').as 'if_else_stmt'
-      # rule('ifStmt' => 'IF ifCondition statement ELSE statement').as 'if_else_stmt'
-      # rule('unbalancedStmt' => 'IF ifCondition stmt').as 'if_stmt'
-      # rule('unbalancedStmt' => 'IF ifCondition statement ELSE unbalancedStmt').as 'if_else_stmt'
+      rule('ifStmt' => 'IF ifCondition statement').as 'if_stmt'
       rule('ifCondition' => 'LEFT_PAREN expression RIGHT_PAREN').as 'keep_symbol2'
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'

data/lib/loxxy/front_end/scanner.rb

@@ -4,7 +4,6 @@ require 'strscan'
 require 'rley'
 require_relative '../error'
 require_relative '../datatype/all_datatypes'
-require_relative 'literal'
 
 module Loxxy
   module FrontEnd
@@ -142,7 +141,7 @@ module Loxxy
           col = scanner.pos - lex_length - @line_start + 1
           pos = Rley::Lexical::Position.new(@lineno, col)
           if value
-            token = Literal.new(value, aLexeme.dup, symb, pos)
+            token = Rley::Lexical::Literal.new(value, aLexeme.dup, symb, pos)
           else
             token = Rley::Lexical::Token.new(aLexeme.dup, symb, pos)
           end
@@ -212,7 +211,7 @@ module Loxxy
         pos = Rley::Lexical::Position.new(line, column_start)
         lox_string = Datatype::LXString.new(literal)
         lexeme = scanner.string[scan_pos - 1..scanner.pos - 1]
-        Literal.new(lox_string, lexeme, 'STRING', pos)
+        Rley::Lexical::Literal.new(lox_string, lexeme, 'STRING', pos)
       end
 
       # Skip non-significant whitespaces and comments.

data/lib/loxxy/version.rb

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

data/spec/front_end/parser_spec.rb

@@ -46,7 +46,7 @@ module Loxxy
         end
 
         it 'should cope with whitespaces only input' do
-          ptree = subject.parse(' ' * 80 + "\n" * 20)
+          ptree = subject.parse((' ' * 80) + ("\n" * 20))
           check_empty_input_result(ptree)
         end
 

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')
@@ -40,7 +40,7 @@ module Loxxy
         end
 
         it 'should cope with whitespaces only input' do
-          ptree = subject.parse(' ' * 80 + "\n" * 20)
+          ptree = subject.parse((' ' * 80) + ("\n" * 20))
           check_empty_input_result(ptree)
         end
 
@@ -76,15 +76,12 @@ 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')
-          stmt = decls.subnodes[1].subnodes[0]
-          expect(stmt).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(stmt.symbol.name).to eq('stmt')
-          statement = stmt.subnodes[0]
+          statement = decls.subnodes[1].subnodes[0]
           expect(statement).to be_kind_of(Rley::PTree::NonTerminalNode)
           expect(statement.symbol.name).to eq('statement')
           prnt_stmt = statement.subnodes[0]

data/spec/front_end/scanner_spec.rb

@@ -105,7 +105,7 @@ LOX_END
         it 'should recognize a false boolean token' do
           subject.start_with('false')
           token_false = subject.tokens[0]
-          expect(token_false).to be_kind_of(Literal)
+          expect(token_false).to be_kind_of(Rley::Lexical::Literal)
           expect(token_false.terminal).to eq('FALSE')
           expect(token_false.lexeme).to eq('false')
           expect(token_false.value).to be_kind_of(Datatype::False)
@@ -115,7 +115,7 @@ LOX_END
         it 'should recognize a true boolean token' do
           subject.start_with('true')
           token_true = subject.tokens[0]
-          expect(token_true).to be_kind_of(Literal)
+          expect(token_true).to be_kind_of(Rley::Lexical::Literal)
           expect(token_true.terminal).to eq('TRUE')
           expect(token_true.lexeme).to eq('true')
           expect(token_true.value).to be_kind_of(Datatype::True)
@@ -137,7 +137,7 @@ LOX_END
 
           subject.start_with(input)
           subject.tokens[0..-2].each_with_index do |tok, i|
-            expect(tok).to be_kind_of(Literal)
+            expect(tok).to be_kind_of(Rley::Lexical::Literal)
             expect(tok.terminal).to eq('NUMBER')
             (lexeme, val) = expectations[i]
             expect(tok.lexeme).to eq(lexeme)
@@ -177,10 +177,10 @@ LOX_END
           tokens = subject.tokens[0..-2]
           expect(tokens[0]).to be_kind_of(Rley::Lexical::Token)
           expect(tokens[0].terminal).to eq('DOT')
-          expect(tokens[1]).to be_kind_of(Literal)
+          expect(tokens[1]).to be_kind_of(Rley::Lexical::Literal)
           expect(tokens[1].terminal).to eq('NUMBER')
           expect(tokens[1].value.value).to eq(456)
-          expect(tokens[2]).to be_kind_of(Literal)
+          expect(tokens[2]).to be_kind_of(Rley::Lexical::Literal)
           expect(tokens[2].terminal).to eq('NUMBER')
           expect(tokens[2].value.value).to eq(123)
           expect(tokens[3]).to be_kind_of(Rley::Lexical::Token)
@@ -202,7 +202,7 @@ LOX_END
 
           subject.start_with(input)
           subject.tokens[0..-2].each_with_index do |str, i|
-            expect(str).to be_kind_of(Literal)
+            expect(str).to be_kind_of(Rley::Lexical::Literal)
             expect(str.terminal).to eq('STRING')
             val = expectations[i]
             expect(str.value).to be_kind_of(Datatype::LXString)
@@ -236,7 +236,7 @@ LOX_END
         it 'should recognize a nil token' do
           subject.start_with('nil')
           token_nil = subject.tokens[0]
-          expect(token_nil).to be_kind_of(Literal)
+          expect(token_nil).to be_kind_of(Rley::Lexical::Literal)
           expect(token_nil.terminal).to eq('NIL')
           expect(token_nil.lexeme).to eq('nil')
           expect(token_nil.value).to be_kind_of(Datatype::Nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.4.03
+  version: 0.4.07
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2022-01-21 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.03
+        version: 0.8.08
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.03
+        version: 0.8.08
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,6 @@ files:
 - lib/loxxy/datatype/true.rb
 - lib/loxxy/error.rb
 - lib/loxxy/front_end/grammar.rb
-- lib/loxxy/front_end/literal.rb
 - lib/loxxy/front_end/parser.rb
 - lib/loxxy/front_end/raw_parser.rb
 - lib/loxxy/front_end/scanner.rb
@@ -171,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
@@ -180,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.

data/lib/loxxy/front_end/literal.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'rley'
-
-module Loxxy
-  module FrontEnd
-    # The superclass for all tokens that have a data value.
-    class Literal < Rley::Lexical::Token
-      # @return [Datatype] The value expressed in one of the Lox datatype.
-      attr_reader :value
-
-      # Constructor.
-      # @param aValue [Datatype::BuiltinDatatype] the Lox data value
-      # @param aLexeme [String] the lexeme (= piece of text from input)
-      # @param aTerminal [Rley::Syntax::Terminal, String]
-      #   The terminal symbol corresponding to the lexeme.
-      # @param aPosition [Rley::Lexical::Position] The position of lexeme
-      #   in input text.
-      def initialize(aValue, aLexeme, aTerminal, aPosition)
-        super(aLexeme, aTerminal, aPosition)
-        @value = aValue
-      end
-    end # class
-  end # module
-end # module