[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 4866ad53cf 5/6: REFACTOR: Simplify and deduplic
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/sweeprolog 4866ad53cf 5/6: REFACTOR: Simplify and deduplicate code all around |
|
Date: |
Mon, 7 Nov 2022 05:59:26 -0500 (EST) |
branch: elpa/sweeprolog
commit 4866ad53cf46c1e819a187f24a097ef0d06deb74
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
REFACTOR: Simplify and deduplicate code all around
* sweeprolog.el (sweeprolog-colourise-*): rename to sweeprolog-analyze-*
---
NEWS.org | 14 +
README.org | 16 +-
sweep.pl | 381 ++++++-----------------
sweeprolog-tests.el | 71 ++++-
sweeprolog.el | 850 +++++++++++++++++++++++-----------------------------
5 files changed, 570 insertions(+), 762 deletions(-)
diff --git a/NEWS.org b/NEWS.org
index 083e234b1f..1d197a25a7 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -11,6 +11,20 @@ SWI-Prolog in Emacs.
For further details, please consult the manual:
<https://eshelyaron.com/sweep.html>.
+* Version 0.8.2 on 2022-11-07
+
+** Renamed ~sweeprolog-colourise-*~ to ~sweeprolog-analyze-*~
+
+The following user options and commands have been renamed to better
+convey their meaning:
+
+| Old symbol name | New symbol name
|
+|------------------------------------------+----------------------------------------|
+| ~sweeprolog-colourise-buffer~ | ~sweeprolog-analyze-buffer~
|
+| ~sweeprolog-colourise-buffer-on-idle~ |
~sweeprolog-analyze-buffer-on-idle~ |
+| ~sweeprolog-colourise-buffer-max-size~ |
~sweeprolog-analyze-buffer-max-size~ |
+| ~sweeprolog-colourise-buffer-min-interval~ |
~sweeprolog-analyze-buffer-min-interval~ |
+
* Version 0.8.1 on 2022-10-25
** Added completion-at-point for variable names
diff --git a/README.org b/README.org
index a3397c352c..7868bf1cf1 100644
--- a/README.org
+++ b/README.org
@@ -448,25 +448,25 @@ invoked to updated the semantic highlighting in response
to changes in
the buffer.
#+KINDEX: C-c C-c (sweeprolog-mode)
-#+FINDEX: sweeprolog-colourise-buffer
+#+FINDEX: sweeprolog-analyze-buffer
At any point in a =sweeprolog-mode= buffer, the command =C-c C-c= (or =M-x
-sweeprolog-colourise-buffer=) can be used to update the cross reference
+sweeprolog-analyze-buffer=) can be used to update the cross reference
cache and highlight the buffer accordingly. When ~flymake~ integration
is enabled, this command also updates the diagnostics for the current
buffer (see [[*Examining diagnostics][Examining diagnostics]]). This may be
useful e.g. after
defining a new predicate.
-#+VINDEX: sweeprolog-colourise-buffer-on-idle
-#+VINDEX: sweeprolog-colourise-buffer-max-size
-#+VINDEX: sweeprolog-colourise-buffer-min-interval
-If the user option =sweeprolog-colourise-buffer-on-idle= is set to non-nil
+#+VINDEX: sweeprolog-analyze-buffer-on-idle
+#+VINDEX: sweeprolog-analyze-buffer-max-size
+#+VINDEX: sweeprolog-analyze-buffer-min-interval
+If the user option =sweeprolog-analyze-buffer-on-idle= is set to non-nil
(as it is by default), =sweeprolog-mode= also updates semantic highlighting
in the buffer whenever Emacs is idle for a reasonable amount of time,
unless the buffer is larger than the value of the
-=sweeprolog-colourise-buffer-max-size= user option ( 100,000 by default).
+=sweeprolog-analyze-buffer-max-size= user option ( 100,000 by default).
The minimum idle time to wait before automatically updating semantic
highlighting can be set via the user option
-=sweeprolog-colourise-buffer-min-interval=.
+=sweeprolog-analyze-buffer-min-interval=.
#+CINDEX: sweeprolog-faces
=sweep= defines three highlighting /styles/, each containing more than 60
diff --git a/sweep.pl b/sweep.pl
index 525ab6e178..c5dfd37f4e 100644
--- a/sweep.pl
+++ b/sweep.pl
@@ -31,15 +31,10 @@
*/
:- module(sweep,
- [ sweep_colourise_buffer/2,
- sweep_colourise_some_terms/2,
- sweep_setup_message_hook/2,
+ [ sweep_setup_message_hook/2,
sweep_current_prolog_flags/2,
sweep_set_prolog_flag/2,
sweep_documentation/2,
- sweep_definition_at_point/2,
- sweep_file_at_point/2,
- sweep_identifier_at_point/2,
sweep_expand_file_name/2,
sweep_path_module/2,
sweep_load_buffer/2,
@@ -49,10 +44,10 @@
sweep_predicate_apropos/2,
sweep_predicates_collection/2,
sweep_local_predicate_completion/2,
+ sweep_functor_arity_pi/2,
sweep_modules_collection/2,
sweep_packs_collection/2,
sweep_pack_install/2,
- sweep_prefix_ops/2,
sweep_op_info/2,
sweep_imenu_index/2,
sweep_module_path/2,
@@ -64,7 +59,9 @@
write_sweep_module_location/0,
sweep_module_html_documentation/2,
sweep_predicate_html_documentation/2,
- sweep_predicate_properties/2
+ sweep_predicate_properties/2,
+ sweep_analyze_region/2,
+ sweep_xref_source/2
]).
:- use_module(library(pldoc)).
@@ -88,10 +85,8 @@
:- meta_predicate with_buffer_stream(-, +, 0).
-:- dynamic sweep_current_color/3,
- sweep_open/2,
- sweep_top_level_thread_buffer/2,
- sweep_source_time/2,
+:- dynamic sweep_top_level_thread_buffer/2,
+ sweep_open_buffer/3,
sweep_current_comment/3.
:- multifile prolog:xref_source_time/2,
@@ -99,16 +94,34 @@
prolog:xref_close_source/2,
prolog:quasi_quotation_syntax/2.
-prolog:quasi_quotation_syntax(graphql, library(http/graphql)).
+:- thread_local sweep_main_thread/0.
-prolog:xref_source_time(Source, Time) :-
- sweep_source_time(Source, Time).
+prolog:quasi_quotation_syntax(graphql, library(http/graphql)).
-prolog:xref_open_source(Source, Stream) :-
- sweep_open(Source, Stream).
+prolog:xref_source_time(Source0, Time) :-
+ sweep_main_thread,
+ atom_string(Source0, Source),
+ user:sweep_funcall("sweeprolog--buffer-last-modified-time",
+ Source, Time),
+ Time \== [].
+
+prolog:xref_open_source(Source0, Stream) :-
+ sweep_main_thread,
+ atom_string(Source0, Source),
+ user:sweep_funcall("sweeprolog--buffer-string",
+ Source, String),
+ String \== [],
+ new_memory_file(H),
+ insert_memory_file(H, 0, String),
+ open_memory_file(H, read, Stream, [encoding(utf8)]),
+ set_stream(Stream, encoding(utf8)),
+ set_stream(Stream, file_name(Source)),
+ asserta(sweep_open_buffer(Source0, Stream, H)).
prolog:xref_close_source(Source, Stream) :-
- sweep_open(Source, Stream).
+ retract(sweep_open_buffer(Source, Stream, H)),
+ close(Stream),
+ free_memory_file(H).
sweep_top_level_threads(_, Ts) :-
findall([Id, Buffer, Status, Stack, CPUTime],
@@ -133,257 +146,42 @@ sweep_set_prolog_flag([Flag0|Value0], []) :-
term_string(Value, Value0),
set_prolog_flag(Flag, Value).
-sweep_colourise_buffer([String|Path], Colors) :-
- setup_call_cleanup(( new_memory_file(H),
- insert_memory_file(H, 0, String),
- open_memory_file(H, read, Contents, [encoding(utf8)])
- ),
- sweep_colourise_buffer_(Path, Contents, Colors),
- ( close(Contents),
- free_memory_file(H)
- )).
-
-sweep_colourise_buffer_(Path0, Contents, []) :-
+sweep_xref_source(Path0, _) :-
atom_string(Path, Path0),
- set_stream(Contents, encoding(utf8)),
- set_stream(Contents, file_name(Path)),
- get_time(Time),
- asserta(sweep_source_time(Path, Time), Ref1),
- asserta(sweep_open(Path, Contents), Ref0),
- xref_source(Path, [comments(store)]),
- seek(Contents, 0, bof, _),
- retractall(sweep_current_comment(_, _, _)),
- prolog_colourise_stream(Contents,
- Path,
- sweep_handle_color(1)),
- forall(sweep_current_comment(Kind, Start, Len),
- ( atom_string(Kind, String),
- user:sweep_funcall("sweeprolog--colourise",
[Start,Len,"comment"|String], _)
- )),
- erase(Ref0),
- erase(Ref1).
+ xref_source(Path, [comments(store)]).
-sweep_definition_at_point([Contents|Path0], Result) :-
+sweep_analyze_region([OneTerm,Offset,Contents,Path0], Result) :-
atom_string(Path, Path0),
with_buffer_stream(Stream,
Contents,
- sweep_definition_at_point_(Stream, Path, Result)).
+ sweep_analyze_region_(OneTerm, Offset, Stream, Path,
Result)).
-:- dynamic sweep_current_defintion_at_point/1.
-
-sweep_definition_at_point_(Stream, Path, [Beg,F,N]) :-
+sweep_analyze_region_(OneTerm, Offset, Stream, Path, _) :-
set_stream(Stream, file_name(Path)),
- retractall(sweep_current_defintion_at_point(_)),
- prolog_colourise_term(Stream, Path,
- sweep_handle_definition_at_point,
- []),
- sweep_current_defintion_at_point(Beg-Def),
- ( Def = M:F0/N
- -> term_string(M:F0, F)
- ; Def = F0/N,
- term_string(F0, F)
- ).
-
-sweep_handle_definition_at_point(head_term(_Kind, Goal), Beg, _Len) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_defintion_at_point(Beg-PI)).
-sweep_handle_definition_at_point(_, _, _).
-
-
-sweep_file_at_point([Contents,Path0,Point], Result) :-
- atom_string(Path, Path0),
- with_buffer_stream(Stream,
- Contents,
- sweep_file_at_point_(Stream, Path, Point, Result)).
-
-:- dynamic sweep_current_file_at_point/1.
-
-sweep_file_at_point_(Stream, Path, Point, File) :-
- set_stream(Stream, file_name(Path)),
- retractall(sweep_current_file_at_point(_)),
- prolog_colourise_term(Stream, Path,
- sweep_handle_file_at_point(Point),
- []),
- sweep_current_file_at_point(File0),
- atom_string(File0, File).
-
-sweep_handle_file_at_point(Point, file_no_depend(File), Beg, Len) :-
- Beg =< Point,
- Point =< Beg + Len,
- !,
- asserta(sweep_current_file_at_point(File)).
-sweep_handle_file_at_point(Point, file(File), Beg, Len) :-
- Beg =< Point,
- Point =< Beg + Len,
- !,
- asserta(sweep_current_file_at_point(File)).
-sweep_handle_file_at_point(_, _, _, _).
-
-
-sweep_identifier_at_point([Contents0, Path, Point], Identifier) :-
- setup_call_cleanup(( new_memory_file(H),
- insert_memory_file(H, 0, Contents0),
- open_memory_file(H, read, Contents, [encoding(utf8)])
- ),
- sweep_identifier_at_point_(Path, Point, Contents,
Identifier),
- ( close(Contents),
- free_memory_file(H)
- )).
-
-:- dynamic sweep_current_identifier_at_point/1.
-
-sweep_identifier_at_point_(Path0, Point, Contents, Identifier) :-
- atom_string(Path, Path0),
- ( xref_module(Path, M)
- -> true
- ; M = user
- ),
- set_stream(Contents, encoding(utf8)),
- set_stream(Contents, file_name(Path)),
- seek(Contents, 0, bof, _),
- retractall(sweep_current_identifier_at_point(_)),
- prolog_colourise_term(Contents, Path,
- sweep_handle_identifier_at_point(Path, M, Point),
- []),
- !,
- sweep_current_identifier_at_point(Identifier0),
- term_string(Identifier0, Identifier).
-
-
-sweep_handle_identifier_at_point(Path, M, Point, Col, Beg, Len) :-
- Beg =< Point,
- Point =< Beg + Len,
- !,
- sweep_handle_identifier_at_point_(Path, M, Col).
-sweep_handle_identifier_at_point(_, _, _, _, _, _).
-
-sweep_handle_identifier_at_point_(Path, M0, goal_term(Kind, Goal)) :-
- !,
- sweep_handle_identifier_at_point_goal(Path, M0, Kind, Goal).
-sweep_handle_identifier_at_point_(Path, M0, goal(Kind, Goal)) :-
- !,
- sweep_handle_identifier_at_point_goal(Path, M0, Kind, Goal).
-sweep_handle_identifier_at_point_(_Path, M0, head_term(_Kind, Goal)) :-
- !,
- sweep_handle_identifier_at_point_head(M0, Goal).
-sweep_handle_identifier_at_point_(_, _, _).
-
-
-sweep_handle_identifier_at_point_head(_, M:Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_head(M, Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-
-sweep_handle_identifier_at_point_goal(_Path, M, local(_), Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M, recursion, M:Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, M, recursion, Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, built_in, Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, imported(Path), Goal) :-
- !,
- pi_head(PI, Goal),
- xref_source(Path, [comments(store)]),
- xref_module(Path, M),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, Extern, Goal) :-
- sweep_is_extern(Extern, M),
- !,
- pi_head(PI, Goal),
- ( var(M)
- -> asserta(sweep_current_identifier_at_point(PI))
- ; asserta(sweep_current_identifier_at_point(M:PI))
- ).
-sweep_handle_identifier_at_point_goal(_Path, _M0, autoload(Path), Goal) :-
- !,
- pi_head(PI, Goal),
- ( '$autoload':library_index(Goal, M, Path)
- -> true
- ; file_name_extension(Base, _, Path), '$autoload':library_index(Goal, M,
Base)
- ),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, Global, Goal) :-
- sweep_is_global(Global),
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(user:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, undefined, M:Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(M:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, undefined, Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, meta, _:Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(meta:PI)).
-sweep_handle_identifier_at_point_goal(_Path, _M0, meta, Goal) :-
- !,
- pi_head(PI, Goal),
- asserta(sweep_current_identifier_at_point(meta:PI)).
-sweep_handle_identifier_at_point_goal(Path, M0, _Kind, Goal) :-
- pi_head(PI0, Goal),
- ( PI0 = M:PI
- -> true
- ; xref_defined(Path, Goal, imported(Other)), xref_module(Other, M)
- -> PI = PI0
- ; predicate_property(M0:Goal, imported_from(M))
- -> PI = PI0
- ; '$autoload':library_index(Goal, M, _)
- -> PI = PI0
- ; M = M0, PI = PI0
- ),
- asserta(sweep_current_identifier_at_point(M:PI)).
-
-sweep_is_global(global).
-sweep_is_global(global(_,_)).
-
-sweep_is_extern(extern(M), M).
-sweep_is_extern(extern(M,_), M).
-
-sweep_colourise_some_terms([String,Path,Offset], Colors) :-
- setup_call_cleanup(( new_memory_file(H),
- insert_memory_file(H, 0, String),
- open_memory_file(H, read, Contents, [encoding(utf8)])
- ),
- sweep_colourise_some_terms_(Path, Offset, Contents,
Colors),
- ( close(Contents),
- free_memory_file(H)
- )).
-
-sweep_colourise_some_terms_(Path0, Offset, Contents, []) :-
- atom_string(Path, Path0),
- set_stream(Contents, encoding(utf8)),
- set_stream(Contents, file_name(Path)),
- seek(Contents, 0, bof, _),
- findall(Op, xref_op(Path, Op), Ops),
retractall(sweep_current_comment(_, _, _)),
- prolog_colourise_stream(Contents,
- Path,
- sweep_handle_color(Offset),
- [operators(Ops)]),
+ ( OneTerm == []
+ -> prolog_colourise_stream(Stream, Path,
+ sweep_handle_fragment(Offset))
+ ; prolog_colourise_term(Stream, Path,
+ sweep_handle_fragment(Offset), [])),
forall(sweep_current_comment(Kind, Start, Len),
( atom_string(Kind, String),
- user:sweep_funcall("sweeprolog--colourise",
[Start,Len,"comment"|String], _)
+ user:sweep_funcall("sweeprolog-analyze-fragment",
+ [Start,Len,"comment"|String], _)
)).
+sweep_handle_fragment(Offset, comment(Kind), Beg, Len) :-
+ !,
+ Start is Beg + Offset,
+ asserta(sweep_current_comment(Kind, Start, Len)).
+sweep_handle_fragment(Offset, Col, Beg, Len) :-
+ sweep_handle_fragment_(Offset, Col, Beg, Len).
+
+sweep_handle_fragment_(Offset, Col, Beg, Len) :-
+ sweep_color_normalized(Offset, Col, Nom),
+ Start is Beg + Offset,
+ user:sweep_funcall("sweeprolog-analyze-fragment", [Start,Len|Nom], _).
+
sweep_documentation(PI0, Docs) :-
term_string(PI1, PI0),
( PI1 = M:PI
@@ -442,7 +240,7 @@ sweep_module_path_(Module, Path) :-
sweep_module_path_(Module, Path) :-
xref_module(Path, Module), !.
sweep_module_path_(Module, Path) :-
- '$autoload':library_index(_, Module, Path0), !, string_concat(Path0,
".pl", Path).
+ '$autoload':library_index(_, Module, Path0), atom_concat(Path0, '.pl',
Path).
sweep_predicate_properties(P0, Props) :-
term_string(P, P0),
@@ -569,8 +367,8 @@ sweep_predicate_location_(M, H, Path, Line) :-
; Line = []
).
-sweep_local_predicate_completion([Mod|Sub], Preds) :-
- atom_string(M, Mod),
+sweep_local_predicate_completion(Sub, Preds) :-
+ sweep_current_module(M),
findall(F/N,
@(current_predicate(F/N), M),
Preds0,
@@ -694,20 +492,8 @@ sweep_pack_info(pack(Name0, _, Desc0, Version0, URLS0),
[Name, Desc, Version, UR
sweep_pack_install(PackName, []) :-
atom_string(Pack, PackName), pack_install(Pack, [silent(true),
upgrade(true), interactive(false)]).
-sweep_handle_color(Offset, comment(Kind), Beg, Len) :-
- !,
- Start is Beg + Offset,
- asserta(sweep_current_comment(Kind, Start, Len)).
-sweep_handle_color(Offset, Col, Beg, Len) :-
- sweep_handle_query_color(Offset, Col, Beg, Len).
-
sweep_colourise_query([String|Offset], _) :-
- prolog_colourise_query(String, module(sweep),
sweep_handle_query_color(Offset)).
-
-sweep_handle_query_color(Offset, Col, Beg, Len) :-
- sweep_color_normalized(Offset, Col, Nom),
- Start is Beg + Offset,
- user:sweep_funcall("sweeprolog--colourise", [Start,Len|Nom], _).
+ prolog_colourise_query(String, module(sweep),
sweep_handle_fragment_(Offset)).
sweep_color_normalized(Offset, Col, Nom) :-
Col =.. [Nom0|Rest],
@@ -718,8 +504,11 @@ sweep_color_normalized_(_, Goal0, [Kind0,Head|_],
[Goal,Kind,F,N]) :-
!,
atom_string(Goal0, Goal),
term_string(Kind0, Kind),
- pi_head(F0/N, Head),
- atom_string(F0, F).
+ ( var(Head)
+ -> F = Head, N = 0
+ ; pi_head(F0/N, Head),
+ atom_string(F0, F)
+ ).
sweep_color_normalized_(Offset, syntax_error, [Message0,Start0-End0|_],
["syntax_error", Message, Start, End]) :-
!,
Start is Start0 + Offset,
@@ -731,6 +520,12 @@ sweep_color_normalized_(_, comment, [Kind0|_],
["comment"|Kind]) :-
sweep_color_normalized_(_, qq_content, [Type0|_], ["qq_content"|Type]) :-
!,
atom_string(Type0, Type).
+sweep_color_normalized_(_, file, [File0|_], ["file"|File]) :-
+ !,
+ atom_string(File0, File).
+sweep_color_normalized_(_, file_no_depend, [File0|_], ["file_no_depend"|File])
:-
+ !,
+ atom_string(File0, File).
sweep_color_normalized_(_, Nom0, _, Nom) :-
atom_string(Nom0, Nom).
@@ -767,6 +562,7 @@ sweep_path_module(Path0, Module) :-
sweep_setup_message_hook(_, _) :-
+ asserta(sweep_main_thread),
asserta((
user:thread_message_hook(Term, Kind, Lines) :-
sweep_message_hook(Term, Kind, Lines)
@@ -785,15 +581,6 @@ should_handle_message_kind(warning, "warning").
should_handle_message_kind(informational, "informational").
should_handle_message_kind(debug(Topic0), ["debug"|Topic]) :-
atom_string(Topic0, Topic).
-sweep_prefix_ops(Path0, Ops) :-
- atom_string(Path, Path0),
- findall(Op, current_op(_, fx, Op), Ops0, Tail0),
- findall(Op, current_op(_, fy, Op), Tail0, Tail1),
- findall(Op, xref_op(Path, op(_, fx, Op)), Tail1, Tail),
- findall(Op, xref_op(Path, op(_, fy, Op)), Tail),
- maplist(atom_string, Ops0, Ops1),
- list_to_set(Ops1, Ops).
-
sweep_op_info([Op0|Path0], Info) :-
atom_string(Path, Path0),
atom_string(Op, Op0),
@@ -812,7 +599,7 @@ sweep_load_buffer([String|Path0], Result) :-
String,
sweep_load_buffer_(Stream, Path, Result)).
-sweep_load_buffer_(Stream, Path, []) :-
+sweep_load_buffer_(Stream, Path, true) :-
set_stream(Stream, file_name(Path)),
@(load_files(Path, [stream(Stream)]), user).
@@ -941,3 +728,27 @@ sweep_local_predicate_export_comment([Path0,F0,A],Comm) :-
strip_det(Mode is _, Mode) :- !.
strip_det(//(Mode), Mode) :- !.
strip_det(Mode, Mode).
+
+sweep_functor_arity_pi([F0,A], PI) :-
+ !,
+ atom_string(F, F0),
+ pi_head(F/A, Head),
+ sweep_current_module(M0),
+ ( @(predicate_property(M:Head, visible), M0),
+ \+ @(predicate_property(M:Head, imported_from(_)), M0)
+ -> true
+ ; xref_defined(_, Head, imported(Other)), xref_module(Other, M)
+ -> true
+ ; M = M0
+ ),
+ term_string(M:F/A, PI).
+sweep_functor_arity_pi([M,F0,A], PI) :-
+ atom_string(F, F0), term_string(M:F/A, PI).
+
+sweep_current_module(Module) :-
+ sweep_main_thread,
+ user:sweep_funcall("buffer-file-name", String),
+ string(String),
+ atom_string(Path, String),
+ sweep_module_path_(Module, Path).
+sweep_current_module(user).
diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 4dbc0de137..16364e7dad 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -7,8 +7,8 @@
(defun sweeprolog-tests-greet ()
(sweeprolog--open-query "user" "user"
- "sweep_funcall"
- "sweeprolog-tests-greet-1")
+ "sweep_funcall"
+ "sweeprolog-tests-greet-1")
(let ((sol (sweeprolog-next-solution)))
(sweeprolog-cut-query)
(cdr sol)))
@@ -105,6 +105,73 @@ foo(Foo) :- bar.
'(sweeprolog-undefined-default-face
sweeprolog-clause-default-face)))))
+(ert-deftest export-predicate ()
+ "Test exporting a predicate."
+ (let ((temp (make-temp-file "sweeprolog-test"
+ nil
+ ".pl"
+ "
+:- module(sweeprolog_test_export_predicate, []).
+
+%! foo(+Bar) is det
+
+foo(Bar) :- bar(Bar).
+")))
+ (find-file-literally temp)
+ (sweeprolog-mode)
+ (goto-char (point-max))
+ (backward-word)
+ (call-interactively #'sweeprolog-export-predicate)
+ (should (equal (buffer-string)
+ "
+:- module(sweeprolog_test_export_predicate, [foo/1 % +Bar
+ ]).
+
+%! foo(+Bar) is det
+
+foo(Bar) :- bar(Bar).
+"))))
+
+(ert-deftest identifier-at-point ()
+ "Test recognizing predicate invocations."
+ (let ((temp (make-temp-file "sweeprolog-test"
+ nil
+ "pl"
+ "foo(Bar) :- bar(Bar).")))
+ (find-file-literally temp)
+ (sweeprolog-mode)
+ (goto-char (point-max))
+ (backward-word)
+ (should (equal (sweeprolog-identifier-at-point)
+ "user:bar/1"))))
+
+(ert-deftest definition-at-point ()
+ "Test recognizing predicate defintions."
+ (let ((temp (make-temp-file "sweeprolog-test"
+ nil
+ "pl"
+ "foo(Bar) :- bar(Bar).")))
+ (find-file-literally temp)
+ (sweeprolog-mode)
+ (goto-char (point-max))
+ (backward-word)
+ (should (equal (sweeprolog-definition-at-point)
+ '(1 "foo" 1)))))
+
+(ert-deftest file-at-point ()
+ "Test recognizing file specifications."
+ (let ((temp (make-temp-file "sweeprolog-test"
+ nil
+ "pl"
+ ":- use_module(library(lists)).")))
+ (find-file-literally temp)
+ (sweeprolog-mode)
+ (goto-char (point-max))
+ (backward-word)
+ (let ((fsap (sweeprolog-file-at-point)))
+ (should fsap)
+ (should (string= "lists" (file-name-base fsap))))))
+
(ert-deftest dwim-next-clause ()
"Tests inserting a new clause with `sweeprolog-insert-term-dwim'."
(with-temp-buffer
diff --git a/sweeprolog.el b/sweeprolog.el
index 9208b53e93..5b936bd65e 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -6,7 +6,7 @@
;; Maintainer: Eshel Yaron <~eshel/dev@lists.sr.ht>
;; Keywords: prolog languages extensions
;; URL: https://git.sr.ht/~eshel/sweep
-;; Package-Version: 0.8.1
+;; Package-Version: 0.8.2
;; Package-Requires: ((emacs "28.1"))
;; This file is NOT part of GNU Emacs.
@@ -158,24 +158,36 @@ This makes the first invocation of \\[cycle-spacing] in
:type 'boolean
:group 'sweeprolog)
-(defcustom sweeprolog-colourise-buffer-on-idle t
- "If non-nil, update highlighting of `sweeprolog-mode' buffers on idle."
- :package-version '((sweeprolog . "0.2.0"))
+(defcustom sweeprolog-analyze-buffer-on-idle t
+ "If non-nil, analyze `sweeprolog-mode' buffers on idle."
+ :package-version '((sweeprolog . "0.8.2"))
:type 'boolean
:group 'sweeprolog)
-(defcustom sweeprolog-colourise-buffer-max-size 100000
- "Maximum buffer size to recolourise on idle."
- :package-version '((sweeprolog . "0.2.0"))
+(make-obsolete-variable 'sweeprolog-colourise-buffer-on-idle
+ "Use `sweeprolog-analyze-buffer-on-idle' instead"
+ "sweeprolog version 0.8.2")
+
+(defcustom sweeprolog-analyze-buffer-max-size 100000
+ "Maximum buffer size to analyze on idle."
+ :package-version '((sweeprolog . "0.8.2"))
:type 'integer
:group 'sweeprolog)
-(defcustom sweeprolog-colourise-buffer-min-interval 2
- "Minimum idle time to wait before recolourising the buffer."
- :package-version '((sweeprolog . "0.2.0"))
+(make-obsolete-variable 'sweeprolog-colourise-buffer-max-size
+ "Use `sweeprolog-analyze-buffer-max-size' instead"
+ "sweeprolog version 0.8.2")
+
+(defcustom sweeprolog-analyze-buffer-min-interval 1.5
+ "Minimum idle time to wait before analyzing the buffer."
+ :package-version '((sweeprolog . "0.8.2"))
:type 'float
:group 'sweeprolog)
+(make-obsolete-variable 'sweeprolog-colourise-buffer-min-interval
+ "Use `sweeprolog-analyze-buffer-min-interval' instead"
+ "sweeprolog version 0.8.2")
+
(defcustom sweeprolog-swipl-path nil
"Path to the swipl executable.
When non-nil, this is used by the embedded SWI-Prolog runtime to
@@ -302,7 +314,7 @@ clause."
(defvar sweeprolog-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c C-l") #'sweeprolog-load-buffer)
- (define-key map (kbd "C-c C-c") #'sweeprolog-colourise-buffer)
+ (define-key map (kbd "C-c C-c") #'sweeprolog-analyze-buffer)
(define-key map (kbd "C-c C-t") #'sweeprolog-top-level)
(define-key map (kbd "C-c C-o") #'sweeprolog-find-file-at-point)
(define-key map (kbd "C-c C-d") #'sweeprolog-document-predicate-at-point)
@@ -402,8 +414,6 @@ clause."
;;;; Local variables
-(defvar-local sweeprolog-buffer-module "user")
-
(defvar-local sweeprolog--module-term nil)
(defvar-local sweeprolog--variable-at-point nil)
@@ -420,7 +430,7 @@ clause."
(defvar-local sweeprolog--timer nil)
-(defvar-local sweeprolog--colourise-buffer-duration 0.2)
+(defvar-local sweeprolog--analyze-buffer-duration 0.2)
(defvar-local sweeprolog--html-footnotes nil)
@@ -429,6 +439,10 @@ clause."
(defvar-local sweeprolog-top-level-thread-id nil
"Prolog top-level thread ID corresponding to this buffer.")
+(defvar-local sweeprolog--buffer-last-modified-time nil)
+
+(defvar-local sweeprolog--buffer-modified nil)
+
;;;; Declarations for functions defined in `sweep-module'
@@ -536,29 +550,28 @@ the order of the arguments is reversed."
(sweeprolog-ensure-initialized)
(sweeprolog-open-query ctx mod fun arg rev))
-(defun sweeprolog-start-prolog-server ()
- "Start the `sweep' Prolog top-level embedded server."
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_top_level_server"
- nil)
+(define-error 'prolog-exception "Prolog exception")
+
+(defun sweeprolog--query-once (mod pred arg &optional rev)
+ (sweeprolog--open-query "user" mod pred arg rev)
(let ((sol (sweeprolog-next-solution)))
(sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (setq sweeprolog-prolog-server-port (cdr sol)))))
+ (pcase sol
+ (`(exception . ,exception-term)
+ (signal 'prolog-exception exception-term))
+ (`(,_ . ,result) result))))
+
+(defun sweeprolog-start-prolog-server ()
+ "Start the `sweep' Prolog top-level embedded server."
+ (setq sweeprolog-prolog-server-port
+ (sweeprolog--query-once "sweep" "sweep_top_level_server" nil)))
(defun sweeprolog-setup-message-hook ()
"Setup `thread_message_hook/3' to redirecet Prolog messages."
(with-current-buffer (get-buffer-create sweeprolog-messages-buffer-name)
(setq-local window-point-insertion-type t)
(compilation-minor-mode 1))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_setup_message_hook"
- nil)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- sol))
+ (sweeprolog--query-once "sweep" "sweep_setup_message_hook" nil))
;;;; Prolog messages
@@ -645,11 +658,7 @@ the order of the arguments is reversed."
(defun sweeprolog-current-prolog-flags (&optional prefix)
"Return the list of defined Prolog flags defined with prefix PREFIX."
- (sweeprolog--open-query "user" "sweep" "sweep_current_prolog_flags" (or
prefix ""))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_current_prolog_flags" (or prefix "")))
(defun sweeprolog-read-prolog-flag ()
"Read a Prolog flag from the minibuffer, with completion."
@@ -670,51 +679,33 @@ the order of the arguments is reversed."
FLAG and VALUE are specified as strings and read as Prolog terms."
(interactive (let ((f (sweeprolog-read-prolog-flag)))
(list f (read-string (concat "Set " f " to: ")))))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_set_prolog_flag"
- (cons flag value))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (if (sweeprolog-true-p sol)
- (message "Prolog flag %s set to %s" flag value)
- (user-error "Setting %s to %s failed!" flag value))))
+ (if (sweeprolog--query-once "sweep" "sweep_set_prolog_flag" (cons flag
value))
+ (message "Prolog flag %s set to %s" flag value)
+ (user-error "Setting %s to %s failed!" flag value)))
;;;; Predicates
(defun sweeprolog-predicates-collection (&optional prefix)
"Return a list of prediacte completion candidates matchitng PREFIX."
- (sweeprolog--open-query "user" "sweep" "sweep_predicates_collection" prefix)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_predicates_collection" prefix))
(defun sweeprolog-predicate-references (mfn)
"Find source locations where the predicate MFN is called."
- (sweeprolog--open-query "user" "sweep" "sweep_predicate_references" mfn)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_predicate_references" mfn))
(defun sweeprolog--mfn-to-functor-arity (mfn)
- (sweeprolog--open-query "user" "system" "term_string" mfn t)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (pcase (cdr sol)
- (`(compound ":"
- (atom . ,_)
- (compound "/"
- (atom . ,functor)
- ,arity))
- (cons functor arity))
- (`(compound "/"
- (atom . ,functor)
- ,arity)
- (cons functor arity))))))
+ (pcase (sweeprolog--query-once "system" "term_string" mfn t)
+ (`(compound ":"
+ (atom . ,_)
+ (compound "/"
+ (atom . ,functor)
+ ,arity))
+ (cons functor arity))
+ (`(compound "/"
+ (atom . ,functor)
+ ,arity)
+ (cons functor arity))))
(defun sweeprolog--swipl-source-directory ()
(when sweeprolog-swipl-sources
@@ -767,20 +758,12 @@ FLAG and VALUE are specified as strings and read as
Prolog terms."
For native built-in predicates, the behavior of this function
depends on the value of the user option
`sweeprolog-swipl-sources', which see."
- (sweeprolog--open-query "user" "sweep" "sweep_predicate_location" mfn)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (if (sweeprolog-true-p sol)
- (cdr sol)
- (sweeprolog-native-predicate-location mfn))))
+ (or (sweeprolog--query-once "sweep" "sweep_predicate_location" mfn)
+ (sweeprolog-native-predicate-location mfn)))
(defun sweeprolog-predicate-apropos (pattern)
"Return a list of predicates whose name resembeles PATTERN."
- (sweeprolog--open-query "user" "sweep" "sweep_predicate_apropos" pattern)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_predicate_apropos" pattern))
(defun sweeprolog-read-predicate (&optional prompt)
"Read a Prolog predicate from the minibuffer with prompt PROMPT.
@@ -818,15 +801,6 @@ default."
(forward-char))
(cons start (point))))))))
-(defun sweeprolog-prefix-operators (&optional file)
- (sweeprolog--open-query "user"
- "sweep" "sweep_prefix_ops"
- (or file (buffer-file-name)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
-
;;;###autoload
(defun sweeprolog-find-predicate (mfn)
"Jump to the definition of the Prolog predicate MFN.
@@ -842,44 +816,30 @@ module name, F is a functor name and N is its arity."
(user-error "Unable to locate predicate %s" mfn)))
(defun sweeprolog-identifier-at-point (&optional point)
- (let* ((p (or point (point)))
- (beg (save-mark-and-excursion
- (goto-char p)
- (unless (sweeprolog-at-beginning-of-top-term-p)
- (sweeprolog-beginning-of-top-term))
- (max (1- (point)) (point-min))))
- (end (save-mark-and-excursion
- (goto-char p)
- (sweeprolog-end-of-top-term)
- (point)))
- (contents (buffer-substring-no-properties beg end)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_identifier_at_point"
- (list contents
- (buffer-file-name)
- (- p beg)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol)))))
+ (setq point (or point (point)))
+ (save-excursion
+ (goto-char point)
+ (let ((id-at-point nil))
+ (sweeprolog-analyze-term-at-point
+ (lambda (beg end arg)
+ (when (<= beg point end)
+ (pcase arg
+ ((or `("head_term" ,_ ,f ,a)
+ `("goal_term" ,_ ,f ,a)
+ `("head" ,_ ,f ,a)
+ `("goal" ,_ ,f ,a))
+ (setq id-at-point (list f a)))))))
+ (sweeprolog--query-once "sweep" "sweep_functor_arity_pi"
+ id-at-point))))
;;;; Modules
(defun sweeprolog-modules-collection ()
- (sweeprolog--open-query "user" "sweep" "sweep_modules_collection" nil)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_modules_collection" nil))
(defun sweeprolog-module-path (mod)
- (sweeprolog--open-query "user" "sweep" "sweep_module_path" mod)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_module_path" mod))
(defun sweeprolog-read-module-name ()
"Read a Prolog module name from the minibuffer, with completion."
@@ -895,8 +855,7 @@ module name, F is a functor name and N is its arity."
(concat pat (make-string (max 0 (- 80 (length
pat))) ? ) des)
pat)))))))
(completing-read sweeprolog-read-module-prompt col nil nil nil
- 'sweeprolog-read-module-history
- sweeprolog-buffer-module)))
+ 'sweeprolog-read-module-history)))
;;;###autoload
(defun sweeprolog-find-module (mod)
@@ -904,16 +863,6 @@ module name, F is a functor name and N is its arity."
(interactive (list (sweeprolog-read-module-name)))
(find-file (sweeprolog-module-path mod)))
-(defun sweeprolog--set-buffer-module ()
- (sweeprolog--open-query "user" "sweep" "sweep_path_module"
- (buffer-file-name))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (setq sweeprolog-buffer-module
- (if (sweeprolog-true-p sol)
- (cdr sol)
- "user"))))
-
;;;; Completion at point
@@ -963,13 +912,9 @@ resulting list even when found in the current clause."
"Return a list of prediactes accessible in the current buffer.
When non-nil, only predicates whose name contains PREFIX are returned."
- (sweeprolog--open-query "user" "sweep" "sweep_local_predicate_completion"
- (cons sweeprolog-buffer-module
- prefix))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (setq sweeprolog-predicate-completion-collection (cdr sol)))))
+ (setq sweeprolog-predicate-completion-collection
+ (sweeprolog--query-once "sweep" "sweep_local_predicate_completion"
+ prefix)))
(defun sweeprolog-completion-at-point-function ()
(when-let ((bounds (sweeprolog-predicate-prefix-boundaries)))
@@ -1012,11 +957,7 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
;;;; Packages
(defun sweeprolog-packs-collection ()
- (sweeprolog--open-query "user" "sweep" "sweep_packs_collection" "")
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_packs_collection" ""))
(defun sweeprolog-read-pack-name ()
"Read a Prolog pack name from the minibuffer, with completion."
@@ -1041,12 +982,9 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
(defun sweeprolog-pack-install (pack)
"Install or upgrade Prolog package PACK."
(interactive (list (sweeprolog-read-pack-name)))
- (sweeprolog--open-query "user" "sweep" "sweep_pack_install" pack)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (if (sweeprolog-true-p sol)
- (message "Package install successful.")
- (user-error "Pacakge installation failed!"))))
+ (if (sweeprolog--query-once "sweep" "sweep_pack_install" pack)
+ (message "Package install successful.")
+ (user-error "Pacakge installation failed!")))
;;;; Faces
@@ -1656,7 +1594,11 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
;;;; Font-lock
-(defun sweeprolog--colour-term-to-faces (beg end arg)
+(defun sweeprolog-analyze-start-font-lock (beg end)
+ (with-silent-modifications
+ (font-lock-unfontify-region beg end)))
+
+(defun sweeprolog-analyze-fragment-to-faces (beg end arg)
(pcase arg
(`("comment" . "structured")
(list (list beg end nil)
@@ -1664,13 +1606,7 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
(`("comment" . ,_)
(list (list beg end nil)
(list beg end (sweeprolog-comment-face))))
- (`("head" "unreferenced" ,f ,a)
- (add-to-list 'sweeprolog--exportable-predicates (concat f "/"
(number-to-string a)))
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end
- :note (format "Unreferenced definition for
%s/%s" f a))
- sweeprolog--diagnostics))
+ (`("head" "unreferenced" . ,_)
(list (list beg end (sweeprolog-head-unreferenced-face))))
(`("head" "meta" . ,_)
(list (list beg end (sweeprolog-head-meta-face))))
@@ -1688,13 +1624,11 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
(list (list beg end (sweeprolog-head-extern-face))))
(`("head" ,(rx "public ") . ,_)
(list (list beg end (sweeprolog-head-public-face))))
- (`("head",(rx "dynamic ") ,f ,a)
- (add-to-list 'sweeprolog--exportable-predicates (concat f "/"
(number-to-string a)))
+ (`("head",(rx "dynamic ") . ,_)
(list (list beg end (sweeprolog-head-dynamic-face))))
(`("head",(rx "multifile ") . ,_)
(list (list beg end (sweeprolog-head-multifile-face))))
- (`("head" ,(rx "local(") ,f ,a)
- (add-to-list 'sweeprolog--exportable-predicates (concat f "/"
(number-to-string a)))
+ (`("head" ,(rx "local(") . ,_)
(list (list beg end (sweeprolog-head-local-face))))
(`("goal" "recursion" . ,_)
(list (list beg end (sweeprolog-recursion-face))))
@@ -1702,12 +1636,7 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
(list (list beg end (sweeprolog-meta-face))))
(`("goal" "built_in" . ,_)
(list (list beg end (sweeprolog-built-in-face))))
- (`("goal" "undefined" ,f ,a)
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end
- :warning (format "Undefined predicate %s/%s"
f a))
- sweeprolog--diagnostics))
+ (`("goal" "undefined" . ,_)
(list (list beg end (sweeprolog-undefined-face))))
(`("goal" "global" . ,_)
(list (list beg end (sweeprolog-global-face))))
@@ -1727,46 +1656,19 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
(list (list beg end (sweeprolog-global-face))))
(`("goal",(rx "local(") . ,_)
(list (list beg end (sweeprolog-local-face))))
- (`("goal_term" "built_in" "module" 2)
- (setq sweeprolog--module-term (cons beg end))
- nil)
("instantiation_error"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning
"Instantiation error")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-instantiation-error-face))))
("type_error"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning "Type
error")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-type-error-face))))
- (`("syntax_error" ,message ,eb ,ee)
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :error message)
- sweeprolog--diagnostics))
+ (`("syntax_error" ,_ ,eb ,ee)
(list (list eb ee nil)
(list eb ee (sweeprolog-around-syntax-error-face))
(list beg end (sweeprolog-syntax-error-face))))
("unused_import"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :note "Unused
import")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-unused-import-face))))
("undefined_import"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning "Undefined
import")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-undefined-import-face))))
("error"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning
"Unspecified error")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-error-face))))
("html_attribute"
(list (list beg end (sweeprolog-html-attribute-face))))
@@ -1783,10 +1685,6 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
("flag_name"
(list (list beg end (sweeprolog-flag-name-face))))
("no_flag_name"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning "No such
flag")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-flag-name-face))))
("ext_quant"
(list (list beg end (sweeprolog-ext-quant-face))))
@@ -1797,30 +1695,15 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
("int"
(list (list beg end (sweeprolog-int-face))))
("singleton"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :note "Singleton
variable")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-singleton-face))))
("option_name"
(list (list beg end (sweeprolog-option-name-face))))
("no_option_name"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning "No such
option")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-no-option-name-face))))
("control"
(list (list beg end (sweeprolog-control-face))))
("var"
- (let ((var (buffer-substring-no-properties beg end)))
- (with-silent-modifications
- (put-text-property beg end 'cursor-sensor-functions
- (sweeprolog-cursor-sensor-functions var)))
- (cons (list beg end (sweeprolog-variable-face))
- (and sweeprolog--variable-at-point
- (string= sweeprolog--variable-at-point var)
- (list (list beg end (sweeprolog-variable-at-point-face)))))))
+ (list (list beg end (sweeprolog-variable-face))))
("fullstop"
(list (list beg
(save-excursion
@@ -1877,19 +1760,11 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
(list (list beg end (sweeprolog-qq-close-face))))
("identifier"
(list (list beg end (sweeprolog-identifier-face))))
- ("file"
+ (`("file" . ,_)
(list (list beg end (sweeprolog-file-face))))
- ("file_no_depend"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :note "Unused
dependency")
- sweeprolog--diagnostics))
+ (`("file_no_depend" . ,_)
(list (list beg end (sweeprolog-file-no-depend-face))))
("nofile"
- (when sweeprolog-enable-flymake
- (push
- (flymake-make-diagnostic (current-buffer) beg end :warning "No such
file")
- sweeprolog--diagnostics))
(list (list beg end (sweeprolog-no-file-face))))
("op_type"
(list (list beg end (sweeprolog-op-type-face))))
@@ -1906,76 +1781,187 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
("class"
(list (list beg end (sweeprolog-class-face))))))
-(defun sweeprolog--colourise (args)
- "ARGS is a list of the form (BEG LEN . SEM)."
- (when-let ((beg (max (point-min) (car args)))
- (end (min (point-max) (+ beg (cadr args))))
- (arg (cddr args))
- (fll (sweeprolog--colour-term-to-faces beg end arg)))
+(defun sweeprolog-analyze-fragment-font-lock (beg end arg)
+ (when-let ((face-fragments (sweeprolog-analyze-fragment-to-faces
+ beg end arg)))
(with-silent-modifications
- (dolist (ent fll)
- (let ((b (car ent))
- (e (cadr ent))
- (flf (caddr ent)))
- (if flf
- (font-lock--add-text-property b e
- 'font-lock-face flf
+ (dolist (face-fragment face-fragments)
+ (let ((frag-beg (car face-fragment))
+ (frag-end (cadr face-fragment))
+ (frag-face (caddr face-fragment)))
+ (if frag-face
+ (font-lock--add-text-property frag-beg frag-end
+ 'font-lock-face frag-face
(current-buffer) nil)
- (remove-list-of-text-properties b e '(font-lock-face))))))))
+ (remove-list-of-text-properties frag-beg frag-end
+ '(font-lock-face))))))))
+
+(defun sweeprolog-analyze-start-flymake (&rest _)
+ (flymake-start))
+
+(defun sweeprolog-analyze-fragment-flymake (beg end arg)
+ (when-let ((type-text
+ (pcase arg
+ (`("head" "unreferenced" ,f ,a)
+ (cons :note
+ (format "Unreferenced definition for %s/%s"
+ f a)))
+ (`("goal" "undefined" ,f ,a)
+ (cons :warning
+ (format "Undefined predicate %s/%s" f a)))
+ ("instantiation_error"
+ (cons :warning "Instantiation error"))
+ ("type_error"
+ (cons :warning "Type error"))
+ (`("syntax_error" ,message . ,_)
+ (cons :error message))
+ ("unused_import"
+ (cons :note "Unused import"))
+ ("undefined_import"
+ (cons :warning "Undefined import"))
+ ("error"
+ (cons :warning "Unspecified error"))
+ ("no_flag_name"
+ (cons :warning "No such flag"))
+ ("singleton"
+ (cons :note "Singleton variable"))
+ ("no_option_name"
+ (cons :warning "No such option"))
+ (`("file_no_depend" . ,file)
+ (cons :note (format "Unused dependency on %s"
+ file)))
+ ("nofile"
+ (cons :warning "No such file"))))
+ (diag (flymake-make-diagnostic (current-buffer)
+ beg end
+ (car type-text)
+ (cdr type-text))))
+ (push diag sweeprolog--diagnostics)))
+
+(defun sweeprolog-analyze-end-flymake (beg end)
+ (when sweeprolog--diagnostics-report-fn
+ (funcall sweeprolog--diagnostics-report-fn
+ sweeprolog--diagnostics
+ :region (cons beg end))
+ (setq sweeprolog--diagnostics-report-fn nil)))
+
+(defun sweeprolog-analyze-start-exportable (&rest _)
+ (setq sweeprolog--exportable-predicates nil
+ sweeprolog--module-term nil))
+
+(defun sweeprolog-analyze-fragment-exportable (beg end arg)
+ (pcase arg
+ (`("head" ,(rx (or "dynamic "
+ "unreferenced"
+ "local("))
+ ,f ,a)
+ (add-to-list 'sweeprolog--exportable-predicates
+ (concat f "/" (number-to-string a))))
+ (`("goal_term" "built_in" "module" 2)
+ (setq sweeprolog--module-term (cons beg end)))))
-(defun sweeprolog-colourise-buffer (&optional buffer)
- "Update cross-reference data and semantic highlighting in BUFFER."
- (interactive)
- (when sweeprolog-enable-flymake
- (flymake-start))
- (with-current-buffer (or buffer (current-buffer))
- (setq sweeprolog--exportable-predicates nil)
- (let* ((beg (point-min))
- (end (point-max))
- (contents (buffer-substring-no-properties beg end)))
+(defun sweeprolog-analyze-fragment-variable (beg end arg)
+ (when (member arg (list "var"
+ (list "goal_term" "meta" 'variable 0)))
+ (let ((var (buffer-substring-no-properties beg end)))
(with-silent-modifications
- (font-lock-unfontify-region beg end))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_colourise_buffer"
- (cons contents (buffer-file-name)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when sweeprolog--diagnostics-report-fn
- (funcall sweeprolog--diagnostics-report-fn sweeprolog--diagnostics)
- (setq sweeprolog--diagnostics-report-fn nil))
- (sweeprolog--set-buffer-module)
- sol))))
-
-(defun sweeprolog-colourise-some-terms (beg0 end0 &optional _verbose)
- (when sweeprolog-enable-flymake
- (flymake-start))
- (let* ((beg (save-mark-and-excursion
- (goto-char (min beg0 (or sweeprolog--diagnostics-changes-beg
beg0)))
- (sweeprolog-beginning-of-top-term)
- (max (1- (point)) (point-min))))
- (end (save-mark-and-excursion
- (goto-char (max end0 (or sweeprolog--diagnostics-changes-end
end0)))
- (sweeprolog-end-of-top-term)
- (point)))
- (contents (buffer-substring-no-properties beg end)))
- (with-silent-modifications
- (font-lock-unfontify-region beg end))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_colourise_some_terms"
- (list contents
- (buffer-file-name)
- beg))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when sweeprolog--diagnostics-report-fn
- (funcall sweeprolog--diagnostics-report-fn
- sweeprolog--diagnostics
- :region (cons beg end))
- (setq sweeprolog--diagnostics-report-fn nil))
- (when (sweeprolog-true-p sol)
- `(jit-lock-bounds ,beg . ,end)))))
+ (put-text-property beg end 'cursor-sensor-functions
+ (sweeprolog-cursor-sensor-functions var))
+ (when (and sweeprolog--variable-at-point
+ (string= sweeprolog--variable-at-point var))
+ (font-lock--add-text-property beg end
+ 'font-lock-face
+ (sweeprolog-variable-at-point-face)
+ (current-buffer) nil))))))
+
+(defvar sweeprolog-analyze-region-start-hook
+ '(sweeprolog-analyze-start-font-lock))
+
+(defvar sweeprolog-analyze-region-fragment-hook
+ '(sweeprolog-analyze-fragment-font-lock))
+
+(defvar sweeprolog-analyze-region-end-hook
+ nil)
+
+(defun sweeprolog-xref-buffer ()
+ (when-let ((fn (buffer-file-name)))
+ (sweeprolog--query-once "sweep" "sweep_xref_source" fn)))
+
+(defun sweeprolog-analyze-fragment (frag)
+ (let* ((beg (max (point-min) (car frag)))
+ (end (min (point-max) (+ beg (cadr frag))))
+ (arg (cddr frag)))
+ (run-hook-with-args 'sweeprolog-analyze-region-fragment-hook
+ beg end arg)))
+
+(defun sweeprolog-analyze-region (beg end &optional one-term)
+ "Analyze the current buffer contents from BEG to END.
+If ONE-TERM is non-nil, region is assumed to include one Prolog
+top term."
+ (run-hook-with-args 'sweeprolog-analyze-region-start-hook beg end)
+ (sweeprolog--query-once "sweep" "sweep_analyze_region"
+ (list one-term
+ beg
+ (buffer-substring-no-properties beg end)
+ (buffer-file-name)))
+ (run-hook-with-args 'sweeprolog-analyze-region-end-hook beg end))
+
+(defun sweeprolog-analyze-buffer (&optional force)
+ "Analyze the current buffer, if it has been modified.
+
+When FORCE is non-nil, analyze the buffer even if it has not been
+modified."
+ (interactive (list t))
+ (when (or force sweeprolog--buffer-modified)
+ (sweeprolog-xref-buffer)
+ (save-restriction
+ (widen)
+ (sweeprolog-analyze-region (point-min) (point-max)))
+ (setq sweeprolog--buffer-modified nil)))
+
+(defun sweeprolog--buffer-string (filename)
+ (when-let ((buf (find-buffer-visiting filename)))
+ (with-current-buffer buf
+ (save-restriction
+ (widen)
+ (buffer-substring-no-properties
+ (point-min)
+ (point-max))))))
+
+(defun sweeprolog--buffer-last-modified-time (filename)
+ (when-let ((buf (find-buffer-visiting filename)))
+ (with-current-buffer buf
+ sweeprolog--buffer-last-modified-time)))
+
+(defun sweeprolog-analyze-term (beg &optional end)
+ (if end
+ (sweeprolog-analyze-region beg end "true")
+ (save-mark-and-excursion
+ (goto-char beg)
+ (unless (sweeprolog-at-beginning-of-top-term-p)
+ (sweeprolog-beginning-of-top-term))
+ (unless (bobp)
+ (forward-char -1))
+ (let ((start (point)))
+ (sweeprolog-end-of-top-term)
+ (sweeprolog-analyze-region start (point) "true")))))
+
+(defun sweeprolog-analyze-some-terms (beg end &optional _verbose)
+ (save-mark-and-excursion
+ (goto-char beg)
+ (sweeprolog-beginning-of-top-term)
+ (unless (bobp)
+ (forward-char -1)
+ (sweeprolog-beginning-of-top-term)
+ (unless (bobp) (forward-char -1)))
+ (let ((start (point))
+ (cur (point)))
+ (while (and (not (eobp))
+ (< (point) end))
+ (setq cur (point))
+ (sweeprolog-end-of-top-term)
+ (sweeprolog-analyze-term cur (point)))
+ `(jit-lock-bounds ,start . ,(point)))))
(defun sweeprolog-syntax-propertize (start end)
(goto-char start)
@@ -1985,7 +1971,7 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
((rx bow (group-n 1 "0'" anychar))
(1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
(string-to-syntax "w"))))
- ((rx (group-n 1 "!"))
+ ((rx bow (group-n 1 "!") eow)
(1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
(string-to-syntax "w")))))
start end)))
@@ -2055,13 +2041,8 @@ Interactively, PROJ is the prefix argument."
(query (buffer-substring-no-properties beg end)))
(with-silent-modifications
(font-lock-unfontify-region beg end))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_colourise_query"
- (cons query (marker-position beg)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- sol)))))
+ (sweeprolog--query-once "sweep" "sweep_colourise_query"
+ (cons query (marker-position beg)))))))
;;;###autoload
(defun sweeprolog-top-level (&optional buffer)
@@ -2084,14 +2065,9 @@ Interactively, a prefix arg means to prompt for BUFFER."
(with-current-buffer buf
(unless (eq major-mode 'sweeprolog-top-level-mode)
(sweeprolog-top-level-mode)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_accept_top_level_client"
- (buffer-name buf))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (unless (sweeprolog-true-p sol)
- (error "Failed to create new top-level!")))
+ (unless (sweeprolog--query-once "sweep" "sweep_accept_top_level_client"
+ (buffer-name buf))
+ (error "Failed to create new top-level!"))
(with-current-buffer buf
(make-comint-in-buffer "sweeprolog-top-level"
buf
@@ -2116,24 +2092,13 @@ Interactively, a prefix arg means to prompt for BUFFER."
(comint-send-input)))))
(defun sweeprolog-top-level--populate-thread-id ()
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_top_level_thread_buffer"
- (buffer-name)
- t)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (setq sweeprolog-top-level-thread-id (cdr sol)))))
+ (setq sweeprolog-top-level-thread-id
+ (sweeprolog--query-once "sweep" "sweep_top_level_thread_buffer"
+ (buffer-name) t)))
(defun sweeprolog-signal-thread (tid goal)
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_thread_signal"
- (cons tid goal))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- sol))
+ (sweeprolog--query-once "sweep" "sweep_thread_signal"
+ (cons tid goal)))
(defun sweeprolog-top-level-signal (buffer goal)
"Signal the top-level thread corresponding to BUFFER to run GOAL."
@@ -2168,7 +2133,6 @@ Interactively, a prefix arg means to prompt for BUFFER."
comint-delimiter-argument-list '(?,)
comment-start "%")
(add-hook 'post-self-insert-hook
#'sweeprolog-top-level--post-self-insert-function nil t)
- (setq sweeprolog-buffer-module "user")
(add-hook 'completion-at-point-functions
#'sweeprolog-completion-at-point-function nil t)
(setq sweeprolog-top-level-timer (run-with-idle-timer 0.2 t
#'sweeprolog-colourise-query (current-buffer)))
(add-hook 'kill-buffer-hook
@@ -2205,15 +2169,10 @@ buffer to load."
(let* ((beg (point-min))
(end (point-max))
(contents (buffer-substring-no-properties beg end)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_load_buffer"
- (cons contents (buffer-file-name)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (if (sweeprolog-true-p sol)
- (message "Loaded %s." (buffer-name))
- (user-error "Loading %s failed!" (buffer-name)))))))
+ (if (sweeprolog--query-once "sweep" "sweep_load_buffer"
+ (cons contents (buffer-file-name)))
+ (message "Loaded %s." (buffer-name))
+ (user-error "Loading %s failed!" (buffer-name))))))
;;;; Prolog file specifications
@@ -2223,20 +2182,14 @@ buffer to load."
(cond ((eq operation 'expand-file-name)
(let ((fn (car args))
(dn (cadr args)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_expand_file_name"
- (cons fn dn))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (if (sweeprolog-true-p sol)
- (cdr sol)
+ (or (sweeprolog--query-once "sweep" "sweep_expand_file_name"
+ (cons fn dn))
(let ((inhibit-file-name-handlers
(cons 'sweeprolog-file-name-handler
(and (eq inhibit-file-name-operation operation)
inhibit-file-name-handlers)))
(inhibit-file-name-operation operation))
- (apply operation args))))))
+ (apply operation args)))))
(t (let ((inhibit-file-name-handlers
(cons 'sweeprolog-file-name-handler
(and (eq inhibit-file-name-operation operation)
@@ -2249,27 +2202,16 @@ buffer to load."
#'sweeprolog-file-name-handler))
(defun sweeprolog-file-at-point (&optional point)
- (let* ((p (or point (point)))
- (beg (save-mark-and-excursion
- (goto-char p)
- (unless (sweeprolog-at-beginning-of-top-term-p)
- (sweeprolog-beginning-of-top-term))
- (max (1- (point)) (point-min))))
- (end (save-mark-and-excursion
- (goto-char p)
- (sweeprolog-end-of-top-term)
- (point)))
- (contents (buffer-substring-no-properties beg end)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_file_at_point"
- (list contents
- (buffer-file-name)
- (- p beg)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol)))))
+ (setq point (or point (point)))
+ (let ((fap nil))
+ (sweeprolog-analyze-term-at-point
+ (lambda (beg end arg)
+ (when (<= beg point end)
+ (pcase arg
+ ((or `("file" . ,file)
+ `("file_no_depend" . ,file))
+ (setq fap file))))))
+ fap))
(defun sweeprolog-find-file-at-point (point)
"Find file specificed by the Prolog file spec at POINT.
@@ -2426,27 +2368,21 @@ of them signal success by returning non-nil."
(and (looking-at-p (rx bol graph))
(not (nth 8 (syntax-ppss)))))
+(defun sweeprolog-analyze-term-at-point (cb)
+ (add-hook 'sweeprolog-analyze-region-fragment-hook cb nil t)
+ (sweeprolog-analyze-term (point))
+ (remove-hook 'sweeprolog-analyze-region-fragment-hook cb t))
+
(defun sweeprolog-definition-at-point (&optional point)
- (let* ((p (or point (point)))
- (beg (save-mark-and-excursion
- (goto-char p)
- (unless (sweeprolog-at-beginning-of-top-term-p)
- (sweeprolog-beginning-of-top-term))
- (max (1- (point)) (point-min))))
- (end (save-mark-and-excursion
- (goto-char p)
- (sweeprolog-end-of-top-term)
- (point)))
- (contents (buffer-substring-no-properties beg end)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_definition_at_point"
- (cons contents
- (buffer-file-name)))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cons (+ beg (cadr sol)) (cddr sol))))))
+ (save-excursion
+ (when point (goto-char point))
+ (let ((def-at-point nil))
+ (sweeprolog-analyze-term-at-point (lambda (beg _end arg)
+ (pcase arg
+ (`("head_term" ,_ ,f ,a)
+ (setq def-at-point
+ (list beg f a))))))
+ def-at-point)))
(defun sweeprolog-insert-pldoc-for-predicate (functor arguments det summary)
(insert "\n\n")
@@ -2878,14 +2814,8 @@ predicate definition at or directly above POINT."
res))
(defun sweeprolog-local-predicate-export-comment (fun ari)
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_local_predicate_export_comment"
- (list (buffer-file-name) fun ari))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_local_predicate_export_comment"
+ (list (buffer-file-name) fun ari)))
(defun sweeprolog-read-exportable-predicate ()
"Read a predicate name that can be exported in the current buffer."
@@ -2912,7 +2842,15 @@ non-exported predicates defined in the current buffer."
(sweeprolog-read-exportable-predicate)
(read-string "Export comment: ")))
sweeprolog-mode)
- (sweeprolog-colourise-buffer)
+ (add-hook 'sweeprolog-analyze-region-start-hook
+ #'sweeprolog-analyze-start-exportable nil t)
+ (add-hook 'sweeprolog-analyze-region-fragment-hook
+ #'sweeprolog-analyze-fragment-exportable nil t)
+ (sweeprolog-analyze-buffer t)
+ (remove-hook 'sweeprolog-analyze-region-fragment-hook
+ #'sweeprolog-analyze-fragment-exportable t)
+ (remove-hook 'sweeprolog-analyze-region-start-hook
+ #'sweeprolog-analyze-start-exportable t)
(unless (member pred sweeprolog--exportable-predicates)
(user-error "Cannot add %s to export list" pred))
(if-let ((mbeg (car sweeprolog--module-term))
@@ -2943,8 +2881,8 @@ non-exported predicates defined in the current buffer."
(indent-region mbeg (- (point-max) pos))
(align-regexp mbeg (- (point-max) pos) (rx (group
(zero-or-more blank)) "%"))))
(_ (user-error "Unexpected token while looking for export
list")))))
- (sweeprolog-colourise-buffer)
- (message "Exported %s:%s" sweeprolog-buffer-module pred))
+ (sweeprolog-analyze-buffer t)
+ (message "Exported %s" pred))
(user-error "Buffer is not a module")))
(defun sweeprolog-align-spaces (&optional _)
@@ -2966,6 +2904,10 @@ if-then-else constructs in SWI-Prolog."
(delete-horizontal-space)
(insert (make-string num ? ))))))))))
+(defun sweeprolog--update-buffer-last-modified-time (&rest _)
+ (setq sweeprolog--buffer-last-modified-time (float-time)
+ sweeprolog--buffer-modified t))
+
;;;###autoload
(define-derived-mode sweeprolog-mode prog-mode "sweep"
"Major mode for reading and editing Prolog code."
@@ -2985,7 +2927,9 @@ if-then-else constructs in SWI-Prolog."
nil
nil
nil
- (font-lock-fontify-region-function .
sweeprolog-colourise-some-terms)))
+ (font-lock-fontify-region-function .
sweeprolog-analyze-some-terms)))
+ (add-hook 'after-change-functions
+ #'sweeprolog--update-buffer-last-modified-time)
(when sweeprolog-enable-eldoc
(when (fboundp 'eldoc-documentation-default)
(setq-local eldoc-documentation-strategy #'eldoc-documentation-default))
@@ -2993,6 +2937,9 @@ if-then-else constructs in SWI-Prolog."
(when sweeprolog-enable-flymake
(add-hook 'flymake-diagnostic-functions #'sweeprolog-diagnostic-function
nil t)
(flymake-mode)
+ (add-hook 'sweeprolog-analyze-region-start-hook
#'sweeprolog-analyze-start-flymake nil t)
+ (add-hook 'sweeprolog-analyze-region-fragment-hook
#'sweeprolog-analyze-fragment-flymake nil t)
+ (add-hook 'sweeprolog-analyze-region-end-hook
#'sweeprolog-analyze-end-flymake nil t)
(setq-local next-error-function #'flymake-goto-next-error)
(add-hook 'window-selection-change-functions
(let ((buffer (current-buffer)))
@@ -3005,32 +2952,35 @@ if-then-else constructs in SWI-Prolog."
(consp cycle-spacing-actions)
sweeprolog-enable-cycle-spacing
(setq-local cycle-spacing-actions (cons #'sweeprolog-align-spaces
cycle-spacing-actions))))
+ (sweeprolog--update-buffer-last-modified-time)
(let ((time (current-time)))
- (sweeprolog-colourise-buffer)
- (setq sweeprolog--colourise-buffer-duration (float-time (time-since
time))))
- (sweeprolog--set-buffer-module)
+ (sweeprolog-analyze-buffer t)
+ (setq sweeprolog--analyze-buffer-duration (float-time (time-since time))))
(add-hook 'xref-backend-functions #'sweeprolog--xref-backend nil t)
(add-hook 'file-name-at-point-functions #'sweeprolog-file-at-point nil t)
(add-hook 'completion-at-point-functions
#'sweeprolog-completion-at-point-function nil t)
(add-hook 'completion-at-point-functions
#'sweeprolog-variable-completion-at-point nil t)
- (when sweeprolog-colourise-buffer-on-idle
+ (when sweeprolog-analyze-buffer-on-idle
(setq sweeprolog--timer
(run-with-idle-timer
- (max sweeprolog-colourise-buffer-min-interval
- (* 10 sweeprolog--colourise-buffer-duration))
+ (max sweeprolog-analyze-buffer-min-interval
+ (* 10 sweeprolog--analyze-buffer-duration))
t
(let ((buffer (current-buffer)))
(lambda ()
(when (and (buffer-live-p buffer)
- (not (< sweeprolog-colourise-buffer-max-size
+ (not (< sweeprolog-analyze-buffer-max-size
(buffer-size buffer)))
(get-buffer-window buffer))
- (sweeprolog-colourise-buffer buffer))))))
+ (with-current-buffer buffer
+ (sweeprolog-analyze-buffer)))))))
(add-hook 'kill-buffer-hook
(lambda ()
(when (timerp sweeprolog--timer)
(cancel-timer sweeprolog--timer)))))
(when sweeprolog-enable-cursor-sensor
+ (add-hook 'sweeprolog-analyze-region-fragment-hook
+ #'sweeprolog-analyze-fragment-variable nil t)
(cursor-sensor-mode 1)))
(add-to-list 'auto-insert-alist
@@ -3198,54 +3148,36 @@ if-then-else constructs in SWI-Prolog."
;;;; Imenu
(defun sweeprolog-create-index-function ()
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_imenu_index"
- (buffer-file-name))
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (seq-map (lambda (entry)
- (let ((car (car entry))
- (line (cdr entry)))
- (goto-char (point-min))
- (forward-line (1- line))
- (cons car (line-beginning-position))))
- (cdr sol)))))
+ (seq-map (lambda (entry)
+ (let ((car (car entry))
+ (line (cdr entry)))
+ (goto-char (point-min))
+ (forward-line (1- line))
+ (cons car (line-beginning-position))))
+ (sweeprolog--query-once "sweep" "sweep_imenu_index"
+ (buffer-file-name))))
;;;; ElDoc
(defun sweeprolog-predicate-modes-doc (cb)
- (when-let ((pi (sweeprolog-identifier-at-point)))
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_documentation"
- pi)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (funcall cb (cadr sol) :thing pi :face
font-lock-function-name-face)))))
+ (when-let ((pi (sweeprolog-identifier-at-point))
+ (docs (sweeprolog--query-once "sweep" "sweep_documentation"
+ pi)))
+ (funcall cb (car docs) :thing pi :face font-lock-function-name-face)))
;;;; Top-level Menu
(defun sweeprolog-top-level-menu--entries ()
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_top_level_threads"
- nil)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (mapcar (lambda (th)
- (let ((id (nth 0 th))
- (bn (nth 1 th))
- (st (nth 2 th))
- (sz (number-to-string (nth 3 th)))
- (ct (number-to-string (nth 4 th))))
- (list id (vector bn st sz ct))))
- (cdr sol)))))
+ (mapcar (lambda (th)
+ (let ((id (nth 0 th))
+ (bn (nth 1 th))
+ (st (nth 2 th))
+ (sz (number-to-string (nth 3 th)))
+ (ct (number-to-string (nth 4 th))))
+ (list id (vector bn st sz ct))))
+ (sweeprolog--query-once "sweep" "sweep_top_level_threads" nil)))
(defun sweeprolog-top-level-menu--refresh ()
(tabulated-list-init-header)
@@ -3406,15 +3338,10 @@ if-then-else constructs in SWI-Prolog."
(defun sweeprolog--describe-module (mod)
(let ((page
- (progn
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_module_html_documentation"
- mod)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (sweeprolog-render-html (cdr sol)))))))
+ (when-let ((html (sweeprolog--query-once "sweep"
+
"sweep_module_html_documentation"
+ mod)))
+ (sweeprolog-render-html html))))
(help-setup-xref (list #'sweeprolog--describe-module mod)
(called-interactively-p 'interactive))
(with-help-window (help-buffer)
@@ -3478,26 +3405,15 @@ if-then-else constructs in SWI-Prolog."
"."))
(defun sweeprolog-predicate-properties (pred)
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_predicate_properties"
- pred)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (cdr sol))))
+ (sweeprolog--query-once "sweep" "sweep_predicate_properties" pred))
(defun sweeprolog--describe-predicate (pred)
(let ((page
- (progn
- (sweeprolog--open-query "user"
- "sweep"
- "sweep_predicate_html_documentation"
- pred)
- (let ((sol (sweeprolog-next-solution)))
- (sweeprolog-close-query)
- (when (sweeprolog-true-p sol)
- (sweeprolog-render-html (cdr sol))))))
+ (when-let
+ ((html
+ (sweeprolog--query-once "sweep"
"sweep_predicate_html_documentation"
+ pred)))
+ (sweeprolog-render-html html)))
(props (sweeprolog-predicate-properties pred))
(path (car (sweeprolog-predicate-location pred))))
(help-setup-xref (list #'sweeprolog--describe-predicate pred)
- [nongnu] elpa/sweeprolog updated (4d4bdc8600 -> 8a532f3183), ELPA Syncer, 2022/11/07
- [nongnu] elpa/sweeprolog 8a532f3183 6/6: ADDED: sweeprolog-forward/backward/mark-predicate, ELPA Syncer, 2022/11/07
- [nongnu] elpa/sweeprolog 3ecd2475d2 4/6: FIXED: correctly recognize "public" head terms, ELPA Syncer, 2022/11/07
- [nongnu] elpa/sweeprolog 4866ad53cf 5/6: REFACTOR: Simplify and deduplicate code all around,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog e7976af30c 2/6: FIXED: sweeprolog-identifier-at-point could return unbound module, ELPA Syncer, 2022/11/07
- [nongnu] elpa/sweeprolog e9256e3d3b 1/6: Fixed defcustom type for sweeprolog-top-level-display-action, ELPA Syncer, 2022/11/07
- [nongnu] elpa/sweeprolog 73d9b8c871 3/6: TEST: add two test cases, ELPA Syncer, 2022/11/07