rley 0.7.08 → 0.8.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7377b66e5bac6ee813506829f53a32d694e9a01eaee5f55deec4475a710305d7
-  data.tar.gz: 7f972ad8f29be409a12cb61ae095177d8f9f2594fe9b7eb0ef1a931de0729c9c
+  metadata.gz: ee99e1b9803a447d18a3f82e91353659e211109a5fb99d48a834ddebf572998f
+  data.tar.gz: f4719d9fa301a0de2be143ca0aa5d0c261cf1562194a40b038c79b1faa1c04dc
 SHA512:
-  metadata.gz: d9e888ca1df16c7421df180c551879e6d066f9f848db2135be637951c7edfe928d693be8b1e22753c10b546198351650cc6dfd1acf14837597979f2e0a589715
-  data.tar.gz: 4ea2a4c50e66321a00d828264052df58e83beb69ccc13fe9cda7dd9b648eee58f4332510867fef291006e2378f2c25ce85fff95ac11a7ed367578cee567b3b34
+  metadata.gz: 9810a2d3884f86d2d437e1ba0911681f53895ff60ef500e4d19bd5d9429ff433f46c1dd57d6e185eb0bce3fcf869b1e4884acd09aaff72aee0323d00a781e763
+  data.tar.gz: e7d49393824bbbeaff70bc7d57137d1fe82f86a98bfda52fc9144dbafa3e5568e51ce7e9da8c15fc2f51438b29100801e8ea145f613165ba4369093f07bfad23

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.8.00 / 2021-08-15
+- New grammar builder that accepts ? * + modifiers
+
+### 0.7.08 / 2021-05-30
+- Code restyling to please rubocop 1.15.0
+
 ### 0.7.07 / 2020-11-16
 - Code restyling to please rubocop 0.93.1
 * [CHANGE] File `.travis.yml`: updated Ruby versions, drop support for Ruby 2.3.x

data/README.md

@@ -50,11 +50,10 @@ application range such as:
 
 
 ### Compatibility
-Rley supports the following Ruby implementations:    
-- MRI 2.3
-- MRI 2.4
+Rley supports the following Ruby implementations:
 - MRI 2.5
 - MRI 2.6 
+- MRI 2.7
 - JRuby 9.1+  
 
 ---
@@ -106,9 +105,9 @@ The subset of English grammar is based on an example from the NLTK book.
       # Here we define the productions (= grammar rules)
       rule 'S' => 'NP VP'
       rule 'NP' => 'Proper-Noun'
-      rule 'NP' => 'Determiner Noun'
+      rule 'NP' => 'Determiner Noun'      
       rule 'NP' => 'Determiner Noun PP'
-      rule 'VP' => 'Verb NP'
+      rule 'VP' => 'Verb NP'      
       rule 'VP' => 'Verb NP PP'
       rule 'PP' => 'Preposition NP'
     end

data/examples/NLP/nano_eng/nano_en_demo.rb

@@ -24,20 +24,16 @@ engine.build_grammar do
 
   # Here we define the productions (= grammar rules)
   rule 'Start' => 'S'
-  rule 'S' => %w[NP VP]
-  rule 'S' => %w[Aux NP VP]
+  rule 'S' => 'Aux? NP VP'
   rule 'S' => 'VP'
   rule 'NP' => 'Pronoun'
   rule 'NP' => 'Proper-Noun'
-  rule 'NP' => %w[Determiner Nominal]
-  rule 'Nominal' => %w[Noun]
-  rule 'Nominal' => %w[Nominal Noun]
-  rule 'VP' => 'Verb'
-  rule 'VP' => %w[Verb NP]
-  rule 'VP' => %w[Verb NP PP]
-  rule 'VP' => %w[Verb PP]
-  rule 'VP' => %w[VP PP]
-  rule 'PP' => %w[Preposition NP]
+  rule 'NP' => 'Determiner Nominal'
+  rule 'Nominal' => 'Nominal? Noun'
+  rule 'VP' => 'Verb PP?'
+  rule 'VP' => 'Verb NP PP?'
+  rule 'VP' => 'VP PP'
+  rule 'PP' => 'Preposition NP'
 end
 
 ########################################

data/examples/NLP/nano_eng/nano_grammar.rb

@@ -12,7 +12,7 @@ require 'rley' # Load the gem
 # Daniel Jurafsky,‎ James H. Martin: "Speech and Language Processing";
 # 2009, Pearson Education, Inc., ISBN 978-0135041963
 # It defines the syntax of a sentence in a mini English-like language
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   add_terminals('Pronoun', 'Proper-Noun')
   add_terminals('Determiner', 'Noun')
   add_terminals('Cardinal_number', 'Ordinal_number', 'Quant')
@@ -25,19 +25,19 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'sentence' => 'yes_no_question'
   rule 'sentence' => 'wh_subject_question'
   rule 'sentence' => 'wh_non_subject_question'
-  rule 'declarative' => %w[NP VP]
+  rule 'declarative' => 'NP VP'
   rule 'imperative' => 'VP'
-  rule 'yes_no_question' => %w[Aux NP VP]
-  rule 'wh_subject_question' => %w[Wh_NP NP VP]
-  rule 'wh_non_subject_question' => %w[Wh_NP Aux NP VP]
-  rule 'NP' => %w[Predeterminer NP]
+  rule 'yes_no_question' => 'Aux NP VP'
+  rule 'wh_subject_question' => 'Wh_NP NP VP'
+  rule 'wh_non_subject_question' => 'Wh_NP Aux NP VP'
+  rule 'NP' => 'Predeterminer NP'
   rule 'NP' => 'Pronoun'
   rule 'NP' => 'Proper-Noun'
-  rule 'NP' => %w[Det Card Ord Quant Nominal]
+  rule 'NP' => 'Det Card Ord Quant Nominal'
   rule 'VP' => 'Verb'
-  rule 'VP' => %w[Verb NP]
-  rule 'VP' => %w[Verb NP PP]
-  rule 'VP' => %w[Verb PP]
+  rule 'VP' => 'Verb NP'
+  rule 'VP' => 'Verb NP PP'
+  rule 'VP' => 'Verb PP'
   rule 'Det' => 'Determiner'
   rule 'Det' => []
   rule 'Card' => 'Cardinal_number'
@@ -45,15 +45,15 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'Ord' => 'Ordinal_number'
   rule 'Ord' =>  []
   rule 'Nominal' => 'Noun'
-  rule 'Nominal' => %w[Nominal Noun]
-  rule 'Nominal' => %w[Nominal GerundVP]
-  rule 'Nominal' => %w[Nominal RelClause]
-  rule 'PP' => %w[Preposition NP]
+  rule 'Nominal' => 'Nominal Noun'
+  rule 'Nominal' => 'Nominal GerundVP'
+  rule 'Nominal' => 'Nominal RelClause'
+  rule 'PP' => 'Preposition NP'
   rule 'GerundVP' => 'GerundV'
-  rule 'GerundVP' => %w[GerundV NP]
-  rule 'GerundVP' => %w[GerundV NP PP]
-  rule 'GerundVP' => %w[GerundV PP]
-  rule 'RelClause' => %w[Relative_pronoun VP]
+  rule 'GerundVP' => 'GerundV NP'
+  rule 'GerundVP' => 'GerundV NP PP'
+  rule 'GerundVP' => 'GerundV PP'
+  rule 'RelClause' => 'Relative_pronoun VP'
 end
 
 # And now build the grammar...

data/examples/NLP/pico_en_demo.rb

@@ -26,8 +26,8 @@ engine.build_grammar do
   rule 'S' => 'NP VP'
   rule 'NP' => 'Proper-Noun'
   rule 'NP' => 'Determiner Noun'
-  rule 'NP' => 'Determiner Noun PP'
-  rule 'VP' => 'Verb NP'
+  rule 'NP' => 'Determiner Noun PP'  
+  rule 'VP' => 'Verb NP'  
   rule 'VP' => 'Verb NP PP'
   rule 'PP' => 'Preposition NP'
 end

data/examples/data_formats/JSON/json_ast_builder.rb

@@ -32,24 +32,20 @@ class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
 
   # rubocop: disable Naming/VariableNumber
 
+  # rule 'JSON_text' => 'value'
   def reduce_JSON_text_0(_aProd, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
   end
 
-  # rule 'object' => %w[begin-object member-list end-object]
+  # rule 'object' => 'begin-object member-list? end-object'
   def reduce_object_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
     second_child.symbol = aProduction.lhs
     return second_child
   end
 
-  # rule 'object' => %w[begin-object end-object]
-  def reduce_object_1(aProduction, _range, _tokens, _children)
-    return JSONObjectNode.new(aProduction.lhs)
-  end
-
-  # rule 'member-list' => %w[member-list value-separator member]
-  def reduce_member_list_0(_range, _tokens, theChildren)
+  # rule 'member-list' => 'member-list value-separator member'
+  def reduce_member_list_0(_production, _range, _tokens, theChildren)
     node = theChildren[0]
     node.members << theChildren.last
     return node
@@ -62,31 +58,26 @@ class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
     return node
   end
 
-  # rule 'member' => %w[string name-separator value]
+  # rule 'member' => 'string name-separator value'
   def reduce_member_0(aProduction, _range, _tokens, theChildren)
     return JSONPair.new(theChildren[0], theChildren[2], aProduction.lhs)
   end
 
-  # rule 'array' => %w[begin-array array-items end-array]
+  # rule 'array' => 'begin-array array-items? end-array'
   def reduce_array_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
     second_child.symbol = aProduction.lhs
     return second_child
   end
 
-  # rule 'array' => %w[begin-array end-array]
-  def reduce_array_1(_range, _tokens, _children)
-    return JSONArrayNode.new
-  end
-
-  # rule 'array-items' => %w[array-items value-separator value]
-  def reduce_array_items_0(_range, _tokens, theChildren)
+  # rule 'array-items' => 'array-items value-separator value'
+  def reduce_array_items_0(_production, _range, _tokens, theChildren)
     node = theChildren[0]
     node.children << theChildren[2]
     return node
   end
 
-  #   rule 'array-items' => %w[value]
+  #   rule 'array-items' => 'value'
   def reduce_array_items_1(aProduction, _range, _tokens, theChildren)
     node = JSONArrayNode.new(aProduction.lhs)
     node.children << theChildren[0]

data/examples/data_formats/JSON/json_demo.rb

@@ -37,9 +37,8 @@ case cli_options[:format]
     raise StandardError, msg if tree_rep == :cst
 end
 
-
 # Create a Rley facade object
-# If necessary, select AST representation
+# If requested, select AST representation
 engine = Rley::Engine.new do |cfg|
   builder = tree_rep == :ast ? JSONASTBuilder : nil
   cfg.repr_builder = builder

data/examples/data_formats/JSON/json_grammar.rb

@@ -9,30 +9,30 @@ require 'rley' # Load the gem
 # Original JSON grammar is available at: http://www.json.org/fatfree.html
 # Official JSON grammar:  http://rfc7159.net/rfc7159#rfc.section.2
 # Names of grammar elements are based on the RFC 7159 documentation
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   add_terminals('false', 'null', 'true') # Literal names
   add_terminals('string', 'number')
   add_terminals('begin-object', 'end-object') # For '{', '}' delimiters
   add_terminals('begin-array', 'end-array') # For '[', ']' delimiters
   add_terminals('name-separator', 'value-separator') # For ':', ',' separators
+
   rule 'JSON_text' => 'value'
   rule 'value' => 'false'
   rule 'value' => 'null'
   rule 'value' => 'true'
-  rule 'value' => 'object'
   rule 'value' => 'array'
+  rule 'value' => 'object'
   rule 'value' => 'number'
   rule 'value' => 'string'
-  rule 'object' => %w[begin-object member-list end-object]
-  rule 'object' => %w[begin-object end-object]
+  rule 'object' => 'begin-object member_list? end-object'
+
   # Next rule is an example of a left recursive rule
-  rule 'member-list' => %w[member-list value-separator member]
-  rule 'member-list' => 'member'
-  rule 'member' => %w[string name-separator value]
-  rule 'array' => %w[begin-array array-items end-array]
-  rule 'array' => %w[begin-array end-array]
-  rule 'array-items' => %w[array-items value-separator value]
-  rule 'array-items' => %w[value]
+  rule 'member_list' => 'member_list value-separator member'
+  rule 'member_list' => 'member'
+  rule 'member' => 'string name-separator value'
+  rule 'array' => 'begin-array array_items? end-array'
+  rule 'array_items' => 'array_items value-separator value'
+  rule 'array_items' => 'value'
 end
 
 # And now build the JSON grammar...

data/examples/general/calc_iter1/calc_grammar.rb

@@ -5,18 +5,19 @@ require 'rley' # Load the gem
 
 ########################################
 # Define a grammar for basic arithmetical expressions
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   add_terminals('NUMBER')
   add_terminals('LPAREN', 'RPAREN') # For '(', ')' delimiters
   add_terminals('PLUS', 'MINUS') # For '+', '-' operators
   add_terminals('STAR', 'DIVIDE') # For '*', '/' operators
+
   rule 'expression' => 'simple_expression'
   rule 'simple_expression' => 'term'
-  rule 'simple_expression' => %w[simple_expression add_operator term]
+  rule 'simple_expression' => 'simple_expression add_operator term'
   rule 'term' => 'factor'
-  rule 'term' => %w[term mul_operator factor]
+  rule 'term' => 'term mul_operator factor'
   rule 'factor' => 'NUMBER'
-  rule 'factor' => %w[LPAREN expression RPAREN]
+  rule 'factor' => 'LPAREN expression RPAREN'
   rule 'add_operator' => 'PLUS'
   rule 'add_operator' => 'MINUS'
   rule 'mul_operator' => 'STAR'

data/examples/general/calc_iter2/calc_grammar.rb

@@ -5,7 +5,7 @@ require 'rley' # Load the gem
 
 ########################################
 # Define a grammar for basic arithmetical expressions
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   add_terminals('NUMBER')
   add_terminals('PLUS', 'MINUS') # For '+', '-' operators or sign
   add_terminals('STAR', 'DIVIDE', 'POWER') # For '*', '/', '**' operators
@@ -13,16 +13,16 @@ builder = Rley::Syntax::GrammarBuilder.new do
   add_terminals('PI', 'E') # For numeric constants
   add_terminals('RESERVED') # Reserved identifiers
 
-  rule 'expression' => %w[simple_expression]
+  rule 'expression' => 'simple_expression'
   rule 'simple_expression' => 'term'
-  rule 'simple_expression' => %w[simple_expression add_operator term]
+  rule 'simple_expression' => 'simple_expression add_operator term'
   rule 'term' => 'factor'
-  rule 'term' => %w[term mul_operator factor]
+  rule 'term' => 'term mul_operator factor'
   rule 'factor' => 'simple_factor'
-  rule 'factor' => %w[factor POWER simple_factor]
-  rule 'simple_factor' => %w[sign scalar]
-  rule 'simple_factor' => %w[unary_function in_parenthesis]
-  rule 'simple_factor' => %w[MINUS in_parenthesis]
+  rule 'factor' => 'factor POWER simple_factor'
+  rule 'simple_factor' => 'sign scalar'
+  rule 'simple_factor' => 'unary_function in_parenthesis'
+  rule 'simple_factor' => 'MINUS in_parenthesis'
   rule 'simple_factor' => 'in_parenthesis'
   rule 'sign' => 'PLUS'
   rule 'sign' => 'MINUS'
@@ -31,7 +31,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'scalar' => 'PI'
   rule 'scalar' => 'E'
   rule 'unary_function' => 'RESERVED'
-  rule 'in_parenthesis' => %w[LPAREN expression RPAREN]
+  rule 'in_parenthesis' => 'LPAREN expression RPAREN'
   rule 'add_operator' => 'PLUS'
   rule 'add_operator' => 'MINUS'
   rule 'mul_operator' => 'STAR'

data/examples/general/left.rb

@@ -11,7 +11,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
 
   # Grammar with left recursive rule.
   rule 'l_dots' => []
-  rule 'l_dots' => %w[l_dots DOT]
+  rule 'l_dots' => 'l_dots DOT'
 end
 
 # And now, let's build the grammar...

data/examples/general/right.rb

@@ -11,7 +11,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
 
   # Grammar with right recursive rule.
   rule 'r_dots' => []
-  rule 'r_dots' => %w[DOT r_dots]
+  rule 'r_dots' => 'DOT r_dots'
 end
 
 # And now, let's build the grammar...

data/lib/rley.rb

@@ -5,7 +5,7 @@
 # for a Rley client.
 
 require_relative './rley/constants'
-require_relative './rley/syntax/grammar_builder'
+require_relative './rley/interface'
 require_relative './rley/lexical/token'
 require_relative './rley/parser/gfg_earley_parser'
 require_relative './rley/parse_rep/ast_base_builder'

data/lib/rley/base/dotted_item.rb

@@ -28,6 +28,11 @@ module Rley # This module is used as a namespace
       # @return [Integer]
       attr_reader :position
 
+      # A possible constraint between symbol on left of dot and
+      # the closest preceding given terminal
+      # @return [NilClass, Syntax::MatchClosest]
+      attr_accessor :constraint
+
       # @param aProduction [Syntax::Production]
       # @param aPosition [Integer] Position of the dot in rhs of production.
       def initialize(aProduction, aPosition)

data/lib/rley/base/grm_items_builder.rb

@@ -12,12 +12,18 @@ module Rley # This module is used as a namespace
       def build_dotted_items(aGrammar)
         items = []
         aGrammar.rules.each do |prod|
+          index_prev = items.size
           rhs_size = prod.rhs.size
           if rhs_size.zero?
             items << DottedItem.new(prod, 0)
           else
             items += (0..rhs_size).map { |i| DottedItem.new(prod, i) }
           end
+
+          prod.constraints.each do |cs|
+            # Attach constraint to dotted item n + 1
+            items[index_prev + cs.idx_symbol + 1].constraint = cs
+          end
         end
 
         return items

data/lib/rley/constants.rb

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

data/lib/rley/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './syntax/grammar_builder'
+require_relative './notation/grammar_builder'
 require_relative './parser/gfg_earley_parser'
 require_relative './parse_tree_visitor'
 require_relative './parse_forest_visitor'
@@ -61,7 +61,7 @@ module Rley # This module is used as a namespace
     #     add_production('elements' => 'INTEGER')
     #   end
     def build_grammar(&aBlock)
-      builder = Rley::Syntax::GrammarBuilder.new(&aBlock)
+      builder = Rley::Notation::GrammarBuilder.new(&aBlock)
       @grammar = builder.grammar
     end
 

data/lib/rley/interface.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative './notation/grammar_builder'
+
+module Rley # Module used as a namespace
+  # Factory method.
+  # A grammar builder constructs a Rley grammar piece by piece
+  # from DSL instructions in a provided code block.
+  # @param aBlock [Proc] a code block
+  # @return [Rley::Notation::GrammarBuilder] An object that builds a grammar.
+  def self.grammar_builder(&aBlock)
+    Rley::Notation::GrammarBuilder.new(&aBlock)
+  end
+end # module
+
+# End of file