korekto 1.3.210316 → 1.6.210407

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99d35f287cccfc7c88c73dd606fdbf45d764539c1a34bf876cdcb6fb6f99bf2
-  data.tar.gz: c27942f51f96578a49e67eac98dfe92a96e38f112d9a9657127efef18c3466a5
+  metadata.gz: 63058c0e7d8ef9416a79f001e39c07988bb8f0627b6493737418adbdb8df4c21
+  data.tar.gz: fc413904c25e1ad6d93546ca10e91d5d548aecb19ca56c2bb032a0e2e741d649
 SHA512:
-  metadata.gz: d5aab27ec1aa2c21e6ab6c613f82c4d679863c6ce6dc4bb8172f2ed34de7a209eaec894e27c77cc558e0eed8f9e5d71c5f7522b54abca2be4579d59b193bcea3
-  data.tar.gz: 7893176fe192ea333fd509a47ef011147802d40725903023adfdaf63de47e18f37830dade8dfa57fa891ca3b09841396ef7b42d23c2a42750d47cccf0e634b28
+  metadata.gz: 7107c848a39a79c564c02453a4f6c83c25c6621cd6fd89716ed33c3da14f679644024297f93ce8216a15605e728b5acde6406a7f88c70248e9c90dad4358ed9d
+  data.tar.gz: a1f836ef421b1466842aabccb091cc4b94fff05c5aab76a67486954505c6501e9cc3d6398e630ca5ce3db113732d9f52fb36667157dfbcd7e323a5fba4d321b8

data/bin/korekto

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require 'help_parser'
 
-OPTIONS = HelpParser['1.3.210316', <<HELP]
+OPTIONS = HelpParser['1.6.210407', <<HELP]
 Usage:
-  korekto [:options+]
+  korekto [:options]
 Options:
  -h --help
  -v --version
+ --edits     \tShow only needed edits
  --install   \tInstalls the korekto neovim ruby plugin
  --readme    \tOpen korekto github page
 # Example usage:

data/lib/korekto.rb

@@ -1,5 +1,5 @@
 module Korekto
-  VERSION = '1.3.210316'
+  VERSION = '1.6.210407'
   class Error < Exception; end
   require 'korekto/symbols'
   require 'korekto/syntax'
@@ -12,4 +12,5 @@ end
 # Requires:
 # `ruby`
 # `nvim`
+# `neovim-ruby-host`
 # `xdg-open`

data/lib/korekto/heap.rb

@@ -9,6 +9,10 @@ class Heap
     @a = []
   end
 
+  def to_a
+    @a
+  end
+
   def add(s)
     @a.unshift s
     @a.pop if @a.length > @limit

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.*)$/
@@ -112,13 +112,13 @@ class Main
         next unless active?
         next if preprocess?
         if md = MD_STATEMENT_CODE_TITLE.match(@line)
-          statement_number += 1
           code,title = @statements.add(md[:statement].strip,
                                        md[:code],
                                        md[:title],
-                                       @section,
-                                       statement_number)
-          puts "#{@filename}:#{line_number}:#{code}:#{title}"
+                                       @section){ statement_number += 1 }
+          if not OPTIONS.edits? or (@filename=='-' and not (md[:code]==code and md[:title]==title))
+            puts "#{@filename}:#{line_number}:#{code}:#{title}"
+          end
         else
           raise Error, 'unrecognized korekto line'
         end

data/lib/korekto/statement.rb

@@ -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.section+'.'+c unless s.section=='-'
       support.push(c)
     end
     return support.join(',')
@@ -150,7 +150,12 @@ class Statement
     set_regexp
     newlines_count(nl)
     undefined_in_pattern
-    set_statement
+    follows = @context.heap.to_a[0..nl].reverse
+    if @regexp.match? follows.map{_1.to_s}.join("\n")
+      set_statement(support(*follows))
+    else
+      set_statement
+    end
   end
 
   def tautology

data/lib/korekto/statements.rb

@@ -11,7 +11,7 @@ class Statements
   def type(c) = @statements.select{_1.type==c}
   def length = @statements.length
 
-  def add(statement,code,title,filename,statement_number)
+  def add(statement,code,title,filename)
     c = code[0]; w = c=='W'
     if restatement = @statements.detect{(w or _1.type==c) and _1.to_s==statement}
       case restatement.type
@@ -24,6 +24,7 @@ class Statements
       title ||= restatement.title
       return code, title
     end
+    statement_number = yield
     statement = Statement.new(statement,code,title,filename,statement_number,self)
     @statements.push statement
     case statement.type

data/rplugin/ruby/korekto.rb

@@ -1,6 +1,6 @@
 Neovim.plugin do |plug|
   plug.command(:Korekto) do |nvim|
-    validations = nvim.command_output('w !korekto').strip.split("\n").map(&:strip)
+    validations = nvim.command_output('w !korekto --edits').strip.split("\n").map(&:strip)
     msg = 'OK'
     unless validations.empty?
       buf = nvim.get_current_buf

data/start/korekto/syntax/korekto.vim

@@ -1,12 +1,21 @@
+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 Undef   /:[^#]\+$/ 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 Unsup   ctermfg=brown
+highlight Sup     ctermfg=darkgreen
+highlight Title   ctermfg=darkblue
+highlight Undef   ctermfg=red
 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.3.210316
+  version: 1.6.210407
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -70,10 +70,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'ruby: ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [x86_64-linux]'
+- 'ruby: ruby 3.0.1p64 (2021-04-05 revision 0fb782ee38) [x86_64-linux]'
 - 'nvim: NVIM v0.4.4'
+- 'neovim-ruby-host: 0.8.1'
 - 'xdg-open: xdg-open 1.1.3+'
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A general proof checker.