Mercurial > vim
annotate runtime/indent/matlab.vim @ 32936:c517845bd10e v9.0.1776
patch 9.0.1776: No support for stable Python 3 ABI
Commit: https://github.com/vim/vim/commit/c13b3d1350b60b94fe87f0761ea31c0e7fb6ebf3
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Sun Aug 20 21:18:38 2023 +0200
patch 9.0.1776: No support for stable Python 3 ABI
Problem: No support for stable Python 3 ABI
Solution: Support Python 3 stable ABI
Commits:
1) Support Python 3 stable ABI to allow mixed version interoperatbility
Vim currently supports embedding Python for use with plugins, and the
"dynamic" linking option allows the user to specify a locally installed
version of Python by setting `pythonthreedll`. However, one caveat is
that the Python 3 libs are not binary compatible across minor versions,
and mixing versions can potentially be dangerous (e.g. let's say Vim was
linked against the Python 3.10 SDK, but the user sets `pythonthreedll`
to a 3.11 lib). Usually, nothing bad happens, but in theory this could
lead to crashes, memory corruption, and other unpredictable behaviors.
It's also difficult for the user to tell something is wrong because Vim
has no way of reporting what Python 3 version Vim was linked with.
For Vim installed via a package manager, this usually isn't an issue
because all the dependencies would already be figured out. For prebuilt
Vim binaries like MacVim (my motivation for working on this), AppImage,
and Win32 installer this could potentially be an issue as usually a
single binary is distributed. This is more tricky when a new Python
version is released, as there's a chicken-and-egg issue with deciding
what Python version to build against and hard to keep in sync when a new
Python version just drops and we have a mix of users of different Python
versions, and a user just blindly upgrading to a new Python could lead to
bad interactions with Vim.
Python 3 does have a solution for this problem: stable ABI / limited API
(see https://docs.python.org/3/c-api/stable.html). The C SDK limits the
API to a set of functions that are promised to be stable across
versions. This pull request adds an ifdef config that allows us to turn
it on when building Vim. Vim binaries built with this option should be
safe to freely link with any Python 3 libraies without having the
constraint of having to use the same minor version.
Note: Python 2 has no such concept and this doesn't change how Python 2
integration works (not that there is going to be a new version of Python
2 that would cause compatibility issues in the future anyway).
---
Technical details:
======
The stable ABI can be accessed when we compile with the Python 3 limited
API (by defining `Py_LIMITED_API`). The Python 3 code (in `if_python3.c`
and `if_py_both.h`) would now handle this and switch to limited API
mode. Without it set, Vim will still use the full API as before so this
is an opt-in change.
The main difference is that `PyType_Object` is now an opaque struct that
we can't directly create "static types" out of, and we have to create
type objects as "heap types" instead. This is because the struct is not
stable and changes from version to version (e.g. 3.8 added a
`tp_vectorcall` field to it). I had to change all the types to be
allocated on the heap instead with just a pointer to them.
Other functions are also simply missing in limited API, or they are
introduced too late (e.g. `PyUnicode_AsUTF8AndSize` in 3.10) to it that
we need some other ways to do the same thing, so I had to abstract a few
things into macros, and sometimes re-implement functions like
`PyObject_NEW`.
One caveat is that in limited API, `OutputType` (used for replacing
`sys.stdout`) no longer inherits from `PyStdPrinter_Type` which I don't
think has any real issue other than minor differences in how they
convert to a string and missing a couple functions like `mode()` and
`fileno()`.
Also fixed an existing bug where `tp_basicsize` was set incorrectly for
`BufferObject`, `TabListObject, `WinListObject`.
Technically, there could be a small performance drop, there is a little
more indirection with accessing type objects, and some APIs like
`PyUnicode_AsUTF8AndSize` are missing, but in practice I didn't see any
difference, and any well-written Python plugin should try to avoid
excessing callbacks to the `vim` module in Python anyway.
I only tested limited API mode down to Python 3.7, which seemes to
compile and work fine. I haven't tried earlier Python versions.
2) Fix PyIter_Check on older Python vers / type##Ptr unused warning
For PyIter_Check, older versions exposed them as either macros (used in
full API), or a function (for use in limited API). A previous change
exposed PyIter_Check to the dynamic build because Python just moved it
to function-only in 3.10 anyway. Because of that, just make sure we
always grab the function in dynamic builds in earlier versions since
that's what Python eventually did anyway.
3) Move Py_LIMITED_API define to configure script
Can now use --with-python-stable-abi flag to customize what stable ABI
version to target. Can also use an env var to do so as well.
4) Show +python/dyn-stable in :version, and allow has() feature query
Not sure if the "/dyn-stable" suffix would break things, or whether we
should do it another way. Or just don't show it in version and rely on
has() feature checking.
5) Documentation first draft. Still need to implement v:python3_version
6) Fix PyIter_Check build breaks when compiling against Python 3.8
7) Add CI coverage stable ABI on Linux/Windows / make configurable on Windows
This adds configurable options for Windows make files (both MinGW and
MSVC). CI will also now exercise both traditional full API and stable
ABI for Linux and Windows in the matrix for coverage.
Also added a "dynamic" option to Linux matrix as a drive-by change to
make other scripting languages like Ruby / Perl testable under both
static and dynamic builds.
8) Fix inaccuracy in Windows docs
Python's own docs are confusing but you don't actually want to use
`python3.dll` for the dynamic linkage.
9) Add generated autoconf file
10) Add v:python3_version support
This variable indicates the version of Python3 that Vim was built
against (PY_VERSION_HEX), and will be useful to check whether the Python
library you are loading in dynamically actually fits it. When built with
stable ABI, it will be the limited ABI version instead
(`Py_LIMITED_API`), which indicates the minimum version of Python 3 the
user should have, rather than the exact match. When stable ABI is used,
we won't be exposing PY_VERSION_HEX in this var because it just doesn't
seem necessary to do so (the whole point of stable ABI is the promise
that it will work across versions), and I don't want to confuse the user
with too many variables.
Also, cleaned up some documentation, and added help tags.
11) Fix Python 3.7 compat issues
Fix a couple issues when using limited API < 3.8
- Crash on exit: In Python 3.7, if a heap-allocated type is destroyed
before all instances are, it would cause a crash later. This happens
when we destroyed `OptionsType` before calling `Py_Finalize` when
using the limited API. To make it worse, later versions changed the
semantics and now each instance has a strong reference to its own type
and the recommendation has changed to have each instance de-ref its
own type and have its type in GC traversal. To avoid dealing with
these cross-version variations, we just don't free the heap type. They
are static types in non-limited-API anyway and are designed to last
through the entirety of the app, and we also don't restart the Python
runtime and therefore do not need it to have absolutely 0 leaks.
See:
- https://docs.python.org/3/whatsnew/3.8.html#changes-in-the-c-api
- https://docs.python.org/3/whatsnew/3.9.html#changes-in-the-c-api
- PyIter_Check: This function is not provided in limited APIs older than
3.8. Previously I was trying to mock it out using manual
PyType_GetSlot() but it was brittle and also does not actually work
properly for static types (it will generate a Python error). Just
return false. It does mean using limited API < 3.8 is not recommended
as you lose the functionality to handle iterators, but from playing
with plugins I couldn't find it to be an issue.
- Fix loading of PyIter_Check so it will be done when limited API < 3.8.
Otherwise loading a 3.7 Python lib will fail even if limited API was
specified to use it.
12) Make sure to only load `PyUnicode_AsUTF8AndSize` in needed in limited API
We don't use this function unless limited API >= 3.10, but we were
loading it regardless. Usually it's ok in Unix-like systems where Python
just has a single lib that we load from, but in Windows where there is a
separate python3.dll this would not work as the symbol would not have
been exposed in this more limited DLL file. This makes it much clearer
under what condition is this function needed.
closes: #12032
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 20 Aug 2023 21:30:04 +0200 |
| parents | 9c221ad9634a |
| children |
| rev | line source |
|---|---|
| 15194 | 1 " Vim indent file |
| 2 " Language: MATLAB | |
| 3 " Maintainer: Axel Forsman <axelsfor@gmail.com> | |
| 4 " Previous maintainer: Christophe Poucet <christophe.poucet@pandora.be> | |
| 25880 | 5 " Last Update: 2021-10-01 |
| 7 | 6 |
| 15194 | 7 " Only load if no other indent file is loaded |
| 8 if exists('b:did_indent') | finish | endif | |
| 7 | 9 let b:did_indent = 1 |
| 10 | |
| 15194 | 11 setlocal indentexpr=GetMatlabIndent() |
| 12 setlocal indentkeys=!,o,O,e,0=end,0=elseif,0=case,0=otherwise,0=catch,0=function,0=elsei | |
| 25880 | 13 let b:undo_indent = "setlocal indentexpr< indentkeys<" |
| 7 | 14 |
| 15194 | 15 " The value of the Function indenting format in |
| 16 " MATLAB Editor/Debugger Language Preferences. | |
| 17 " The possible values are 0 for Classic, 1 for Indent nested functions | |
| 18 " and 2 for Indent all functions (default). | |
| 19 let b:MATLAB_function_indent = get(g:, 'MATLAB_function_indent', 2) | |
| 20 " The previous value of b:changedtick | |
| 21 let b:MATLAB_lasttick = -1 | |
| 22 " The previously indented line | |
| 23 let b:MATLAB_lastline = -1 | |
| 24 " Whether the line above was a line continuation | |
| 25 let b:MATLAB_waslc = 0 | |
| 26 let b:MATLAB_bracketlevel = 0 | |
| 7 | 27 |
| 15194 | 28 " Only define the function once |
| 29 if exists("*GetMatlabIndent") | finish | endif | |
| 7 | 30 |
| 15194 | 31 let s:keepcpo = &cpo |
| 32 set cpo&vim | |
| 7 | 33 |
| 18848 | 34 let s:end = '\<end\>\%([^({]*[)}]\)\@!' " Array indexing heuristic |
| 15194 | 35 let s:open_pat = 'for\|if\|parfor\|spmd\|switch\|try\|while\|classdef\|properties\|methods\|events\|enumeration' |
| 36 let s:dedent_pat = '\C^\s*\zs\<\%(end\|else\|elseif\|catch\|\(case\|otherwise\|function\)\)\>' | |
| 37 let s:start_pat = '\C\<\%(function\|' . s:open_pat . '\)\>' | |
| 38 let s:bracket_pair_pat = '\(\[\|{\)\|\(\]\|}\)' | |
| 39 let s:zflag = has('patch-7.4.984') ? 'z' : '' | |
| 40 | |
| 41 " Returns whether a comment or string envelops the specified column. | |
| 42 function! s:IsCommentOrString(lnum, col) | |
| 18848 | 43 return synIDattr(synID(a:lnum, a:col, 1), "name") =~# 'matlabComment\|matlabMultilineComment\|matlabCellComment\|matlabString' |
| 15194 | 44 endfunction |
| 7 | 45 |
| 15194 | 46 " Returns whether the specified line continues on the next line. |
| 47 function! s:IsLineContinuation(lnum) | |
| 48 let l = getline(a:lnum) | let c = -3 | |
| 49 while 1 | |
| 50 let c = match(l, '\.\{3}', c + 3) | |
| 51 if c == -1 | return 0 | |
| 52 elseif !s:IsCommentOrString(a:lnum, c) | return 1 | endif | |
| 53 endwhile | |
| 54 endfunction | |
| 7 | 55 |
| 15194 | 56 function! s:SubmatchCount(lnum, pattern, ...) |
| 57 let endcol = a:0 >= 1 ? a:1 : 1 / 0 | let x = [0, 0, 0, 0] | |
| 58 call cursor(a:lnum, 1) | |
| 59 while 1 | |
| 60 let [lnum, c, submatch] = searchpos(a:pattern, 'cpe' . s:zflag, a:lnum) | |
| 61 if !submatch || c >= endcol | break | endif | |
| 62 if !s:IsCommentOrString(lnum, c) | let x[submatch - 2] += 1 | endif | |
| 63 if cursor(0, c + 1) == -1 || col('.') == c | break | endif | |
| 64 endwhile | |
| 65 return x | |
| 7 | 66 endfunction |
| 67 | |
| 15194 | 68 function! s:GetOpenCloseCount(lnum, pattern, ...) |
| 69 let counts = call('s:SubmatchCount', [a:lnum, a:pattern] + a:000) | |
| 70 return counts[0] - counts[1] | |
| 71 endfunction | |
| 72 | |
| 73 function! GetMatlabIndent() | |
| 74 let prevlnum = prevnonblank(v:lnum - 1) | |
| 75 | |
| 76 if b:MATLAB_lasttick != b:changedtick || b:MATLAB_lastline != prevlnum | |
| 77 " Recalculate bracket count (only have to check same block and line above) | |
| 78 let b:MATLAB_bracketlevel = 0 | |
| 79 let previndent = indent(prevlnum) | let l = prevlnum | |
| 80 while 1 | |
| 81 let l = prevnonblank(l - 1) | let indent = indent(l) | |
| 82 if l <= 0 || previndent < indent | break | endif | |
| 83 let b:MATLAB_bracketlevel += s:GetOpenCloseCount(l, s:bracket_pair_pat) | |
| 84 if previndent != indent | break | endif | |
| 85 endwhile | |
| 86 | |
| 87 let b:MATLAB_waslc = s:IsLineContinuation(prevlnum - 1) | |
| 88 endif | |
| 89 " If line above was blank it can impossibly have been a LC | |
| 90 let above_lc = b:MATLAB_lasttick == b:changedtick && prevlnum != v:lnum - 1 && b:MATLAB_lastline == prevlnum ? 0 : s:IsLineContinuation(v:lnum - 1) | |
| 91 | |
| 92 let pair_pat = '\C\<\(' . s:open_pat . '\|' | |
| 93 \ . (b:MATLAB_function_indent == 1 ? '^\@<!' : '') | |
| 94 \ . (b:MATLAB_function_indent >= 1 ? 'function\|' : '') | |
| 95 \ . '\|\%(^\s*\)\@<=\%(else\|elseif\|case\|otherwise\|catch\)\)\>' | |
| 96 \ . '\|\S\s*\zs\(' . s:end . '\)' | |
| 97 let [open, close, b_open, b_close] = prevlnum ? s:SubmatchCount(prevlnum, | |
| 98 \ pair_pat . '\|' . s:bracket_pair_pat) : [0, 0, 0, 0] | |
| 99 let curbracketlevel = b:MATLAB_bracketlevel + b_open - b_close | |
| 100 | |
| 101 call cursor(v:lnum, 1) | |
| 102 let submatch = search(s:dedent_pat, 'cp' . s:zflag, v:lnum) | |
| 103 if submatch && !s:IsCommentOrString(v:lnum, col('.')) | |
| 104 " Align end, et cetera with start of block | |
| 105 let [lnum, col] = searchpairpos(s:start_pat, '', '\C' . s:end, 'bW', 's:IsCommentOrString(line("."), col("."))') | |
| 106 let result = lnum ? indent(lnum) + shiftwidth() * (s:GetOpenCloseCount(lnum, pair_pat, col) + submatch == 2) : 0 | |
| 107 else | |
| 108 " Count how many blocks the previous line opens/closes | |
| 109 " Line continuations/brackets indent once per statement | |
| 18848 | 110 let result = (prevlnum > 0) * indent(prevlnum) + shiftwidth() * (open - close |
| 15194 | 111 \ + (b:MATLAB_bracketlevel ? -!curbracketlevel : !!curbracketlevel) |
| 112 \ + (curbracketlevel <= 0) * (above_lc - b:MATLAB_waslc)) | |
| 113 endif | |
| 114 | |
| 115 let b:MATLAB_waslc = above_lc | |
| 116 let b:MATLAB_bracketlevel = curbracketlevel | |
| 117 let b:MATLAB_lasttick = b:changedtick | |
| 118 let b:MATLAB_lastline = v:lnum | |
| 119 return result | |
| 120 endfunction | |
| 121 | |
| 122 let &cpo = s:keepcpo | |
| 123 unlet s:keepcpo |