[vim/vim] Revamp `make proto` (PR #18045)
h_east
Instead of cproto, use clang.cindex from Python to create prototype declaration files (.pro) from source code.
I'm working on Ubuntu 24.04.
$ sudo apt-get update $ sudo apt-get install -y python3 python3-pip clang libclang-dev python3-clang
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/18045
Commit Summary
- c81eed3 Revamp `make proto`
- 0bef846 Add src/proto/gen_prototypes.py
- bac2a88 tweak around proto
- 9e3fedb tweak around proto
- ed0df52 tweak around proto
- 7a5188c tweak arounf proto
- 7806c05 tweak around proto
- f916ead Make array parameters print as `name[]` (e.g., `char *dirnames[]`) instead of `char *[]name`.
- ace6c5d - Top-level variadic: when the function type is variadic, change void → `...` or append `, ...`.
- 141ba6d show libclang diagnostics to stderr for easier troubleshooting, when env GENPROTO_SHOW_DIAGS is true.
- de34b92 - Respect argument types as defined.
File Changes
(19 files)
- M Filelist (1)
- M src/Makefile (78)
- M src/cmdexpand.c (4)
- M src/indent.c (2)
- M src/locale.c (2)
- M src/macros.h (2)
- M src/option.c (6)
- M src/optionstr.c (2)
- M src/os_unix.c (4)
- M src/os_win32.c (2)
- M src/proto/cmdexpand.pro (4)
- A src/proto/gen_prototypes.py (253)
- M src/proto/gui_gtk_x11.pro (2)
- M src/proto/if_python.pro (2)
- M src/proto/if_python3.pro (2)
- M src/protodef.h (14)
- M src/testing.c (4)
- M src/vim.h (8)
- M src/window.c (2)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
h_east
h-east left a comment (vim/vim#18045)@chrisbra and Vim members,
What do you think of this approach?
Although make proto depends on python and clang, I think it's better than continuing to use cproto.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
h_east
@h-east pushed 11 commits.
- 3c6de13 Revamp `make proto`
- e5f6433 Add src/proto/gen_prototypes.py
- 95cd8e2 tweak around proto
- 1ce7324 tweak around proto
- f6010c6 tweak around proto
- 8d72718 tweak arounf proto
- 6f1bab1 tweak around proto
- 20f4a28 Make array parameters print as `name[]` (e.g., `char *dirnames[]`) instead of `char *[]name`.
- 84ccf02 - Top-level variadic: when the function type is variadic, change void → `...` or append `, ...`.
- 295acf7 show libclang diagnostics to stderr for easier troubleshooting, when env GENPROTO_SHOW_DIAGS is true.
- c479d4b - Respect argument types as defined.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
h_east
@h-east pushed 8 commits.
- eea2c35 tweak around proto
- beab6b5 tweak script around pointer
- a951150 tweak around proto
- 153a902 tweak around proto
- a8d6c66 tweak around proto
- 0dcac87 tweak around proto
- 3915f78 tweak around proto
- a4dd71b tweak around proto
You are receiving this because you are subscribed to this thread.
Yegappan Lakshmanan
@yegappan commented on this pull request.
In src/indent.c:
> @@ -474,7 +474,7 @@ get_indent_str(
return count;
}
-#ifdef FEAT_VARTABS
+#if defined(FEAT_VARTABS) || defined(PROTO)
One suggestion: it might be easier to track the changes later, if you can separate out the changes related to the "PROTO" checks into one PR and the changes for the new script into another PR.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
h_east
@h-east commented on this pull request.
In src/indent.c:
> @@ -474,7 +474,7 @@ get_indent_str(
return count;
}
-#ifdef FEAT_VARTABS
+#if defined(FEAT_VARTABS) || defined(PROTO)
Around the same time you commented, I submitted a PR implementing your suggestion 👍
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Yee Cheng Chin
ychin left a comment (vim/vim#18045)Does this work in all platforms? And does it still require us to do all the typedef's in say os_mswin.c (e.g. typedef int BOOL;) or the declarations in struct.h (e.g. typedef long varnumber_T;).
If the answer is no, then I wonder what the point of switching to a separate Python script is?
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
h_east
h-east left a comment (vim/vim#18045)The answer is “Yes.” I’m still experimenting, but my goal is to get the same output in any environment where Python and Clang are available. It’s impossible to do this with a truly accurate parser, so I’m switching to an approach that detects “something like a function definition” and then generates its prototype declaration as-is.
If this works, we won’t need the PROTO definitions themselves nor the hacky consistency-forcing code for cproto that you mentioned.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
h_east
@h-east pushed 9 commits.
- c0ff97c Revamp `make proto`
- 4bb8af1 Add src/proto/gen_prototypes.py
- 104e29b Make array parameters print as `name[]` (e.g., `char *dirnames[]`) instead of `char *[]name`.
- dbb93ff - Top-level variadic: when the function type is variadic, change void → `...` or append `, ...`.
- 18239d4 show libclang diagnostics to stderr for easier troubleshooting, when env GENPROTO_SHOW_DIAGS is true.
- d77ff3d - Respect argument types as defined.
- 40881fc tweak script around pointer
- f2ffcf4 fix makefile
- 3863053 Switching to an approach that detects "something like a function definition" and then generates its prototype declaration as-is.
You are receiving this because you are subscribed to this thread.
h_east
@h-east pushed 4 commits.
You are receiving this because you are subscribed to this thread.
h_east
h_east
@h-east pushed 2 commits.
You are receiving this because you are subscribed to this thread.
