loxxy 0.4.01 → 0.4.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03ef0a6b112537abbb890f56a5746a22be8aa9373451ce57a25d33ffd4cfe2be
-  data.tar.gz: 3abea4f9bfd799de85840c93a91aa37d0f9676b5e1d9af6a68bef7d189843470
+  metadata.gz: 36f3b49ca1158cd6922cb5ece2340f53efec793e5877a96f94aebc0eee34235d
+  data.tar.gz: ade953da452fbf9ad6552e8dbfb035161c79c2bffcd0d531c4e79cf6d785c51c
 SHA512:
-  metadata.gz: 74a279e2033090d6f4df08f30e4e71cf3c34c29dff2d2400a066528b68e73b2019345a84cabfad59f0342f8ba0a0d2ebf47ce87ac2195223a9c68886febb6a72
-  data.tar.gz: 9e1c5ba2b8e88af10c198bcefdc8a791be2900df2ee71127df560f1bcbfa18f03bc4cf86d149cc475cf5392938e4d74bb769d4a80630c9a5c82e0da90c936135
+  metadata.gz: bc0ff7ac6da9846a5a70ead053ceeee2eb390f778a70932392fcbe10ce70c7e147f11983baee96dc5aed924de492d744c3b6b61c8d03f389a74432a56b3916a5
+  data.tar.gz: 40e36a53abc6ce121299952ff98f71175198271659f3a7dabf1cbd0f8e79bdc4c76242f47a4707c513f9ca63459bd4495d56de2287136cedb5cadac14ed4fca3

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
 
@@ -213,6 +222,9 @@ Naming/MethodName:
 Naming/VariableName:
   Enabled: false
 
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
 Style/Alias:
   Enabled: true
 
@@ -293,9 +305,9 @@ Style/InverseMethods:
 
 Style/MissingRespondToMissing:
   Enabled: false
-  
+
 Style/MultilineInPatternThen:
-  Enabled: true  
+  Enabled: true
 
 Style/NegatedIfElseCondition:
   Enabled: true
@@ -306,11 +318,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 +341,9 @@ Style/RedundantReturn:
 
 Style/RedundantSelf:
   Enabled: true
-  
+
 Style/RedundantSelfAssignmentBranch:
-  Enabled: true  
+  Enabled: true
 
 Style/RegexpLiteral:
   Enabled: false
@@ -333,6 +351,9 @@ Style/RegexpLiteral:
 Style/PercentLiteralDelimiters:
   Enabled: false
 
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
 Style/StderrPuts:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## [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 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)*
+
+
+
 ## [0.4.01] - 2021-08-22
 - Grammar and AST::AstBuilder adapted to take profit of extended grammar notiation in Rley 0.8.01
 
@@ -53,14 +85,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
@@ -70,7 +102,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
@@ -97,7 +129,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
@@ -272,7 +304,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.
@@ -296,7 +328,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
@@ -342,7 +374,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.
 
 
@@ -373,8 +405,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
@@ -443,7 +475,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.
@@ -713,4 +745,4 @@
 
 ## [0.0.1] - 2020-12-27
 ### Added
-- Initial Github commit
+- Initial Github commit

data/lib/loxxy/ast/ast_builder.rb

@@ -164,7 +164,7 @@ module Loxxy
         if theChildren[1].nil?
           super_var = nil
         else
-          super_token = theChildren[1].subnodes[1].token
+          super_token = theChildren[1].last.token
           super_var = LoxVariableExpr.new(super_token.position, super_token.lexeme)
         end
         [theChildren[0].token.lexeme, super_var]
@@ -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].subnodes[1] : nil
+        init_val = theChildren[2] ? theChildren[2].last : nil
         Ast::LoxVarStmt.new(tokens[1].position, var_name, init_val)
       end
 
@@ -286,7 +286,7 @@ module Loxxy
       def reduce_assign_expr(_production, _range, tokens, theChildren)
         name_assignee = theChildren[1].token.lexeme.dup
         if theChildren[0]
-          set_expr = Ast::LoxSetExpr.new(tokens[1].position, theChildren[0].subnodes[0])
+          set_expr = Ast::LoxSetExpr.new(tokens[1].position, theChildren[0].first)
           set_expr.property = name_assignee
           set_expr.value = theChildren[3]
           set_expr
@@ -393,7 +393,7 @@ module Loxxy
         first_lexeme = theChildren[0].token.lexeme
         return [first_lexeme] unless theChildren[1]
 
-        successors = theChildren[1].map { |seq_node| seq_node.subnodes[1].token.lexeme }
+        successors = theChildren[1].map { |seq_node| seq_node.last.token.lexeme }
         successors.unshift(first_lexeme)
       end
 
@@ -401,7 +401,7 @@ module Loxxy
       def reduce_arguments(_production, _range, _tokens, theChildren)
         return [theChildren[0]] unless theChildren[1]
 
-        successors = theChildren[1].map { |seq_node| seq_node.subnodes[1] }
+        successors = theChildren[1].map(&:last)
         successors.unshift(theChildren[0])
       end
     end # class

data/lib/loxxy/front_end/grammar.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 require 'rley' # Load the gem
 
 module Loxxy
@@ -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')
@@ -62,9 +59,8 @@ module Loxxy
       rule('forInitialization' => 'SEMICOLON').as 'empty_for_initialization'
       rule('forTest' => 'expression? SEMICOLON').as 'for_test'
 
-      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 ELSE {match_closest: "IF"}  statement').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.01'
+  VERSION = '0.4.05'
 end

data/loxxy.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |spec|
   PkgExtending.pkg_documentation(spec)
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.01'
+  spec.add_dependency 'rley', '~> 0.8.06'
 
   # 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

@@ -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
 
@@ -81,10 +81,7 @@ LOX_END
           expect(decls.subnodes[0].symbol.name).to eq('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.01
+  version: 0.4.05
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-10-10 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.01
+        version: 0.8.06
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.01
+        version: 0.8.06
 - !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

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