v0.9

diff --git a/autoload/explainpat.vim b/autoload/explainpat.vim
index 566273266fc981d00b81d37c22cb182946766377..0fded10901656fc10112cdf217af0187f8299962 100644 (file)
--- a/autoload/explainpat.vim
+++ b/autoload/explainpat.vim
@@ -1,7 +1,7 @@
 " File:         explainpat.vim
 " Created:      2011 Nov 02
 " File:         explainpat.vim
 " Created:      2011 Nov 02

-" Last Change:  2017 Oct 20
-" Version:     0.7
+" Last Change:  2017 Dec 15
+" Version:     0.9

 " Author:      Andy Wokula <anwoku@yahoo.de>
 " License:     Vim License, see :h license
 
 " Author:      Andy Wokula <anwoku@yahoo.de>
 " License:     Vim License, see :h license
 


@@ -66,7 +66,7 @@ func! explainpat#ExplainPattern(cmd_arg, ...) "{{{
     " >=1 at pos 0 or after '\|', '\&', '\(', '\%(' or '\n'; else 0 or less:
     let s:at_begin_of_pat = 1
 
     " >=1 at pos 0 or after '\|', '\&', '\(', '\%(' or '\n'; else 0 or less:
     let s:at_begin_of_pat = 1
 

-    let hulit = a:0>=1 && type(a:1)==s:DICT ? a:1 : s:NewHelpPrinter()
+    let hulit = a:0>=1 && type(a:1)==s:DICT ? a:1 : explainpat#NewHelpPrinter()

     call hulit.AddIndent('  ')
     let bull = s:NewTokenBiter(magicpat)
     while !bull.AtEnd()
     call hulit.AddIndent('  ')
     let bull = s:NewTokenBiter(magicpat)
     while !bull.AtEnd()


@@ -99,7 +99,7 @@ let s:FUNCREF = type(function("tr"))
 let s:LIST = type([])
 " }}}
 
 let s:LIST = type([])
 " }}}
 

-let s:magic_item_pattern = '\C^\%(\\\%(@<\|%#=\|%[dxouU[(^$V#<>]\=\|z[1-9se(]\|@[>=!]\|_[[^$.]\=\|.\)\|.\)'
+let s:magic_item_pattern = '\C^\%(\\\%(%#=\|%[dxouU[(^$V#<>]\=\|z[1-9se(]\|@[>=!]\=\|_[[^$.]\=\|.\)\|.\)'

 
 let s:doc = {} " {{{
 " this is all the help data ...
 
 let s:doc = {} " {{{
 " this is all the help data ...


@@ -187,17 +187,21 @@ let s:doc['\@='] = "(assertion) require match for preceding atom"
 let s:doc['\@!'] = "(assertion) forbid match for preceding atom"
 
 func! s:DocBefore(bull, hulit, item) "{{{
 let s:doc['\@!'] = "(assertion) forbid match for preceding atom"
 
 func! s:DocBefore(bull, hulit, item) "{{{

-    let rest = a:bull.Bite('^[=!]')
-    if rest == "="
+    let rest = a:bull.Bite('^\d*\%[<[=!]]')
+    if rest == "<="

        call a:hulit.Print(a:item.rest, "(assertion) require match for preceding atom to the left")
        call a:hulit.Print(a:item.rest, "(assertion) require match for preceding atom to the left")

-    elseif rest == "!"
+    elseif rest == "<!"

        call a:hulit.Print(a:item.rest, "(assertion) forbid match for preceding atom to the left")
        call a:hulit.Print(a:item.rest, "(assertion) forbid match for preceding atom to the left")

+    elseif rest =~ '^\d\+<='
+       call a:hulit.Print(a:item.rest, printf("(assertion) like `\\@<=', looking back at most %s bytes (since Vim 7.3.1037)", s:SillyCheck(matchstr(rest, '\d\+'))))
+    elseif rest =~ '^\d\+<!'
+       call a:hulit.Print(a:item.rest, printf("(assertion) like `\\@<!', looking back at most %s bytes (since Vim 7.3.1037)", s:SillyCheck(matchstr(rest, '\d\+'))))

     else
     else

-       call a:hulit.Print(a:item.rest, "(invalid) `\\@<' must be followed by `=' or `!'")
+       call a:hulit.Print(a:item.rest, "(invalid) incomplete item")

     endif
 endfunc "}}}
 
     endif
 endfunc "}}}
 

-let s:doc['\@<'] = function("s:DocBefore")
+let s:doc['\@'] = function("s:DocBefore")

 
 func! s:DocCircumFlex(bull, hulit, item) "{{{
     if s:at_begin_of_pat >= 1
 
 func! s:DocCircumFlex(bull, hulit, item) "{{{
     if s:at_begin_of_pat >= 1


@@ -482,7 +486,13 @@ let s:doc['\%U'] = function("s:DocBspercHexEight") " 1234abcd
 " \V
 "}}}
 
 " \V
 "}}}
 

-func! s:NewHelpPrinter() "{{{
+" {{{
+func! s:SillyCheck(digits) "{{{
+    return strlen(a:digits) < 10 ? a:digits : '{silly large number}'
+endfunc "}}}
+" }}}
+
+func! explainpat#NewHelpPrinter() "{{{

     let obj = {}
     let obj.literals = ''
     let obj.indents = []
     let obj = {}
     let obj.literals = ''
     let obj.indents = []

diff --git a/doc/explainpat.txt b/doc/explainpat.txt
index afe0fc9883a9b6cc246a8decb7e34632a167a277..0268c699a1794ee83fb7df322cbfdd95dd1f7a2e 100644 (file)
--- a/doc/explainpat.txt
+++ b/doc/explainpat.txt
@@ -1,6 +1,6 @@
 *explainpat.txt*    Give detailed help on a regexp pattern.
 
 *explainpat.txt*    Give detailed help on a regexp pattern.
 

-                   For Vim version 7.0.  Last change: 2017 Oct 20
+                   For Vim version 7.0.  Last change: 2017 Dec 15

                    By Andy Wokula <anwoku@yahoo.de>
 
                                                *explainpat* *explainpat.vim*
                    By Andy Wokula <anwoku@yahoo.de>
 
                                                *explainpat* *explainpat.vim*


@@ -25,6 +25,9 @@ URL http://vim.sourceforge.net/scripts/script.php?script_id=4364
                                a       explain pattern from register a
                                etc.
 
                                a       explain pattern from register a
                                etc.
 

+>
+       :ExplainPattern \C^\%(\\\%(@<\|%#=\|%[dxouU[(^$V#<>]\=\|z[1-9se(]\|@[>=!]\|_[[^$.]\=\|.\)\|.\)
+

 Notes:
 The pattern is first converted into a purely |magic| pattern using
 |nwo#magic#MakeMagic()|.  This means that embedded |/\V| |/\M| |/\m| |/\v|
 Notes:
 The pattern is first converted into a purely |magic| pattern using
 |nwo#magic#MakeMagic()|.  This means that embedded |/\V| |/\M| |/\m| |/\v|


@@ -37,6 +40,7 @@ specifiers are effectively removed from the explanation.
 
 ==============================================================================
 TODO:
 
 ==============================================================================
 TODO:

+? `\%[...]` can be nested?  But documentation |/\%[]| says no.

 
 Ideas:
 - If the user already knows regular expressions but of a different kind,
 
 Ideas:
 - If the user already knows regular expressions but of a different kind,


@@ -53,6 +57,12 @@ Ideas:
 ==============================================================================
 History:
 
 ==============================================================================
 History:
 

+v0.9
++ BF accept `\@123<=` and `\@123<!`
+
+v0.8
+* s:NewHelpPrinter() => explainpat#NewHelpPrinter()
+

 v0.7
 + BF `\{3,4\}` not accepted, only `\{3,4}`
 
 v0.7
 + BF `\{3,4\}` not accepted, only `\{3,4}`