srl_ruby 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb6ab4f66212ea614cfbfab2f7b17049425844e
-  data.tar.gz: 634718cf4229710eed018512b44f29781acebc4a
+  metadata.gz: 09e2d0e45cb7094a048508eaf8af5e3d081a279b
+  data.tar.gz: 50017e8623af0c0f034746541f430f21f4df7660
 SHA512:
-  metadata.gz: 51ef6aead6683f95d965f2b9882f929af3d1b4f73cc8948982161d8f05843e196b39e21868c2620bab825f88697174b4b82378fc548e5f0f21b920717685378a
-  data.tar.gz: bb3c755844c7ad3e655d423de9956c3ccafde8c9efc2df5841b995546f0cf83b7b3880afa8ded4cd888944eaae53d7c889e96e7e09b743ece728aa7041734727
+  metadata.gz: 911f5c56ba1fcd7fcefa97b23ca8d3f76c228f84d21eeb742c40415fa81763a2ba0d296b045f38e727be94ea2bc0517141cf7e593493596e98c4f8a4e55a2e95
+  data.tar.gz: e0b9b5e7a2a9a87520fe632f37e5ed89484be85d16f02519628ac44c0716dad669352cd86e465a46b225cc009d8e9eddc06328348e98243ad470c007cd0f2a8f

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
 
 Layout/CaseIndentation:
   Enabled: false
+  
+Layout/ClosingHeredocIndentation:
+  Enabled: false
 
 Layout/CommentIndentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.4.5] - 2019-01-02
+### Changed
+- Minor code re-styling to please Rubocop 0.62.0.
+- File `.travis.yml` Updated Ruby versions for CI builds
+- File `.appveyor.yml` Sequence of Ruby versions refactored
+- File `LICENSE.txt`: updated years in copyright text.
+
+### Fixed
+- Method `ASTBuilder#reduce_pattern_sequence` was broken for lookbehind assertions.
+
 ## [0.4.4] - 2018-11-24
 ### Changed
 - File `srl_ruby.gemspec` Updated Rley dependency.

data/LICENSE.txt

@@ -5,7 +5,7 @@ the 'srl_test' directory, which is subject to its own license.
 
 The MIT License (MIT)
 
-Copyright (c) 2018 Dimitri Geshef
+Copyright (c) 2018-2019 Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/appveyor.yml

@@ -2,17 +2,16 @@ version: '{build}'
 max_jobs: 3
 environment:
   matrix:
-  - Ruby_version: 21
-  - Ruby_version: 21-x64
-  - Ruby_version: 22
-  - Ruby_version: 22-x64
-  - Ruby_version: 23
+  - Ruby_version: 25-x64
+  - Ruby_version: 24-x64  
   - Ruby_version: 23-x64
-  - Ruby_version: 24  
-  - Ruby_version: 24-x64
+  - Ruby_version: 22-x64 
+  - Ruby_version: 21-x64
   - Ruby_version: 25  
-  - Ruby_version: 25-x64
- 
+  - Ruby_version: 24  
+  - Ruby_version: 23  
+  - Ruby_version: 22
+  - Ruby_version: 21  
 # These are failing 
 #  - Ruby_version: 26  
 #  - Ruby_version: 26-x64  

data/bin/srl2ruby

@@ -23,11 +23,12 @@ class Srl2RubyProg
   def run!(file_names)
     if cli_options.include?(:pattern)
       srl_source = cli_options[:pattern]
-      process_srl(srl_source)    
+      process_srl(srl_source)
     end
     file_names.each do |srl_file|
       fname = validate_filename(srl_file)
       next unless file_exist?(fname)
+
       puts "Parsing file '#{fname}'"
       srl_source = File.read(fname)
       process_srl(srl_source)
@@ -76,7 +77,7 @@ class Srl2RubyProg
 
     exists
   end
-  
+
   def process_srl(srl_source)
     result = SrlRuby.parse(srl_source)
     destination = $stdout
@@ -85,7 +86,7 @@ class Srl2RubyProg
       destination = File.open(filepath, 'w')
     end
     puts "Writing to file '#{filepath}'" unless destination == $stdout
-    destination.puts emit_code(template, srl_source, result)  
+    destination.puts emit_code(template, srl_source, result)
   end
 
   def emit_code(template, srl_source, regexp)

data/bin/srl2ruby_cli_parser.rb

@@ -13,7 +13,7 @@ class Srl2RubyCLIParser < OptionParser
 
     heading
     separator 'Options:'
-    add_p_option    
+    add_p_option
     add_o_option
     add_t_option
     separator ''
@@ -63,14 +63,14 @@ DESCR
       @parsed_options[:output] = pathname
     end
   end
-  
+
   def add_p_option
     explanation = 'One-liner SRL pattern.'
 
     on '-p', '--pattern SRL_PATT', explanation do |pattern_arg|
        @parsed_options[:pattern] = pattern_arg.gsub(/^'|'$/, '')
     end
-  end  
+  end
 
   def add_t_option
     explanation = <<-EXPLANATION

data/lib/regex/char_range.rb

@@ -43,6 +43,7 @@ module Regex # This module is used as a namespace
     def validated_range(theLowerBound, theUpperBound)
       msg = 'Character range error: lower bound is greater than upper bound.'
       raise StandardError, msg if theLowerBound.codepoint > theUpperBound.codepoint
+
       return [theLowerBound, theUpperBound]
     end
   end # class

data/lib/regex/character.rb

@@ -103,6 +103,7 @@ module Regex # This module is used as a namespace
     def self.esc2codepoint(esc_seq)
       msg = "Escape sequence #{esc_seq} does not begin with a backslash (\)."
       raise StandardError, msg unless esc_seq[0] == '\\'
+
       result = (esc_seq.length == 2) ? digram2codepoint(esc_seq) : esc_number2codepoint(esc_seq)
 
       return result
@@ -155,6 +156,7 @@ module Regex # This module is used as a namespace
     # Otherwise the character corresponding to the codepoint is returned.
     def text_repr
       return char if lexeme.nil?
+
       return lexeme.dup
     end
 

data/lib/regex/multiplicity.rb

@@ -66,6 +66,7 @@ module Regex # This module is used as a namespace
     def valid_lower_bound(aLowerBound)
       err_msg = "Invalid lower bound of repetition count #{aLowerBound}"
       raise StandardError, err_msg unless aLowerBound.kind_of?(Integer)
+
       return aLowerBound
     end
 

data/lib/regex/polyadic_expression.rb

@@ -30,6 +30,7 @@ module Regex # This module is used as a namespace
       children.each(&:done!)
       children.each_with_index do |child, index|
         break if index == children.size - 1
+
         next_child = children[index + 1]
         if next_child.kind_of?(Lookaround) && next_child.dir == :behind
           # Swap children: lookbehind regex must precede pattern
@@ -57,6 +58,7 @@ module Regex # This module is used as a namespace
           top = visit_stack.pop
           if top.kind_of?(Array)
             next if top.empty?
+
             currChild = top.pop
             visit_stack.push top
           else

data/lib/srl_ruby/ast_builder.rb

@@ -44,6 +44,7 @@ module SrlRuby
         end
       end
       return if regexp_opts.empty?
+
       new_root = Regex::MatchOption.new(tree_root, regexp_opts)
       result.instance_variable_set(:@root, new_root)
     end
@@ -120,7 +121,13 @@ module SrlRuby
 
     # rule('pattern' => %w[pattern separator sub_pattern]).as 'pattern_sequence'
     def reduce_pattern_sequence(_production, _range, _tokens, theChildren)
-      Regex::Concatenation.new(theChildren[0], theChildren[2])
+      third_member = theChildren[2]
+      if third_member.kind_of?(Regex::Lookaround) && third_member.dir == :behind
+        Regex::Concatenation.new(theChildren[2], theChildren[0])
+      else
+        Regex::Concatenation.new(theChildren[0], theChildren[2])
+      end
+      
     end
 
     # rule('pattern' => 'sub_pattern').as 'basic_pattern'

data/lib/srl_ruby/tokenizer.rb

@@ -132,7 +132,7 @@ module SrlRuby
         token = build_token('LETTER_LIT', lexeme)
       elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z0-9_]+/))
         keyw = @@keywords[lexeme.upcase]
-        tok_type = keyw ? keyw : 'IDENTIFIER'
+        tok_type = keyw || 'IDENTIFIER'
         token = build_token(tok_type, lexeme)
       elsif (lexeme = scanner.scan(/[^,"\s]{2,}/))
         token = build_token('CHAR_CLASS', lexeme)

data/lib/srl_ruby/version.rb

@@ -1,3 +1,3 @@
 module SrlRuby
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 end

data/spec/acceptance/support/rule_file_tokenizer.rb

@@ -84,7 +84,7 @@ module Acceptance
         @state = :expecting_srl if lexeme == 'srl:'
       elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z0-9_]*/))
         keyw = @@keywords[lexeme]
-        token_type = keyw ? keyw : 'IDENTIFIER'
+        token_type = keyw || 'IDENTIFIER'
         token = build_token(token_type, lexeme)
       elsif (lexeme = scanner.scan(/"([^"]|\\")*"/)) # Double quotes literal?
         unquoted = lexeme.gsub(/(^")|("$)/, '')

data/srl_ruby.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['famished.tiger@yahoo.com']
 
   spec.description   = <<-DESCR
-  A compiler and library that transforms highly readable Simple Regex Language 
+  A compiler and library that transforms highly readable Simple Regex Language
   patterns into regular expressions.
 DESCR
   spec.summary = <<-SUMMARY
@@ -66,7 +66,7 @@ SUMMARY
   spec.required_ruby_version = '>= 2.1.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.7'
+  spec.add_dependency 'rley', '~> 0.7.00'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 1.16'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.00
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +80,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: "  A compiler and library that transforms highly readable Simple Regex
-  Language \n  patterns into regular expressions.\n"
+description: |2
+    A compiler and library that transforms highly readable Simple Regex Language
+    patterns into regular expressions.
 email:
 - famished.tiger@yahoo.com
 executables: