korekto 1.0.210306 → 1.4.210318

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a256a294cc625c6d701521f8ac80436501dbad3cfcaddc361418454a2aa5d3
-  data.tar.gz: ee6ed801ec1619b0c3c41946f3d1c1831181ab6f8bfbe798174ab3638e021d7b
+  metadata.gz: ebe8d20d5b0f785dab1f984276491bf452941f3ded713c07fe11707af9cbe501
+  data.tar.gz: e5b861d5be1dc2e1595bfa47a34186922a3eb3867295b5b41eafab8204941516
 SHA512:
-  metadata.gz: ea659d6feef95bdb03e76e80dc974ba9a8b6288239525ff6bd141f53e7cdedde1432ab816e4831b35c4b7728ff1b14896ed10915a31badd2093e4b50dd33b1f3
-  data.tar.gz: d191041a84be4e648e4ebb18c376090e6a6ec5c375fe69dea7224532bad19a71d3c9e37db6c07d96243a3206545638bc72d9fb4359cb252ba7d825656aafe8c6
+  metadata.gz: c682441f95e8bf3b149085946a0f8cc44665b46cfdcfd6acbf87654f19a70a28c7ac03a6b82bd8a0f98a3d7db5c328364ef0597aeb2b1c2b1da0a54498f19d60
+  data.tar.gz: a0b41a23ea9302ee486952c49e088a7651f7d08d694385f8417f398482724217f4ab254fb6cdbf31d48f4946ef4ed76d070cf86bd4f2ed0d2588a4cf3ebdee20

data/bin/korekto

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'help_parser'
 
-OPTIONS = HelpParser['1.0.210306', <<HELP]
+OPTIONS = HelpParser['1.4.210318', <<HELP]
 Usage:
   korekto [:options+]
 Options:

data/lib/korekto.rb

@@ -1,5 +1,5 @@
 module Korekto
-  VERSION = '1.0.210306'
+  VERSION = '1.4.210318'
   class Error < Exception; end
   require 'korekto/symbols'
   require 'korekto/syntax'

data/lib/korekto/main.rb

@@ -1,6 +1,6 @@
 module Korekto
 class Main
-  MD_STATEMENT_CODE_TITLE = %r{^(?<statement>.*)\s#(?<code>[A-Z](\d+(/[\w,.]+)?)?)( (?<title>\S.*?\S))?$}
+  MD_STATEMENT_CODE_TITLE = %r{^(?<statement>.*)\s#(?<code>[A-Z](\d+(\.\w+)?(/[\w,.]+)?)?)( (?<title>\S.*?\S))?$}
   MD_FILENAME = %r{^< (?<filename>[/\w\-.]+)$}
   MD_KLASS_METHOD_DEFINITION = /^(?<klass>::[A-Z]\w+)#(?<method>\w+)(?<definition>[^=]*=.+)$/ # patch
   MD_RULE = /^[?] (?<rule>\S.*)$/
@@ -15,8 +15,9 @@ class Main
 
   def initialize(filename='-', statements: Statements.new, imports: [])
     @filename,@statements,@imports = filename,statements,imports
-    @imports.push @filename
+    @imports.push @filename.freeze
     @line,@active = nil,false
+    @section = File.basename(@filename,'.*')
     @m_fence_korekto = /^```korekto$/
   end
 
@@ -65,6 +66,8 @@ class Main
       @statements.symbols.set_scanner value
     when 'fence'
       @m_fence_korekto = Regexp.new "^```#{value}$"
+    when 'section'
+      @section = value
     when 'save'
       BACKUPS[value] = Marshal.dump(@statements)
     when 'restore'
@@ -113,7 +116,7 @@ class Main
           code,title = @statements.add(md[:statement].strip,
                                        md[:code],
                                        md[:title],
-                                       @filename,
+                                       @section,
                                        statement_number)
           puts "#{@filename}:#{line_number}:#{code}:#{title}"
         else
@@ -122,7 +125,7 @@ class Main
       rescue Error
         puts "#{@filename}:#{line_number}:!:#{$!.message}"
         exit 65
-      rescue
+      rescue Exception
         puts "#{@filename}:#{line_number}:?:#{$!.message}"
         $stderr.puts $!.backtrace
         exit 1

data/lib/korekto/statement.rb

@@ -1,11 +1,11 @@
 module Korekto
 class Statement
-  attr_reader :code,:title,:regexp,:filename,:statement_number
-  def initialize(statement,code,title,filename,statement_number,context)
-    @statement,@code,@title,@statement_number,@context = statement,code,title,statement_number,context
-    @filename = File.basename(filename,'.*')
-    @statement.freeze; @filename.freeze; @statement_number.freeze
-    syntax_check
+  attr_reader :code,:title,:regexp,:section,:statement_number
+  def initialize(statement,code,title,section,statement_number,context)
+    @statement,@code,@title,@section,@statement_number,@context =
+      statement,code,title,section,statement_number,context
+    @statement.freeze; @section.freeze; @statement_number.freeze
+    syntax_check unless @statement[0]=='/' and @statement[-1]=='/' and ['A','L','M','E','I'].include?(@code[0])
     @regexp = nil
     set_acceptance_code
     @code.freeze; @title.freeze; @regexp.freeze
@@ -73,6 +73,7 @@ class Statement
 
   def set_statement(support=nil, title=nil)
     @code = "#{@code[0]}#{@statement_number}"
+    @code += '.' + @section unless @section=='-'
     @code += "/#{support}" if support
     @title = title.split(':',2).first if title
   end
@@ -81,7 +82,6 @@ class Statement
     support = []
     s.each do |s|
       c = s.code.split('/',2)[0]
-      c = s.filename+'.'+c unless s.filename=='-'
       support.push(c)
     end
     return support.join(',')

data/lib/korekto/symbols.rb

@@ -36,13 +36,13 @@ class Symbols
     if statement[0]=='/' and statement[-1]=='/'
       Regexp.new(statement[1..-2])
     else
-      pattern,count,seen = '^',0,{}
-      Regexp.quote(statement).scan(@scanner) do |v|
+      pattern,count,seen = '\A',0,{}
+      statement.scan(@scanner) do |v|
         if n=seen[v]
           pattern << '\\'+n
         elsif type = @v2t[v]
           regex = @t2p[type]
-          if regex=='\n'
+          if type[0]=='.'
             pattern << regex
           else
             count += 1
@@ -50,14 +50,15 @@ class Symbols
             pattern << '('+regex+')'
           end
         else
-          # To avoid collisions with back-references,
-          # isolate digit in square brackets:
+          # Escape Regexp specials
+          v = Regexp.quote v
+          # To avoid collisions with back-references, isolate digit in square brackets:
           '0123456789'.include?(_=v[0]) and v[0]='['+_+']'
           pattern << v
         end
       end
       raise Error, 'pattern with no captures' if count < 1
-      pattern << '$'
+      pattern << '\Z'
       Regexp.new(pattern)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: korekto
 version: !ruby/object:Gem::Version
-  version: 1.0.210306
+  version: 1.4.210318
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser