loxxy 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51728e22602ac35f1c31a9540daf75d4dcf0e84d1f323dd3ec287440b6fe21ef
-  data.tar.gz: beda9e48d5024a567bf2e1dd84f107991443e8bf2592b2a01f39e2ca39adc751
+  metadata.gz: c3994a3225b7dbc4a39d24cc646c20e4a7a19b074e85fe2dd9bc87d9ca1d61cb
+  data.tar.gz: 965c328057f51fb7d13886255955e782e51b1f030f3053a6f5f6f4534962855b
 SHA512:
-  metadata.gz: 72688ddf02138d6bab0cdbf8bcb3c0087a17e461dbd269fa56f4ddfe4f674172fd957ae071f0e61b6c7296ff3653a2734cc4fb9573340914337621b1d198ed0d
-  data.tar.gz: 45374a6d536f32c81f8bfdea4eeb670bb8c9d0ea0bdbc1d1c151379601d75f11e0353f20feb705a68cb647352f49c4c1231e7ba087081b9720297f79d1427db7
+  metadata.gz: 9db05948e45f7903ca71d7d0e3722f3c9b1fd3f50931e17b6bb1666c34cf03e1dc7f6cf32abee461dd6e6ec6824cd89b8ef5b2b56ae41fcd40068228d8cbaba2
+  data.tar.gz: eaa762982bd89f2b4cb85e8d6831017e702b87501b7c29132f25f79fa592bf804ec95736f518d304f43caf814aa55eeadd5041ffcba1afa3aaaed631d23027af

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.1.15] - 2021-04-08
+- Fixed the `dangling else`by tweaking the grammar rules
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_if__else_stmt` parse action specific for if with else branch
+
+### Fixed
+- File `grammar.rb` changed rules to cope with `dangling else` issue
+
+### Changed
+- Method `Ast::ASTBuilder#reduce_if_stmt` parse action for if without else branch
+- File `README.md` removed the section about the `dangling else` issue.
+
+
 ## [0.1.14] - 2021-04-05
 - `Loxxy` now implements the 'this' keyword
 

data/README.md

@@ -331,30 +331,6 @@ print "else-branch";
 ```
 
 As for other languages, the `else` part is optional.
-##### Warning: nested `if`...`else`
-Call it a bug ... Nested `if` `else` control flow structure aren't yet supported by __Loxxy__.  
-The culprit has a name: [the dangling else](https://en.wikipedia.org/wiki/Dangling_else). 
-
-The problem in a nutshell: in a nested if ... else ... statement like this:
-``` javascript
-'if (true) if (false) print "bad"; else print "good";
-```
-... there is an ambiguity.  
-Indeed, according to the __Lox__ grammar, the `else` could be bound 
-either to the first `if` or to the second one.
-This ambiguity is usually lifted by applying an ad-hoc rule: an `else` is aways bound to the most 
-recent (rightmost) `if`.  
-Being a generic parsing library, `Rley` doesn't apply any of these supplemental rules.  
-As a consequence,it complains about the found ambiguity and stops the parsing...
-Although `Rley` can cope with ambiguities, this requires the use of an advanced data structure
-called `Shared Packed Parse Forest (SPPF)`.
-SPPF are much more complex to handle than the "common" parse trees present in most compiler or interpreter books.
-Therefore, a future version of `Rley` will incorporate the capability to define disambuiguation rules.  
-
-In the meantime, the `Loxxy` will progress on other __Lox__ features like:
-- Block structures...
-- Iteration structures (`for` and `while` loops)
-
 
 ####  Print Statement
 

data/lib/loxxy/ast/ast_builder.rb

@@ -233,11 +233,20 @@ module Loxxy
         return_first_child(range, tokens, theChildren)
       end
 
-      # rule('ifStmt' => 'IF ifCondition statement elsePart_opt')
+      # rule('ifStmt' => 'IF ifCondition statement ELSE statement')
+      # rule('unbalancedStmt' => 'IF ifCondition statement ELSE unbalancedStmt')
+      def reduce_if_else_stmt(_production, _range, tokens, theChildren)
+        condition = theChildren[1]
+        then_stmt = theChildren[2]
+        else_stmt = theChildren[4]
+        LoxIfStmt.new(tokens[0].position, condition, then_stmt, else_stmt)
+      end
+
+      # rule('unbalancedStmt' => 'IF ifCondition stmt').as ''
       def reduce_if_stmt(_production, _range, tokens, theChildren)
         condition = theChildren[1]
         then_stmt = theChildren[2]
-        else_stmt = theChildren[3]
+        else_stmt = nil
         LoxIfStmt.new(tokens[0].position, condition, then_stmt, else_stmt)
       end
 

data/lib/loxxy/front_end/grammar.rb

@@ -35,7 +35,7 @@ module Loxxy
       rule('declaration' => 'classDecl')
       rule('declaration' => 'funDecl')
       rule('declaration' => 'varDecl')
-      rule('declaration' => 'statement')
+      rule('declaration' => 'stmt')
 
       rule('classDecl' => 'CLASS classNaming class_body').as 'class_decl'
       rule('classNaming' => 'IDENTIFIER LESS IDENTIFIER')
@@ -52,6 +52,8 @@ module Loxxy
       rule('varDecl' => 'VAR IDENTIFIER EQUAL expression SEMICOLON').as 'var_initialization'
 
       # 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')
@@ -70,10 +72,10 @@ module Loxxy
       rule('forTest' => 'expression_opt SEMICOLON').as 'for_test'
       rule('forUpdate' => 'expression_opt')
 
-      rule('ifStmt' => 'IF ifCondition statement elsePart_opt').as 'if_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('ifCondition' => 'LEFT_PAREN expression RIGHT_PAREN').as 'keep_symbol2'
-      rule('elsePart_opt' => 'ELSE statement').as 'keep_symbol2'
-      rule('elsePart_opt' => [])
 
       rule('printStmt' => 'PRINT expression SEMICOLON').as 'print_stmt'
       rule('returnStmt' => 'RETURN expression_opt SEMICOLON').as 'return_stmt'

data/lib/loxxy/version.rb

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

data/spec/front_end/raw_parser_spec.rb

@@ -76,8 +76,11 @@ LOX_END
           expect(decls.symbol.name).to eq('declaration_plus')
           stmt = decls.subnodes[0].subnodes[0]
           expect(stmt).to be_kind_of(Rley::PTree::NonTerminalNode)
-          expect(stmt.symbol.name).to eq('statement')
-          prnt_stmt = stmt.subnodes[0]
+          expect(stmt.symbol.name).to eq('stmt')
+          statement = stmt.subnodes[0]
+          expect(statement).to be_kind_of(Rley::PTree::NonTerminalNode)
+          expect(statement.symbol.name).to eq('statement')
+          prnt_stmt = statement.subnodes[0]
           expect(prnt_stmt).to be_kind_of(Rley::PTree::NonTerminalNode)
           expect(prnt_stmt.subnodes.size).to eq(3)
           expect(prnt_stmt.subnodes[0]).to be_kind_of(Rley::PTree::TerminalNode)

data/spec/interpreter_spec.rb

@@ -227,19 +227,20 @@ module Loxxy
           # Evaluate the 'then' expression if the condition is true.
           ['if (true) print "then-branch";', 'then-branch'],
           ['if (false) print "ignored";', ''],
-          # TODO: test with then block body
-          # TODO: test with assignment in if condition
+          ['if (nil) print "ignored";', ''],
+          ['if (true) { print "block"; }', 'block'],
+          ['var a = false; if (a = true) print a;', 'true'],
 
           # Evaluate the 'else' expression if the condition is false.
           ['if (true) print "then-branch"; else print "else-branch";', 'then-branch'],
           ['if (false) print "then-branch"; else print "else-branch";', 'else-branch'],
           ['if (0) print "then-branch"; else print "else-branch";', 'then-branch'],
-          ['if (nil) print "then-branch"; else print "else-branch";', 'else-branch']
-          # TODO: test with else block body
+          ['if (nil) print "then-branch"; else print "else-branch";', 'else-branch'],
+          ['if (false) nil; else { print "else-branch"; }', 'else-branch'],
 
-          # TODO: A dangling else binds to the right-most if.
-          # ['if (true) if (false) print "bad"; else print "good";', 'good'],
-          # ['if (false) if (true) print "bad"; else print "worse";', 'bad']
+          # A dangling else binds to the right-most if.
+          ['if (true) if (false) print "bad"; else print "good";', 'good'],
+          ['if (false) if (true) print "bad"; else print "worse";', '']
         ].each do |(source, predicted)|
           io = StringIO.new
           cfg = { ostream: io }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley