rley 0.8.06 → 0.8.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e15e0d34742a0b6c95f3cc7c7d84020d6a486a1e47c2b3fb38bf33c42ff71ea9
-  data.tar.gz: 2a842d65101d8d833478f70023a4c5263b5dbb24b36799329ef82dffef70be37
+  metadata.gz: 55b425fac78001960b95935a8dc8de88d1c0826bea5fba5fae72455f53cb084a
+  data.tar.gz: fdf0f9ed39985923134cd3ecc4bdd9325c9aab783437ab1d61a07e333ad3f2eb
 SHA512:
-  metadata.gz: 78ee8ff8d729f52f710cf6c52eccb880c78a851b45e6a4df146aa1138f77275557c87ebc5b591896695d3ab8c9072d5b6a7aa32bf600fb14d09658fd834779fe
-  data.tar.gz: 2c0cfc070c05d0049f65cb938e03162a305fdab926a8e47d9825cf7a36841262a076407a9c6ac86685954a5b3b174137b24bfc7c976fee443d791d82346b1fe4
+  metadata.gz: e63b7a5df081fa326b48f7f2e2cedbaf877ed377927e408278e3c8078a30fdcc69714ff234ba98dccc1eb3b05eaea53ebb39846a43e2cb794b883d91ce1c6953
+  data.tar.gz: e60bc7b045fe8d7203ddf26ecd603646137d43cbbbe79b533b2088c0f7d15bb46bc1dd58ae4d811ba8d78327fdcb0045cfddec4d708a76968d33c1602bf71cf4

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.8.08 / 2021-10-31
+- Fixes in example files, Refactored module `Notation` renamed `to `RGN´
+
+
+* [CHANGE] Module `Notation` changed to `RGN`.
+
+* [FIX] `examples/general/calc_iter1/CalcLexer#initialize` now strips whitespaces at end of expression to parse.
+* [FIX] `examples/general/calc_iter2/CalcLexer#initialize` now strips whitespaces at end of expression to parse.
+* [FIX] File `examples/general/left.rb` Call to wrong grammar builder
+* [FIX] File `examples/general/right.rb` Call to wrong grammar builder
+* [FIX] File `examples/NLP/benchmark_pico_en.rb` Grammar rules used obsolete rule syntax
+* [FIX] File `examples/NLP/engtagger.rb` Grammar rules used obsolete rule syntax
+
 ### 0.8.06 / 2021-10-06
 - Added  more comment in `/examples/tokenizer` files
 

data/appveyor.yml

@@ -1,15 +1,13 @@
 version: '{build}'
 max_jobs: 5
 environment:
-  matrix:
+  matrix: 
   - Ruby_version: 26-x64  
   - Ruby_version: 25-x64
   - Ruby_version: 24-x64
-  - Ruby_version: 23-x64
   - Ruby_version: 26
   - Ruby_version: 25
   - Ruby_version: 24
-  - Ruby_version: 23
 
 install:
   - set PATH=C:\Ruby%Ruby_version%\bin;%PATH%

data/examples/NLP/benchmark_pico_en.rb

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

data/examples/NLP/engtagger.rb

@@ -136,13 +136,13 @@ nlp_engine.build_grammar do
   add_terminals('DET', 'IN', 'VBD')
 
   # Here we define the productions (= grammar rules)
-  rule 'S' => %w[NP VP]
+  rule 'S' => 'NP VP'
   rule 'NP' => 'NNP'
-  rule 'NP' => %w[DET NN]
-  rule 'NP' => %w[DET NN PP]
-  rule 'VP' => %w[VBD NP]
-  rule 'VP' => %w[VBD NP PP]
-  rule 'PP' => %w[IN NP]
+  rule 'NP' => 'DET NN'
+  rule 'NP' => 'DET NN PP'
+  rule 'VP' => 'VBD NP'
+  rule 'VP' => 'VBD NP PP'
+  rule 'PP' => 'IN NP'
 end
 
 # text = "Yo I'm not done with you"

data/examples/general/calc_iter1/calc_lexer.rb

@@ -24,7 +24,7 @@ class CalcLexer
   class ScanError < StandardError; end
 
   def initialize(source)
-    @scanner = StringScanner.new(source)
+    @scanner = StringScanner.new(source.strip)
     @lineno = 1
   end
 

data/examples/general/calc_iter2/calc_lexer.rb

@@ -30,7 +30,7 @@ class CalcLexer
   class ScanError < StandardError; end
 
   def initialize(source)
-    @scanner = StringScanner.new(source)
+    @scanner = StringScanner.new(source.strip)
     @lineno = 1
   end
 

data/examples/general/left.rb

@@ -4,7 +4,7 @@
 require 'rley' # Load Rley library
 
 # Instantiate a builder object that will build the grammar for us.
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   # The grammar defines a language that consists in a sequence
   # of 0 or more dots...
   add_terminals('DOT')

data/examples/general/right.rb

@@ -4,7 +4,7 @@
 require 'rley' # Load Rley library
 
 # Instantiate a builder object that will build the grammar for us
-builder = Rley::Syntax::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   # The grammar defines a language that consists in a sequence
   # of 0 or more dots...
   add_terminals('DOT')

data/examples/tokenizer/loxxy_raw_scanner.rex.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 # encoding: UTF-8
+
 #--
 # This file is automatically generated. Do not modify it.
 # Generated by: oedipus_lex version 2.5.3.
 # Source: loxxy_raw_scanner.rex
 #++
 
+# As Rubocop shouts about "offences" in the generated code,
+# we disable the detection of most of them...
 # rubocop: disable Style/MutableConstant
 # rubocop: disable Layout/SpaceBeforeSemicolon
 # rubocop: disable Style/Alias

data/examples/tokenizer/loxxy_tokenizer.rb

@@ -4,7 +4,7 @@ require 'rley'
 require_relative 'loxxy_raw_scanner.rex'
 
 # Tokenizer for the Lox language that is compatible with a Rley parser.
-# It works as an adapter between the parser and the scanner generated 
+# It works as an adapter between the parser and the scanner generated
 # with `oedipus_lex` scanner generator.
 # The purpose is to transform the output of a `LoxxyRawScanner` instance
 # into o sequence of tokens in the format expected by Rley.
@@ -60,7 +60,7 @@ class LoxxyTokenizer
   end
 
   # Set the text to tokenize.
-  # @param source [String] The text to tokenize  
+  # @param source [String] The text to tokenize
   def start_with(source)
     @input = source
   end

data/examples/tokenizer/run_tokenizer.rb

@@ -29,5 +29,5 @@ LOX_END
 
 loxxy_tokenizer = LoxxyTokenizer.new(lox_source)
 tokens = loxxy_tokenizer.tokens
-File::open('tokens.yaml', 'w') { |f| YAML.dump(tokens, f) }
+File::open('tokens.yml', 'w') { |f| YAML.dump(tokens, f) }
 puts 'Done: tokenizer results saved in YAML.'

data/lib/rley/constants.rb

@@ -5,7 +5,7 @@
 
 module Rley # Module used as a namespace
   # The version number of the gem.
-  Version = '0.8.06'
+  Version = '0.8.08'
 
   # 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 './notation/grammar_builder'
+require_relative './rgn/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::Notation::GrammarBuilder.new(&aBlock)
+      builder = Rley::RGN::GrammarBuilder.new(&aBlock)
       @grammar = builder.grammar
     end
 

data/lib/rley/interface.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative './notation/grammar_builder'
+require_relative './rgn/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.
+  # @return [Rley::RGN::GrammarBuilder] An object that builds a grammar.
   def self.grammar_builder(&aBlock)
-    Rley::Notation::GrammarBuilder.new(&aBlock)
+    Rley::RGN::GrammarBuilder.new(&aBlock)
   end
 end # module
 

data/lib/rley/lexical/token.rb

@@ -37,7 +37,7 @@ module Rley # This module is used as a namespace
       # @param theLexeme [String] the lexeme (= piece of text from input)
       # @param aTerminal [Syntax::Terminal, String]
       #   The terminal symbol corresponding to the lexeme.
-      # @param aPositiçon [Rley::Lexical::Position] position of the token in source file
+      # @param aPosition [Rley::Lexical::Position] position of the token in source file
       def initialize(theLexeme, aTerminal, aPosition = nil)
         raise 'Internal error: nil terminal symbol detected' if aTerminal.nil?
 

data/lib/rley/ptree/non_terminal_node.rb

@@ -27,7 +27,7 @@ module Rley # This module is used as a namespace
         selfie = super(indentation)
         prefix = "\n" + (' ' * connector.size * indentation) + connector
         subnodes_repr = subnodes.reduce(+'') do |sub_result, subnode|
-          sub_result << prefix + subnode.to_string(indentation + 1)
+          sub_result << (prefix + subnode.to_string(indentation + 1))
         end
 
         selfie + subnodes_repr

data/lib/rley/rgn/all_notation_nodes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'repetition_node'
+require_relative 'sequence_node'
+require_relative 'symbol_node'

data/lib/rley/{notation → rgn}/ast_builder.rb

@@ -5,7 +5,7 @@ require_relative '../engine'
 require_relative 'all_notation_nodes'
 
 module Rley
-  module Notation
+  module RGN
     # The purpose of ASTBuilder is to build piece by piece an AST
     # (Abstract Syntax Tree) from a sequence of input tokens and
     # visit events produced by walking over a GFGParsing object.
@@ -72,7 +72,7 @@ module Rley
       end
 
       #####################################
-      #  SEMANTIC ACTIONS
+      #  RGN SEMANTIC ACTIONS
       #####################################
 
       # rule('rhs' => 'member_seq').tag 'sequence'
@@ -80,7 +80,7 @@ module Rley
         if theChildren[0].size == 1
           theChildren[0].first
         else
-          SequenceNode.new(theChildren[0].first.position, theChildren[0], nil)
+          SequenceNode.new(theChildren[0])
         end
       end
 
@@ -96,9 +96,15 @@ module Rley
 
       # rule('strait_member' => 'base_member annotation')
       def reduce_annotated_member(_production, _range, _tokens, theChildren)
-        theChildren[0].annotation = theChildren[1]
-
-        theChildren[0]
+        if theChildren[1].include?('repeat')
+          node = RepetitionNode.new(theChildren[0], theChildren[1].fetch('repeat'))
+          theChildren[1].delete('repeat')
+          theChildren[0].annotation = theChildren[1]
+          node
+        else
+          theChildren[0].annotation = theChildren[1]
+          theChildren[0]
+        end
       end
 
       # rule('base_member' => 'SYMBOL')
@@ -107,20 +113,21 @@ module Rley
       end
 
       # rule('base_member' => 'LEFT_PAREN member_seq RIGHT_PAREN')
-      def reduce_grouping(_production, _range, tokens, theChildren)
+      def reduce_grouping(_production, _range, _tokens, theChildren)
         if theChildren[1].size == 1
           theChildren[1].first
         else
-          rank = theChildren[0].range.high
-          pos = tokens[rank].position
-          GroupingNode.new(pos, theChildren[1], nil)
+          SequenceNode.new(theChildren[1])
         end
       end
 
       # rule('quantified_member' => 'base_member quantifier')
       def reduce_quantified_member(_production, _range, _tokens, theChildren)
-        theChildren[0].repetition = theChildren[1]
-        theChildren[0]
+        if theChildren == :exactly_one
+          theChildren[0]
+        else
+          RGN::RepetitionNode.new(theChildren[0], theChildren[1])
+        end
       end
 
       # rule('quantifier' => 'QUESTION_MARK')

data/lib/rley/{notation → rgn}/ast_node.rb

@@ -1,24 +1,15 @@
 # frozen_string_literal: true
 
 module Rley
-  module Notation
+  module RGN
     # Abstract class.
     # Instances of its subclasses represent nodes of an abstract syntax tree
     # that is the product of the parse of an input text.
     class ASTNode
-      # @return [Rley::Lexical::Position] Position of the entry in the input stream.
-      attr_reader :position
-
-      # @return [Symbol]
-      attr_accessor :repetition
-
       # @return [Hash]
       attr_reader :annotation
 
-      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
-      def initialize(aPosition)
-        @position = aPosition
-        @repetition = :exactly_one
+      def initialize
         @annotation = {}
       end
 
@@ -28,6 +19,16 @@ module Rley
         @annotation = aMapping
       end
 
+      def annotation_to_text
+        map_arr = []
+        @annotation.each_pair do |key, val|
+          literal = val.kind_of?(String) ? "'#{val}'" : val
+          map_arr << "#{key}: #{literal}"
+        end
+
+        "{ #{map_arr.join(', ')} }"
+      end
+
       # Notification that the parsing has successfully completed
       def done!
         # Default: do nothing ...

data/lib/rley/{notation → rgn}/ast_visitor.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rley
-  module Notation
+  module RGN
     class ASTVisitor
       # Link to the top node to visit
       attr_reader(:top)
@@ -10,7 +10,7 @@ module Rley
       attr_reader(:subscribers)
 
       # Build a visitor for the given top.
-      # @param aTop [Notation::ASTNode] the parse tree to visit.
+      # @param aTop [RGN::ASTNode] the parse tree to visit.
       def initialize(aTop)
         raise StandardError if aTop.nil?
 
@@ -49,26 +49,26 @@ module Rley
       end
 
       # Visit event. The visitor is about to visit a symbol node.
-      # @param aSymbolNode [Notation::SymbolNode] the symbol node to visit
+      # @param aSymbolNode [RGN::SymbolNode] the symbol node to visit
       def visit_symbol_node(aSymbolNode)
         broadcast(:before_symbol_node, aSymbolNode, self)
         broadcast(:after_symbol_node, aSymbolNode, self)
       end
 
       # Visit event. The visitor is about to visit a sequence node.
-      # @param aSequenceNode [Notation::SequenceNode] the sequence node to visit
+      # @param aSequenceNode [RGN::SequenceNode] the sequence node to visit
       def visit_sequence_node(aSequenceNode)
         broadcast(:before_sequence_node, aSequenceNode, self)
         traverse_subnodes(aSequenceNode)
         broadcast(:after_sequence_node, aSequenceNode, self)
       end
 
-      # Visit event. The visitor is about to visit a grouping node.
-      # @param aGroupingNode [Notation::GroupingNode] the grouping node to visit
-      def visit_grouping_node(aGroupingNode)
-        broadcast(:before_grouping_node, aGroupingNode, self)
-        traverse_subnodes(aGroupingNode) if aGroupingNode.repetition == :exactly_one
-        broadcast(:after_grouping_node, aGroupingNode, self)
+      # Visit event. The visitor is about to visit a repetition node.
+      # @param aRepetitionNode [RGN::GroupingNode] the repetition node to visit
+      def visit_repetition_node(aRepetitionNode)
+        broadcast(:before_repetition_node, aRepetitionNode, self)
+        traverse_subnodes(aRepetitionNode) if aRepetitionNode.repetition == :exactly_one
+        broadcast(:after_repetition_node, aRepetitionNode, self)
       end
 
       private

data/lib/rley/rgn/composite_node.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'ast_node'
+
+module Rley
+  module RGN
+    # Abstract class for a syntax node that is the parent
+    # of one or more subnodes.
+    class CompositeNode < ASTNode
+      # @return [Array<ASTNode>]
+      attr_reader :subnodes
+
+      # @return [Hash]
+      attr_accessor :constraints
+
+      # @param children [Array<ASTNode>] sequence of children nodes
+      def initialize(children)
+        super()
+        @subnodes = children
+        @constraints = []
+      end
+
+      def size
+        subnodes.size
+      end
+    end # class
+  end # module
+end # module

data/lib/rley/{notation → rgn}/grammar.rb

@@ -3,7 +3,7 @@
 require_relative '../syntax/base_grammar_builder'
 
 module Rley
-  module Notation
+  module RGN
     ########################################
     # Syntax for right-hand side of production rules
     builder = Rley::Syntax::BaseGrammarBuilder.new do