regexgen 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd258fd9b15bddbe8a07ca2636332049cb1861b13003b847704134426bae5575
-  data.tar.gz: b8d8d34569d6fb1c939c410d6963688507f06b5f27c50f2a8822268fee0dc28c
+  metadata.gz: 712b188ebb53ab6fd9ddc10b42eae54b87312ee1a27fb2af0740141f8e054414
+  data.tar.gz: 63b927e179f6e7eb058b50d037ed2c963c1abbb39e68b91b6e09e5104b36df91
 SHA512:
-  metadata.gz: 82a41dfd15da1004cec3ca972eaef09cf198d5d6a55c75c0ef46ba64fb47e57ab14ae99d0d30a2acbe3f66ebc852edd4b6c32e6893b4f8bb76d7ed6f60737af9
-  data.tar.gz: 0afef5a51a5b6b7015f21486527cc8de29bb950f68aec3be0fbee7c37f229f2ea04afedb14fc644215e8183d7bbf55c5a383e2417f3d5f023cf1886d90fd2836
+  metadata.gz: 077127e3bca3854f569e6452cb5db39e54b83faf134795b92cfc34f785890c3bd2de995bd06dab8c3cc3eacde2aea60c94fcb720233701d05831056e47396065
+  data.tar.gz: bc5df49ef540c19765602270278a0338dbd3725039174fbc220ec9814c5af1e0ecb6c650c2f68915b711e600163acdc69fab022c506109e76440ee95adaf0ad5

data/.dir-locals.el

@@ -0,0 +1,4 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((ruby-mode . ((lsp-solargraph-use-bundler . t))))

data/.github/workflows/main.yml

@@ -21,3 +21,5 @@ jobs:
       run: bundle exec rake test
     - name: Lint
       run: bundle exec rubocop
+    - name: Type check
+      run: bundle exec solargraph typecheck --level typed

data/.solargraph.yml

@@ -0,0 +1,17 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- rubocop
+- require_not_found
+- typecheck:typed
+require_paths: []
+plugins: []
+max_files: 5000

data/Gemfile.lock

@@ -1,20 +1,30 @@
 PATH
   remote: .
   specs:
-    regexgen (0.1.1)
+    regexgen (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
+    backport (1.1.2)
+    benchmark (0.1.0)
     byebug (11.1.3)
+    e2mmap (0.1.0)
+    jaro_winkler (1.5.4)
+    maruku (0.7.3)
+    mini_portile2 (2.4.0)
     minitest (5.14.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
     regexp_parser (1.7.1)
+    reverse_markdown (2.0.0)
+      nokogiri
     rexml (3.2.4)
     rubocop (0.89.0)
       parallel (~> 1.10)
@@ -28,7 +38,24 @@ GEM
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
+    solargraph (0.39.13)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
+      parser (~> 2.3)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (~> 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+    thor (1.0.1)
+    tilt (2.0.10)
     unicode-display_width (1.7.0)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -39,6 +66,7 @@ DEPENDENCIES
   rake (~> 12.0)
   regexgen!
   rubocop (~> 0.89)
+  solargraph (~> 0.39)
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -29,6 +29,19 @@ require 'regexgen'
 Regexgen.generate(['foobar', 'foobaz', 'foozap', 'fooza']) #=> /foo(?:zap?|ba[rz])/
 ```
 
+## CLI
+
+`regexgen` also has a simple CLI to generate regexes using inputs from the
+command line.
+
+```sh
+$ regexgen
+usage: regexgen [-mix] strings...
+    -m                               Multiline flag
+    -i                               Case-insensitive flag
+    -x                               Extended flag
+```
+
 ## Unicode handling
 
 Unlike the JavaScript version, this package does not do any special Unicode

data/bin/regexgen

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'regexgen'
+require 'optparse'
+
+REGEX_FLAGS = {
+  'm' => 'Multiline flag',
+  'i' => 'Case-insensitive flag',
+  'x' => 'Extended flag'
+}.freeze
+
+flags = []
+op = OptionParser.new do |opts|
+  opts.banner = "usage: regexgen [-#{REGEX_FLAGS.keys.join}] strings..."
+  REGEX_FLAGS.each do |flag, description|
+    opts.on("-#{flag}", description) { |_| flags << flag }
+  end
+end
+
+begin
+  op.parse!
+rescue OptionParser::InvalidOption => e
+  puts e, op.help
+  exit(1)
+end
+
+if ARGV.empty?
+  puts op.help
+  exit(1)
+end
+
+puts Regexgen.generate(ARGV, flags)

data/lib/regexgen/regex.rb

@@ -4,6 +4,42 @@ require 'regexgen/ast'
 
 module Regexgen
   class<<self
+    # Brzozowski algebraic method
+    # https://cs.stackexchange.com/a/2392
+    #
+    # Largely ported from
+    # https://github.com/devongovett/regexgen/blob/7ef10aef3a414b10554822cdf6e90389582b1890/src/regex.js
+    #
+    # Initialize B
+    #
+    #   for i = 1 to m:
+    #     if final(i):
+    #       B[i] := ε
+    #     else:
+    #       B[i] := ∅
+    #
+    # Initialize A
+    #
+    #   for i = 1 to m:
+    #     for j = 1 to m:
+    #       for a in Σ:
+    #         if trans(i, a, j):
+    #           A[i,j] := a
+    #         else:
+    #           A[i,j] := ∅
+    #
+    # Solve
+    #
+    #   for n = m decreasing to 1:
+    #     B[n] := star(A[n,n]) . B[n]
+    #     for j = 1 to n:
+    #       A[n,j] := star(A[n,n]) . A[n,j];
+    #     for i = 1 to n:
+    #       B[i] += A[i,n] . B[n]
+    #       for j = 1 to n:
+    #         A[i,j] += A[i,n] . A[n,j]
+    #
+    # Result is e := B[1]
     def to_regex(root)
       states = root.visit.to_a
 
@@ -22,7 +58,7 @@ module Regexgen
 
       (states.length - 1).downto(0) do |n|
         if a[n][n]
-          b[n] = concat(star(a[n][n], b[n]))
+          b[n] = concat(star(a[n][n]), b[n])
           (0...n).each do |j|
             a[n][j] = concat(start(a[n][n]), a[n][j])
           end

data/lib/regexgen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Regexgen
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/regexgen.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'byebug', '~> 11'
   spec.add_development_dependency 'rubocop', '~> 0.89'
+  spec.add_development_dependency 'solargraph', '~> 0.39'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexgen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Madlon-Kay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.89'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.39'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.39'
 description: 
 email:
 - aaron@madlon-kay.com
@@ -45,11 +59,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dir-locals.el"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
+- ".solargraph.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -57,6 +73,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/regexgen
 - bin/setup
 - lib/regexgen.rb
 - lib/regexgen/ast.rb