rley 0.5.09 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95e1ed6a38d8e1ed70e456f46c812275a1d4530
-  data.tar.gz: fcf7b54ff98d107fa38239139db10e7bbf1f7825
+  metadata.gz: ce33adee17693fccafcc29ce8340f57694c229fb
+  data.tar.gz: 8acb3af15c3bd7c292209e3e1cc2e81b20ba3d9f
 SHA512:
-  metadata.gz: e185aa4e7ca59e5995f6e87379efd4f921d4242307abd55718e46bf346e7414c487b56f753f446d8518ffab74e783774aaa2adc9b7fcf8a014fdba96b8da090d
-  data.tar.gz: 5c990777d79432c813c92dda0b21e7af3dcf587485b868e9723d30e3d1c1b3b2d6e1bc8dc7235fb1ba32c1b27ddeb6f829ef3e1b7b9248d5be1199f27e153849
+  metadata.gz: dba9c01e5cb72954185ec5b2a973a7983202bc1733808637bd887feb6a473a57c6b3ef155090dec47f848b0e367ee558f04d0f7463d50b3494dad627ed7101fb
+  data.tar.gz: ffb5e41e0325f51c1ae74cc2bb7739eb21b94dca87611f528067e70295a0cd03c956b7b3a75e32593b611abafd1007853917d32db9691d89ea4948df666ad7cc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.5.10 / 2017-12-02
+* [CHANGE] Dir `examples/general/SRL/ Added support for digit range to Simple Regex Language parser.
+
 ### 0.5.09 / 2017-12-02
 * [CHANGE] Dir `examples/general/SRL/ Added support for letter range to Simple Regex Language parser.
 

data/examples/general/SRL/lib/ast_builder.rb

@@ -44,20 +44,32 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
       when 'term_1' # rule 'term' => %w[atom quantifier]
         reduce_term_1(aProduction, aRange, theTokens, theChildren)
 
-      when 'atom_0' #rule 'atom' => 'letter_range'
+      when 'atom_0' # rule 'atom' => 'letter_range'
         return_first_child(aRange, theTokens, theChildren)
-
-      when 'letter_range_0' # rule 'letter_range' => %w[LETTER FROM LETTER_LIT TO LETTER_LIT]
-        reduce_letter_range_0(aProduction, aRange, theTokens, theChildren)
         
-       when 'letter_range_1' #rule 'letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]
+      when 'atom_1' # rule 'atom' => 'digit_range'
+        return_first_child(aRange, theTokens, theChildren)
+      
+      # rule 'letter_range' => %w[LETTER FROM LETTER_LIT TO LETTER_LIT]
+      when 'letter_range_0' 
+        reduce_letter_range_0(aProduction, aRange, theTokens, theChildren)
+
+      #rule 'letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]  
+      when 'letter_range_1' 
         reduce_letter_range_1(aProduction, aRange, theTokens, theChildren)
-        
+
       when 'letter_range_2' # rule 'letter_range' => 'LETTER'
         reduce_letter_range_2(aProduction, aRange, theTokens, theChildren)
 
       when 'letter_range_3' # rule 'letter_range' => %w[UPPERCASE LETTER]
-        reduce_letter_range_3(aProduction, aRange, theTokens, theChildren)        
+        reduce_letter_range_3(aProduction, aRange, theTokens, theChildren)
+
+      # rule 'digit_range' => %w[digit_or_number FROM DIGIT_LIT TO DIGIT_LIT]
+      when 'digit_range_0' 
+        reduce_digit_range_0(aProduction, aRange, theTokens, theChildren)
+
+      when 'digit_range_1' #rule 'digit_range' => 'digit_or_number'
+        reduce_digit_range_1(aProduction, aRange, theTokens, theChildren)
 
       when 'quantifier_0' # rule 'quantifier' => 'ONCE'
         multiplicity(1, 1)
@@ -68,7 +80,8 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
       when 'quantifier_2' # rule 'quantifier' => %w[EXACTLY count TIMES]
         reduce_quantifier_2(aProduction, aRange, theTokens, theChildren)
 
-      when 'quantifier_3' # rule 'quantifier' => %w[BETWEEN count AND count times_suffix]
+      # rule 'quantifier' => %w[BETWEEN count AND count times_suffix]
+      when 'quantifier_3' 
         reduce_quantifier_3(aProduction, aRange, theTokens, theChildren)
 
       when 'quantifier_4' # rule 'quantifier' => 'OPTIONAL'
@@ -82,6 +95,11 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
 
       when 'quantifier_7' # rule 'quantifier' => %w[AT LEAST count TIMES]
         reduce_quantifier_7(aProduction, aRange, theTokens, theChildren)
+      
+      # rule 'digit_or_number' => 'DIGIT'
+      # rule 'digit_or_number' => 'NUMER'
+      when 'digit_or_number_0', 'digit_or_number_1' 
+        return_first_child(aRange, theTokens, theChildren)
 
       when 'count_0', 'count_1'
         return_first_child(aRange, theTokens, theChildren)
@@ -100,16 +118,16 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
   end
 
   def char_range(lowerBound, upperBound)
-    # TODO fix module nesting  
+    # TODO fix module nesting
     lower = Regex::Character.new(lowerBound)
     upper =  Regex::Character.new(upperBound)
     return Regex::CharRange.new(lower, upper)
   end
-  
+
   def char_class(toNegate, *theChildren)
     Regex::CharClass.new(toNegate, *theChildren)
   end
-  
+
   def repetition(expressionToRepeat, aMultiplicity)
     return Regex::Repetition.new(expressionToRepeat, aMultiplicity)
   end
@@ -128,7 +146,7 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
     ch_range = char_range(lower, upper)
     char_class(false, ch_range)
   end
-  
+
   # rule 'letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]
   def reduce_letter_range_1(aProduction, aRange, theTokens, theChildren)
     lower = theChildren[3].token.lexeme
@@ -136,17 +154,28 @@ class ASTBuilder < Rley::Parser::ParseTreeBuilder
     ch_range = char_range(lower.upcase, upper.upcase)
     char_class(false, ch_range)
   end
-  
+
   # rule 'letter_range' => 'LETTER'
   def reduce_letter_range_2(aProduction, aRange, theTokens, theChildren)
     ch_range = char_range('a', 'z')
-    char_class(false, ch_range)  
+    char_class(false, ch_range)
   end
-  
+
   #rule 'letter_range' => %w[UPPERCASE LETTER]
   def reduce_letter_range_3(aProduction, aRange, theTokens, theChildren)
     ch_range = char_range('A', 'Z')
-    char_class(false, ch_range)    
+    char_class(false, ch_range)
+  end
+  
+  # rule 'digit_range' => %w[digit_or_number FROM DIGIT_LIT TO DIGIT_LIT]
+  def reduce_digit_range_0(aProduction, aRange, theTokens, theChildren)
+    reduce_letter_range_0(aProduction, aRange, theTokens, theChildren)
+  end
+
+  # rule 'digit_range' => 'digit_or_number'
+  def reduce_digit_range_1(aProduction, aRange, theTokens, theChildren)
+    ch_range = char_range('0', '9')
+    char_class(false, ch_range)  
   end
 
   # rule 'quantifier' => %w[EXACTLY count TIMES]

data/examples/general/SRL/lib/grammar.rb

@@ -8,6 +8,7 @@ module SRL
   builder = Rley::Syntax::GrammarBuilder.new do
     add_terminals('DIGIT_LIT', 'INTEGER', 'LETTER_LIT')
     add_terminals('UPPERCASE', 'LETTER', 'FROM', 'TO')
+    add_terminals('DIGIT', 'NUMBER')
     add_terminals('EXACTLY', 'TIMES', 'ONCE', 'TWICE')
     add_terminals('BETWEEN', 'AND', 'OPTIONAL', 'OR')
     add_terminals('MORE', 'NEVER', 'AT', 'LEAST')
@@ -17,10 +18,13 @@ module SRL
     rule 'term' => 'atom'
     rule 'term' => %w[atom quantifier]
     rule 'atom' => 'letter_range'
+    rule 'atom' => 'digit_range'
     rule 'letter_range' => %w[LETTER FROM LETTER_LIT TO LETTER_LIT]
     rule 'letter_range' => %w[UPPERCASE LETTER FROM LETTER_LIT TO LETTER_LIT]
     rule 'letter_range' => 'LETTER'
-    rule 'letter_range' => %w[UPPERCASE LETTER]    
+    rule 'letter_range' => %w[UPPERCASE LETTER]
+    rule 'digit_range' => %w[digit_or_number FROM DIGIT_LIT TO DIGIT_LIT]
+    rule 'digit_range' => 'digit_or_number'    
     rule 'quantifier' => 'ONCE'
     rule 'quantifier' => 'TWICE'
     rule 'quantifier' => %w[EXACTLY count TIMES]
@@ -29,6 +33,8 @@ module SRL
     rule 'quantifier' => %w[ONCE OR MORE]
     rule 'quantifier' => %w[NEVER OR MORE]
     rule 'quantifier' => %w[AT LEAST count TIMES]
+    rule 'digit_or_number' => 'DIGIT'
+    rule 'digit_or_number' => 'NUMBER'
     rule 'count' => 'DIGIT_LIT'
     rule 'count' => 'INTEGER'
     rule 'times_suffix' => 'TIMES'

data/examples/general/SRL/lib/tokenizer.rb

@@ -28,12 +28,14 @@ module SRL
       AND
       AT
       BETWEEN
+      DIGIT
       EXACTLY
       FROM
       LEAST
       LETTER
       MORE
       NEVER
+      NUMBER
       ONCE
       OPTIONAL
       OR

data/examples/general/SRL/spec/integration_spec.rb

@@ -16,6 +16,7 @@ describe 'Integration tests:' do
   end
 
   context 'Parsing character ranges:' do
+
     it "should parse 'letter from ... to ...' syntax" do
       result = parse('letter from a to f')
       expect(result).to be_success
@@ -48,6 +49,30 @@ describe 'Integration tests:' do
       expect(regexp.to_str).to eq('[A-Z]')
     end
 
+    it "should parse 'digit from ... to ...' syntax" do
+      result = parse('digit from 1 to 4')
+      expect(result).to be_success
+
+      regexp = regexp_repr(result)
+      expect(regexp.to_str).to eq('[1-4]')
+    end
+
+    it "should parse 'digit' syntax" do
+      result = parse('digit')
+      expect(result).to be_success
+
+      regexp = regexp_repr(result)
+      expect(regexp.to_str).to eq('[0-9]')
+    end
+
+    it "should parse 'number' syntax" do
+      result = parse('number')
+      expect(result).to be_success
+
+      regexp = regexp_repr(result)
+      expect(regexp.to_str).to eq('[0-9]')
+    end
+
   end # context
 
   context 'Parsing quantifiers:' do

data/examples/general/SRL/srl_demo.rb

@@ -36,6 +36,7 @@ Command-line syntax:
   Examples:
   ruby #{my_name} "letter from a to f exactly 4 times"
   ruby #{my_name} "uppercase letter between 2 and 3 times"
+  ruby #{my_name} "digit from 0 to 7 once or more"
 END_MSG
   puts msg
   exit(1)

data/lib/rley/constants.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.5.09
+  version: 0.5.10
 platform: ruby
 authors:
 - Dimitri Geshef