korekto 1.0.210310 → 1.4.210326

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4409a65275e6ef8463f5327214f5af2e45353adc5c471b822c17da786a9868d
-  data.tar.gz: cad5bc96ef5b026bc5e841eb4c235525f8daff9c6fcb6d5c6f9aa78cd7f53a6e
+  metadata.gz: 3cac6951966fa5ce4eba7f2de2054505cc2b6391d3c598022f700a8fa5e3b0cd
+  data.tar.gz: 1426d701eee6be60fde9e47ed2d7ffd590ffbaf9aaedd0aa1ba96af0fafb7079
 SHA512:
-  metadata.gz: 9494098bfb53f6f58136530e923d08c6b8b9e9d5a416dca8c3073a14549fb2e55dab264b18b43ae87f79ba0123c454e2aff89077bba90752c34383142567df1d
-  data.tar.gz: 7168c686fdeb51c562a77e780ecaaca6a1eb9c0d0d0ff5cfef6900ce486f0f76ce205f06887c97895a648c46914bc03ee3551cf2565250c7fcee82ccb9b8a01c
+  metadata.gz: 8913ca6f7e54d68c77f08a0fe6b1adc80d6fd54e96fd0170ab18aeaf75b7ec0dc0f301af61698f653039056055dabdd1275381fec19fd29643b3ed7d887eabbc
+  data.tar.gz: 9b80e93183ece64621f8d8712b51044fc5fb51038b35790b1789ceb7e7fc9684bafb5681bb9dbc5ea6a564c436a44ba67e745526da6d08849579a5cbf6137760

data/bin/korekto

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

data/lib/korekto.rb

@@ -1,5 +1,5 @@
 module Korekto
-  VERSION = '1.0.210310'
+  VERSION = '1.4.210326'
   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

data/lib/korekto/statement.rb

@@ -1,10 +1,10 @@
 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
+  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
@@ -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

data/start/korekto/syntax/korekto.vim

@@ -1,12 +1,21 @@
+syntax match Undef   /:[^#]\+$/ contained containedin=Type
+syntax match Unsup   /#[A-Z]\d\+\(\.\w\+\)\?/ contained containedin=Type
+syntax match Sup     /#[A-Z]\d\+\(\.\w\+\)\?\/\S\+/ contained containedin=Type
+syntax match Title   / [^:]\+/ contained containedin=Type
+syntax match Type    /\s#[A-Z][^#]\+/ contains=Unsup,Sup,Title,Undef
 syntax match Comment /^\s*#.\+$/
-syntax match Pass    /\s#[A-Z][^#]*$/
-syntax match Syntax  /^[?] \w.\+$/
+syntax match Syntax  /^[?] \S.\+$/
 syntax match Patch   /^::[A-Z]\w\+#\w\+[^=]\+=.\+$/
 syntax match Import  /^< [\/A-Za-z\_\-\.]\+$/
+syntax match Setting /^! \S.*$/
+highlight Undef   ctermfg=red
+highlight Unsup   ctermfg=brown
+highlight Sup     ctermfg=darkgreen
+highlight Title   ctermfg=darkblue
 highlight Comment ctermfg=darkblue
-highlight Pass    ctermfg=darkgreen
-highlight Syntax  ctermfg=darkmagenta
+highlight Import  ctermfg=brown
 highlight Patch   ctermfg=darkgrey
-highlight Import  ctermfg=darkyellow
+highlight Syntax  ctermfg=darkgrey
+highlight Setting ctermfg=darkmagenta
 setlocal tabstop=23
 map <F7> :Korekto<CR>

metadata

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