korekto 1.4.210318 → 1.6.210409

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe8d20d5b0f785dab1f984276491bf452941f3ded713c07fe11707af9cbe501
-  data.tar.gz: e5b861d5be1dc2e1595bfa47a34186922a3eb3867295b5b41eafab8204941516
+  metadata.gz: 91b2307d9115580d8a6882a7bf8d417d1eca426d7539fff91dce791ea7dd1ff9
+  data.tar.gz: 1a1db1ac36359058341083031abe61e6e9c3258fdaf2cb2388140ef3e179b8fa
 SHA512:
-  metadata.gz: c682441f95e8bf3b149085946a0f8cc44665b46cfdcfd6acbf87654f19a70a28c7ac03a6b82bd8a0f98a3d7db5c328364ef0597aeb2b1c2b1da0a54498f19d60
-  data.tar.gz: a0b41a23ea9302ee486952c49e088a7651f7d08d694385f8417f398482724217f4ab254fb6cdbf31d48f4946ef4ed76d070cf86bd4f2ed0d2588a4cf3ebdee20
+  metadata.gz: 0bbcd36ec3471eb628d1274e013d2c9f6e8b85ab4e8b0d99a226a43d58cbe471a74f9b39a5db0c63e66af888353fa7be0069224fb35df4a80d75b148356fccc9
+  data.tar.gz: ca4b3a0d970d6463f49f18af87767301d376d9a102031a88ebe3c8707114e60161f4ba4014e2608fda377515500b608361178b8b9ea9d02d3f577daa5e069c91

data/bin/korekto

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require 'help_parser'
 
-OPTIONS = HelpParser['1.4.210318', <<HELP]
+OPTIONS = HelpParser['1.6.210409', <<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.4.210318'
+  VERSION = '1.6.210409'
   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

@@ -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

@@ -75,7 +75,7 @@ class Statement
     @code = "#{@code[0]}#{@statement_number}"
     @code += '.' + @section unless @section=='-'
     @code += "/#{support}" if support
-    @title = title.split(':',2).first if title
+    @title = title if (title=title&.split(':',2)&.first) and not title.empty?
   end
 
   def support(*s)
@@ -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.4.210318
+  version: 1.6.210409
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-04-09 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.