rley 0.1.05 → 0.1.06

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUxODY4MDAzOWE1NjFkYzc5NGFjYzNhZWIxMTRjMmY5NzA4Zjg3Yw==
+    YzFjODYyODc0MDUzODcwNDlmYWI0ODhkNTAxNDJjZmVlNTUwMTdiNg==
   data.tar.gz: !binary |-
-    ZTRlN2M4ZjUyZDE2MTVkMzBlODdjNjdkZWFjMzk5NjI0ZDI1MjNkZA==
+    N2QxZWZlODFjNTBlMzM4NzgzMWMwYzY4YWUzZDI4MTk1ODAwZmY4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWE4NTFmODdjMjk3YTU0NjY5YTFmMmI3ZjRmYzNjMDdlYjYwN2FkOTE1YTc3
-    ZmE1YjY2MTAwNGIwZTcyMThiOTQ5MjVjZWIzZDM4NTE3YzA4NWY5ZTMyM2Y2
-    YTQ0YTdkZWE2YjVmYzA3MDE5MjJjNmM1YzE0YzUyMDY0NjBlNDc=
+    ZDI3YjJmMjA0Mzg1NjhhNWJhMWZjNGIyNjE5OTg2NGYwMzNhNmUwMDA4ODM5
+    ZWI2M2Q5NjAyMGIyODlkOTYxZTMyMjg3NjdkMjgzZDJlNjJmYmJiNTc3MDli
+    OTcyZWIwOWFjY2UzMzRlMDA1OWU5ZTlhMDc4MGE0Yzc2MmRmYzE=
   data.tar.gz: !binary |-
-    YTFiMTNkZWVjYjVjYzNiMzg4N2E0ZDY0MWFkYWY5OWE0NGI1YjUyYTlkMjRj
-    YTU2NWM0ZDIwYTE2YWU2MmVjOTg2OTRhZTU0Njk1YjNmNTA0NjVjNDIzNDI2
-    NDkyMzBiYTc2MWI1ZmVhYTcyMjVkNzVjNTVjMTlmZjMyOTU5YjI=
+    NjMzOGViZTZmOTIwMTAwM2FjYTMyZjAyYjYzMmIyMjY0OTM4OTk0NDM3MzAw
+    YTEyNzE2NjA0OTA0NTVmZDRkYTJiNDAxMDY1NTE2NjlhM2M2YzNhZTA0OWIy
+    NWJkNTQ2M2RjMjAxZmUxMjQ3MmY5OGQ1ZmE2ZjMyYzUwMzhhNDA=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.1.06 / 2014-12-13
+* [NEW] New parse tree formatting class `JSON` for parse tree rendition in JSON.
+* [FIX] Method `Parsing#parse_tree` now add link to Token object for last TerminalNode in tree.
+
 ### 0.1.05 / 2014-12-10
 * [NEW] New parse tree formatting classes `BaseFormatter` and `Debug`
 * [CHANGE] Method `Parsing#parse_tree` now add links to Token objects in TerminalNodes.

data/lib/rley/constants.rb

@@ -3,7 +3,7 @@
 
 module Rley # Module used as a namespace
   # The version number of the gem.
-  Version = '0.1.05'
+  Version = '0.1.06'
 
   # Brief description of the gem.
   Description = "Ruby implementation of the Earley's parsing algorithm"

data/lib/rley/formatter/debug.rb

@@ -7,12 +7,6 @@ module Rley # This module is used as a namespace
 
     # A formatter class that renders the visit notification events
     # from a parse tree visitor
-    # @example
-    #   some_grammar = ... # Points to a DynamicGrammar-like object
-    #   # Output the result to the standard console output
-    #   formatter = Sequitur::Formatter::Debug.new(STDOUT)
-    #   # Render the visit notifications
-    #   formatter.run(some_grammar.visitor)
     class Debug < BaseFormatter
       # Current indentation level
       attr(:indentation)

data/lib/rley/formatter/json.rb

@@ -0,0 +1,125 @@
+require_relative 'base_formatter'
+
+
+module Rley # This module is used as a namespace
+  # Namespace dedicated to parse tree formatters.
+  module Formatter
+
+    # A formatter class that renders a parse tree in JSON format
+    class Json < BaseFormatter
+      # Current indentation level
+      attr(:indentation)
+
+      # Array of booleans (one per indentation level).
+      # Set to true after first child was visited.
+      attr(:sibling_flags)
+
+      # Constructor.
+      # @param anIO [IO] The output stream to which the rendered grammar
+      # is written.
+      def initialize(anIO)
+        super(anIO)
+        @indentation = 0
+        @sibling_flags = [ false ]
+      end
+
+      public
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor is about to visit the given
+      # parse tree
+      # @param _ptree [ParseTree]
+      def before_ptree(_ptree)
+        print_text('', "{\n")
+        indent
+        print_text('', "\"root\":")
+        indent
+      end
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor is about to visit
+      # a non-terminal node
+      # @param _nonterm [NonTerminalNode]
+      def before_non_terminal(nonterm_node)
+        separator = sibling_flags[-1] ? ",\n" : "\n"
+        name = nonterm_node.symbol.name
+        print_text(separator, "{ \"#{name}\": ")
+        sibling_flags[-1] = true
+      end
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor is about to visit
+      # the children of a non-terminal node
+      # @param _parent [NonTerminalNode]
+      # @param _children [Array] array of children nodes
+      def before_children(_parent, _children)
+        print_text('[', nil)
+        indent
+        sibling_flags.push(false)
+      end
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor is about to visit
+      # a terminal node
+      # @param _term [TerminalNode]
+      def before_terminal(term_node)
+        separator = sibling_flags[-1] ? ",\n" : "\n"
+        name = term_node.symbol.name
+        lexeme = term_node.token.lexeme
+        print_text(separator, "{\"#{name}\": \"#{lexeme}\"}")
+        sibling_flags[-1] = true
+      end
+
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor completed the visit of
+      # the children of a non-terminal node.
+      # @param _parent [NonTerminalNode]
+      # @param _children [Array] array of children nodes
+      def after_children(_parent, _children)
+        sibling_flags.pop
+        print_text("\n", ']')
+        dedent
+        print_text("\n", '}')
+      end
+
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor completed the visit of
+      # a non-terminal node
+      # @param _nonterm [NonTerminalNode]
+      def after_non_terminal(_)
+      end
+
+
+      # Method called by a ParseTreeVisitor to which the formatter subscribed.
+      # Notification of a visit event: the visitor completed the visit
+      # of the given parse tree
+      # @param _ptree [ParseTree]
+      def after_ptree(_ptree)
+        dedent
+        #print_text("\n", ']')
+        dedent
+        print_text("\n", '}')
+      end
+
+      private
+
+      def indent()
+        @indentation += 1
+      end
+
+      def dedent()
+        @indentation -= 1
+      end
+
+      def print_text(aSeparator, aText)
+        output.print aSeparator
+        output.print "#{' ' * 2 * @indentation}#{aText}" unless aText.nil?
+      end
+
+    end # class
+  end # module
+end # module
+
+# End of file

data/lib/rley/parser/parsing.rb

@@ -57,6 +57,10 @@ module Rley # This module is used as a namespace
               ptree.current_node.range = { low: parse_state.origin }
               node_range =  ptree.current_node.range
               ptree.add_children(curr_dotted_item.production, node_range)
+              if ptree.current_node.is_a?(PTree::TerminalNode)
+                curr_node = ptree.current_node
+                curr_node.token = tokens[state_set_index-1] unless curr_node.token
+              end
               
             when NilClass
               lhs = curr_dotted_item.production.lhs
@@ -70,7 +74,6 @@ module Rley # This module is used as a namespace
               break if ptree.root == ptree.current_node
           end
         end
-        
         return ptree
       end
 
@@ -149,11 +152,6 @@ module Rley # This module is used as a namespace
         candidate_states = last_chart_entry.states_for(start_production)
         return candidate_states.find(&:complete?)
       end
-      
-      # Complete the generated parse tree.
-      # Link each terminal node to its corresponding token object.
-      def complete_ptree()
-      end
     end # class
   end # module
 end # module

data/lib/rley/ptree/terminal_node.rb

@@ -4,7 +4,7 @@ module Rley # This module is used as a namespace
   module PTree # This module is used as a namespace
     class TerminalNode < ParseTreeNode
       # Link to the input token
-      attr_writer(:token)
+      attr(:token, true)
 
       def initialize(aTerminalSymbol, aRange)
         super(aTerminalSymbol, aRange)

data/spec/rley/formatter/debug_spec.rb

@@ -1,7 +1,6 @@
 require_relative '../../spec_helper'
 require 'stringio'
 
-# require_relative '../../../lib/rley/dynamic_grammar'
 require_relative '../support/grammar_abc_helper'
 require_relative '../../../lib/rley/parser/token'
 require_relative '../../../lib/rley/parser/earley_parser'

data/spec/rley/formatter/json_spec.rb

@@ -0,0 +1,112 @@
+require_relative '../../spec_helper'
+require 'stringio'
+
+# require_relative '../../../lib/rley/dynamic_grammar'
+require_relative '../support/grammar_abc_helper'
+require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/parser/earley_parser'
+require_relative '../../../lib/rley/ptree/parse_tree'
+require_relative '../../../lib/rley/parse_tree_visitor'
+# Load the class under test
+require_relative '../../../lib/rley/formatter/json'
+
+module Rley # Re-open the module to get rid of qualified names
+module Formatter
+
+describe Json do
+  include GrammarABCHelper  # Mix-in module with builder for grammar abc
+
+  # Factory method. Build a production with the given sequence
+  # of symbols as its rhs.
+    let(:grammar_abc) do
+      builder = grammar_abc_builder
+      builder.grammar
+    end
+    
+    # Variables for the terminal symbols
+    let(:a_) { grammar_abc.name2symbol['a'] }
+    let(:b_) { grammar_abc.name2symbol['b'] }
+    let(:c_) { grammar_abc.name2symbol['c'] }
+    
+    # Helper method that mimicks the output of a tokenizer
+    # for the language specified by gramma_abc
+    let(:grm_abc_tokens1) do
+      [
+        Parser::Token.new('a', a_),
+        Parser::Token.new('a', a_),
+        Parser::Token.new('b', b_),
+        Parser::Token.new('c', c_),
+        Parser::Token.new('c', c_)
+      ]
+    end
+
+    # Factory method that builds a sample parse tree.
+    # Generated tree has the following structure:
+    # S[0,5]
+    # +- A[0,5]
+    #    +- a[0,0]
+    #    +- A[1,4]
+    #    |  +- a[1,1]
+    #    |  +- A[2,3]
+    #    |  |  +- b[2,3]
+    #    |  +- c[3,4]
+    #    +- c[4,5]
+    # Capital letters represent non-terminal nodes
+    let(:grm_abc_ptree1) do
+      parser = Parser::EarleyParser.new(grammar_abc)
+      parse_result = parser.parse(grm_abc_tokens1)
+      parse_result.parse_tree
+    end
+  
+  let(:destination) { StringIO.new('', 'w') }
+
+  context 'Standard creation & initialization:' do
+
+    it 'should be initialized with an IO argument' do
+      expect { Json.new(StringIO.new('', 'w')) }.not_to raise_error
+    end
+    
+    it 'should know its output destination' do
+      instance = Json.new(destination)
+      expect(instance.output).to eq(destination)
+    end
+  end # context
+  
+
+ 
+  context 'Formatting events:' do   
+    it 'should render a parse tree in JSON' do
+      instance = Json.new(destination)
+      visitor = Rley::ParseTreeVisitor.new(grm_abc_ptree1)
+      instance.render(visitor)
+      expectations = <<-SNIPPET
+{
+  "root":
+    { "S": [
+      { "A": [
+        {"a": "a"},
+        { "A": [
+          {"a": "a"},
+          { "A": [
+            {"b": "b"}
+            ]
+          },
+          {"c": "c"}
+          ]
+        },
+        {"c": "c"}
+        ]
+      }
+      ]
+    }
+}
+SNIPPET
+      expect(destination.string).to eq(expectations.chomp)
+    end
+  end # context
+end # describe
+
+end # module
+end # module
+
+# End of file

data/spec/rley/ptree/parse_tree_spec.rb

@@ -1,18 +1,17 @@
 require_relative '../../spec_helper'
 
-require_relative '../../../lib/rley/syntax/grammar_builder'
+require_relative '../support/grammar_abc_helper'
+
 # Load the class under test
 require_relative '../../../lib/rley/ptree/parse_tree'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
   module PTree # Open this namespace to avoid module qualifier prefixes
     describe ParseTree do
+      include GrammarABCHelper  # Mix-in module with builder for grammar abc
+      
       let(:sample_grammar) do
-        builder = Syntax::GrammarBuilder.new
-        builder.add_terminals('a', 'b', 'c')
-        builder.add_production('S' => ['A'])
-        builder.add_production('A' => %w(a A c))
-        builder.add_production('A' => ['b'])
+        builder = grammar_abc_builder
         builder.grammar
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.1.05
+  version: 0.1.06
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,7 @@ files:
 - lib/rley/constants.rb
 - lib/rley/formatter/base_formatter.rb
 - lib/rley/formatter/debug.rb
+- lib/rley/formatter/json.rb
 - lib/rley/parser/chart.rb
 - lib/rley/parser/dotted_item.rb
 - lib/rley/parser/earley_parser.rb
@@ -114,6 +115,7 @@ files:
 - lib/rley/syntax/terminal.rb
 - lib/rley/syntax/verbatim_symbol.rb
 - spec/rley/formatter/debug_spec.rb
+- spec/rley/formatter/json_spec.rb
 - spec/rley/parser/chart_spec.rb
 - spec/rley/parser/dotted_item_spec.rb
 - spec/rley/parser/earley_parser_spec.rb
@@ -170,6 +172,7 @@ specification_version: 4
 summary: Ruby implementation of the Earley's parsing algorithm
 test_files:
 - spec/rley/formatter/debug_spec.rb
+- spec/rley/formatter/json_spec.rb
 - spec/rley/parser/chart_spec.rb
 - spec/rley/parser/dotted_item_spec.rb
 - spec/rley/parser/earley_parser_spec.rb