loxxy 0.4.03 → 0.4.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a500598bd4afc6d330a6e661bc9686b86de41c921fc7fea04ea0293dd97c057
-  data.tar.gz: 7e3f0335e8f9d7914d36db4e0e306ce053f9df18d5efce5cca1f43d22c866402
+  metadata.gz: e321e9f44f39776e2684a1a2c2f2d032460847ff46cdea45791cf8724696d038
+  data.tar.gz: 1c455133b79cd26939998ebd791c5b39872de1ccf59fa6b8c8d4c7d819114021
 SHA512:
-  metadata.gz: 51affe131c074f29e887b83de9263cedf31394d9c9254877ddcf971d8e5d41f7035abb50b95af8f98c18a2d9cee06bfb3df7e6c9c97db24e31dbad7fb124c2f5
-  data.tar.gz: 6e16c93754aa0bbe32815b78b2362ade39e7823dafc677cb1c2694f3bdec8c07e59820487464634bde7ab08221da4f83381b38149bd68bfd18987d19565a71ab
+  metadata.gz: '031899513309e2950fd9dcf9fc782a14299bed0337e6ca2383351b277c69e1e5afc865d82a9bfce030d4780b9c738de18f18db970d862b344ac98ad00f22a2a7'
+  data.tar.gz: 60938437329c31b76307ea181e5596191b5261d55aeca369365fd8076f08879e2adfb112ec8cbaf1fd9d365e9e13816b644e1b897dd4f7840e37d9d20cc89ac8

data/CHANGELOG.md

@@ -1,15 +1,22 @@
+## [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 +75,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 +92,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 +119,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 +294,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 +318,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 +364,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 +395,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 +465,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 +735,4 @@
 
 ## [0.0.1] - 2020-12-27
 ### Added
-- Initial Github commit
+- Initial Github commit

data/lib/loxxy/ast/ast_builder.rb

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

data/lib/loxxy/front_end/grammar.rb

@@ -32,7 +32,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 +43,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 +61,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/version.rb

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

data/spec/front_end/raw_parser_spec.rb

@@ -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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.4.03
+  version: 0.4.04
 platform: ruby
 authors:
 - Dimitri Geshef