[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 24a1e14ee9 151/166: MODIFIED: Breaking change:
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/sweeprolog 24a1e14ee9 151/166: MODIFIED: Breaking change: rename sweep.el to sweeprolog.el... |
|
Date: |
Fri, 30 Sep 2022 04:59:34 -0400 (EDT) |
branch: elpa/sweeprolog
commit 24a1e14ee94c57147a4f0fe45982327a3cad0967
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
MODIFIED: Breaking change: rename sweep.el to sweeprolog.el...
...and replace the `sweep-` prefix for all symbols with `sweeprolog-`.
This follows a request from RMS and Philip Kaludercic on the
emacs-devel mailing list to make the name of the Emacs package more
indicative.
---
.gitignore | 1 +
README.org | 262 +++----
sweep.c | 18 +-
sweep.pl | 10 +-
sweep-tests.el => sweeprolog-tests.el | 82 +--
sweep.el => sweeprolog.el | 1219 ++++++++++++++++-----------------
6 files changed, 797 insertions(+), 795 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9f56ac134b..b675b2c762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/sweep.info~
/sweep.texi
/sweep.o
+/TODO.org
diff --git a/README.org b/README.org
index cdbbdc3709..d318ff0ae9 100644
--- a/README.org
+++ b/README.org
@@ -14,8 +14,8 @@
#+texinfo_header: @set MAINTAINEREMAIL @email{me@eshelyaron.com}
#+texinfo_header: @set MAINTAINERCONTACT
@uref{mailto:me@eshelyaron.com,contact the maintainer}
-This manual describes the Emacs package =sweep=, which provides an
-embedded SWI-Prolog runtime inside of Emacs.
+This manual describes the Emacs package =sweep= (or =sweeprolog=), which
+provides an embedded SWI-Prolog runtime inside of Emacs.
#+toc: headlines 8 insert TOC here, with eight headline levels
@@ -42,7 +42,7 @@ Emacs Lisp.
The different parts of =sweep= are structured as follows:
-#+CINDEX: sweep-module
+#+CINDEX: sweeprolog-module
- =sweep.c= defines a dynamic Emacs module which is referred to from
Elisp as =sweep-module=. This module is linked against the SWI-Prolog
runtime library (=libswipl=) and exposes a subset of the SWI-Prolog C
@@ -50,17 +50,17 @@ The different parts of =sweep= are structured as follows:
Prolog]]). Notably, =sweep-module= is responsible for translating Elisp
objects to Prolog terms and vice versa.
-#+CINDEX: sweep.el
-- =sweep.el= defines an Elisp library (named simply =sweep=), which builds
+#+CINDEX: sweeprolog.el
+- =sweeprolog.el= defines an Elisp library (named simply =sweeprolog=), which
builds
on top of =sweep-module= to provide user-facing commands and
functionality. It is also responsible for loading and compiling the
dynamically loaded =sweep-module=.
#+CINDEX: sweep.pl
- =sweep.pl= defines a Prolog module (named, unsurprisingly, =sweep=)
- which is by default arranged by =sweep.el= to be loaded when the
+ which is by default arranged by =sweeprolog.el= to be loaded when the
embedded Prolog runtime is initialized. It contains predicates that
- =sweep.el= invoke through =sweep-module= to facilitate its different
+ =sweeprolog.el= invoke through =sweep-module= to facilitate its different
commands (see [[Finding Prolog code]]).
* Installation
@@ -68,7 +68,7 @@ The different parts of =sweep= are structured as follows:
:CUSTOM_ID: installation
:END:
-The dynamic Emacs module =sweep-module= and the Prolog helper library
+The dynamic Emacs module =sweeprolog-module= and the Prolog helper library
=sweep.pl= are included in the latest SWI-Prolog distribution. For
instructions on how to build and install SWI-Prolog, see
[[https://www.swi-prolog.org/build/]].
@@ -93,7 +93,7 @@ To start using =sweep= in Emacs:
3. Load =sweep= into Emacs:
#+begin_src emacs-lisp
- (require 'sweep)
+ (require 'sweeprolog)
#+end_src
* Prolog initialization and cleanup
@@ -101,42 +101,42 @@ To start using =sweep= in Emacs:
:CUSTOM_ID: prolog-init
:END:
-#+FINDEX: sweep-initialize
+#+FINDEX: sweeprolog-initialize
The embedded SWI-Prolog runtime must be initialized before it can
start executing queries. In =sweep=, Prolog initialization is done via
-the C-implemented =sweep-initialize= Elisp function defined in
-=sweep-module=. =sweep-initialize= takes one or more arguments, which
+the C-implemented =sweeprolog-initialize= Elisp function defined in
+=sweeprolog-module=. =sweeprolog-initialize= takes one or more arguments,
which
must all be strings, and initializes the embedded Prolog as if it were
invoked externally in a command line with the given strings as command
-line arguments, where the first argument to =sweep-initialize=
+line arguments, where the first argument to =sweeprolog-initialize=
corresponds to =argv[0]=.
-#+VINDEX: sweep-init-args
-By default, =sweep.el= will initialize Prolog automatically when it is
+#+VINDEX: sweeprolog-init-args
+By default, =sweeprolog.el= will initialize Prolog automatically when it is
loaded into Emacs. The arguments used to initialize Prolog in that
-case are determined by the value of the user-option =sweep-init-args=
+case are determined by the value of the user-option =sweeprolog-init-args=
which the user is free to extend with e.g.:
#+begin_src emacs-lisp
- (add-to-list 'sweep-init-args "--stack-limit=512m")
+ (add-to-list 'sweeprolog-init-args "--stack-limit=512m")
#+end_src
-#+VINDEX: sweep-init-on-load
-To inhibit =sweep= from initializing Prolog on load, set the user-option
-=sweep-init-on-load= to nil.
+#+VINDEX: sweeprolog-init-on-load
+To inhibit =sweeprolog= from initializing Prolog on load, set the user-option
+=sweeprolog-init-on-load= to nil.
-#+FINDEX: sweep-cleanup
-The embedded Prolog runtime can be reset using the =sweep-cleanup=
+#+FINDEX: sweeprolog-cleanup
+The embedded Prolog runtime can be reset using the =sweeprolog-cleanup=
function. This function cleans up the Prolog state and resources,
-afterwards =sweep-initialize= can be called to start Prolog anew.
+afterwards =sweeprolog-initialize= can be called to start Prolog anew.
* Querying Prolog
:PROPERTIES:
:CUSTOM_ID: querying-prolog
:END:
-#+FINDEX: sweep-open-query
-=sweep= provides the Elisp function =sweep-open-query= for invoking Prolog
+#+FINDEX: sweeprolog-open-query
+=sweep= provides the Elisp function =sweeprolog-open-query= for invoking Prolog
predicates. The invoked predicate must be of arity two and will be
called in mode =p(+In, -Out)= i.e. the predicate should treat the first
argument as input and expect a variable for the second argument which
@@ -144,7 +144,7 @@ should be unified with some output. This restriction is
placed in
order to facilitate a natural calling convention between Elisp, a
functional language, and Prolog, a logical one.
-The =sweep-open-query= function takes five arguments, the first three
+The =sweeprolog-open-query= function takes five arguments, the first three
are strings which denote:
- The name of the Prolog context module from which to execute the
query,
@@ -152,31 +152,31 @@ are strings which denote:
and
- The name of the predicate to call.
-The fourth argument to =sweep-open-query= is converted into a Prolog
+The fourth argument to =sweeprolog-open-query= is converted into a Prolog
term and used as the first argument of the predicate (see [[Conversion
of Elisp objects to Prolog terms]]). The fifth argument is an
optional "reverse" flag, when this flag is set to non-nil, the order
of the arguments is reversed such that the predicate is called in mode
=p(-Out, +In)= rather than =p(+In, -Out)=.
-#+FINDEX: sweep-next-solution
-The function =sweep-next-solution= can be used to examine the results of
-a query. If the query succeeded, =sweep-next-solution= returns a cons
+#+FINDEX: sweeprolog-next-solution
+The function =sweeprolog-next-solution= can be used to examine the results of
+a query. If the query succeeded, =sweeprolog-next-solution= returns a cons
cell whose =car= is either the symbol =!= when the success was
deterministic or =t= otherwise, and the =cdr= is the current value of the
second (output) Prolog argument converted to an Elisp object (see
[[Conversion of Prolog terms to Elisp objects]]). If the query failed,
-=sweep-next-solution= returns nil.
+=sweeprolog-next-solution= returns nil.
-#+FINDEX: sweep-cut-query
-#+FINDEX: sweep-close-query
+#+FINDEX: sweeprolog-cut-query
+#+FINDEX: sweeprolog-close-query
=sweep= only executes one Prolog query at a given time, thus queries
-opened with =sweep-open-query= need to be closed before other queries
+opened with =sweeprolog-open-query= need to be closed before other queries
can be opened. When no more solutions are available for the current
-query (i.e. after =sweep-next-solution= returned nil), or when otherwise
+query (i.e. after =sweeprolog-next-solution= returned nil), or when otherwise
further solutions are not of interest, the query must be closed with
-either =sweep-cut-query= or =sweep-close-query=. Both of these functions
-close the current query, but =sweep-close-query= also destroys any
+either =sweeprolog-cut-query= or =sweeprolog-close-query=. Both of these
functions
+close the current query, but =sweeprolog-close-query= also destroys any
Prolog bindings created by the query.
** Conversion of Elisp objects to Prolog terms
@@ -186,7 +186,7 @@ Prolog bindings created by the query.
=sweep= converts Elisp objects into Prolog terms to allow the Elisp
programmers to specify arguments for Prolog predicates invocations (see
-=sweep-open-query=). Seeing as some Elisp objects, like Elisp compiled
+=sweeprolog-open-query=). Seeing as some Elisp objects, like Elisp compiled
functions, wouldn't be as useful for a passing to Prolog as others,
=sweep= only converts Elisp objects of certain types to Prolog, namely
we convert /trees of strings and numbers/:
@@ -204,7 +204,7 @@ we convert /trees of strings and numbers/:
:END:
=sweep= converts Prolog terms into Elisp object to allow efficient
-processing of Prolog query results in Elisp (see =sweep-next-solution=).
+processing of Prolog query results in Elisp (see =sweeprolog-next-solution=).
- Prolog strings are converted to equivalent Elisp strings.
- Prolog integers are converted to equivalent Elisp integers.
@@ -235,13 +235,13 @@ permutations of the list =(1 2 3 4 5)=:
#+name: count-list-permutations
#+begin_src emacs-lisp
- (sweep-open-query "user" "lists" "permutation" '(1 2 3 4 5))
+ (sweeprolog-open-query "user" "lists" "permutation" '(1 2 3 4 5))
(let ((num 0)
- (sol (sweep-next-solution)))
+ (sol (sweeprolog-next-solution)))
(while sol
(setq num (1+ num))
- (setq sol (sweep-next-solution)))
- (sweep-close-query)
+ (setq sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
num)
#+end_src
@@ -253,7 +253,7 @@ permutations of the list =(1 2 3 4 5)=:
The =sweep-module= defines the foreign Prolog predicates =sweep_funcall/2=
and =sweep_funcall/3=, which allow for calling Elisp functions from
Prolog code. These predicates may only be called in the context of a
-Prolog query initiated by =sweep-open-query=, i.e. only in the Prolog
+Prolog query initiated by =sweeprolog-open-query=, i.e. only in the Prolog
thread controlled by Emacs. The first argument to these predicates is
a Prolog string holding the name of the Elisp function to call. The
last argument to these predicates is unified with the return value of
@@ -269,17 +269,17 @@ function without any arguments.
:CUSTOM_ID: editing-prolog-code
:END:
-#+CINDEX: sweep-mode
-#+FINDEX: sweep-mode
-#+VINDEX: sweep-mode
+#+CINDEX: sweeprolog-mode
+#+FINDEX: sweeprolog-mode
+#+VINDEX: sweeprolog-mode
=sweep= includes a dedicated major mode for reading and editing Prolog
-code, called =sweep-mode=. To activate this mode in a buffer, type =M-x
-sweep-mode=. To instruct Emacs to always open Prolog files in
-=sweep-mode=, modify the Emacs variable =auto-mode-alist= like so:
+code, called =sweeprolog-mode=. To activate this mode in a buffer, type =M-x
+sweeprolog-mode=. To instruct Emacs to always open Prolog files in
+=sweeprolog-mode=, modify the Emacs variable =auto-mode-alist= like so:
#+begin_src emacs-lisp
- (add-to-list 'auto-mode-alist '("\\.pl\\'" . sweep-mode))
- (add-to-list 'auto-mode-alist '("\\.plt\\'" . sweep-mode))
+ (add-to-list 'auto-mode-alist '("\\.pl\\'" . sweeprolog-mode))
+ (add-to-list 'auto-mode-alist '("\\.plt\\'" . sweeprolog-mode))
#+end_src
** Indentation
@@ -289,16 +289,16 @@ sweep-mode=. To instruct Emacs to always open Prolog
files in
#+CINDEX: indentation
-In =sweep-mode= buffers, the appropriate indentation for each line is
+In =sweeprolog-mode= buffers, the appropriate indentation for each line is
determined by a bespoke /indentation engine/. The indentation engine
analyses the syntactic context of a given line and determines the
appropriate indentation to apply based on a set of rules.
-#+FINDEX: sweep-indent-line
+#+FINDEX: sweeprolog-indent-line
The entry point of the indentation engine is the function
-=sweep-indent-line= which takes no arguments and indents that line at
-point. =sweep-mode= supports the standard Emacs interface for
-indentation by arranging for =sweep-indent-line= to be called whenever a
+=sweeprolog-indent-line= which takes no arguments and indents that line at
+point. =sweeprolog-mode= supports the standard Emacs interface for
+indentation by arranging for =sweeprolog-indent-line= to be called whenever a
line should be indented, notably after pressing =TAB=. For more a full
description of the available commands and options that pertain to
indentation, see [[info:emacs#Indentation][Indentation in the Emacs manual]].
@@ -308,7 +308,7 @@ indentation, see [[info:emacs#Indentation][Indentation in
the Emacs manual]].
:CUSTOM_ID: indentation-rules
:END:
-Lines in =sweep-mode= buffers are indented according to the following
+Lines in =sweeprolog-mode= buffers are indented according to the following
rules:
1. If the current line starts inside a string or a multi-line comment,
@@ -331,14 +331,14 @@ rules:
).
#+end_src
-#+VINDEX: sweep-indent-offset
+#+VINDEX: sweeprolog-indent-offset
4. If the current line is the first non-comment line of a clause body,
indent to the starting column of the head term plus the value of
- the user option =sweep-indent-offset= (by default, four extra
+ the user option =sweeprolog-indent-offset= (by default, four extra
columns).
As an example, this rule yields the following layouts when
- =sweep-indent-offset= is set to the default value of four columns:
+ =sweeprolog-indent-offset= is set to the default value of four columns:
#+begin_src prolog
some_functor(arg1, arg2) :-
@@ -368,7 +368,7 @@ rules:
6. If the last non-comment line ends with a functor and its opening
parenthesis, indent to the starting column of the functor plus
- =sweep-indent-offset=.
+ =sweeprolog-indent-offset=.
This rule yields the following layout:
@@ -378,7 +378,7 @@ rules:
#+end_src
7. If the last non-comment line ends with a prefix operator, indent to
- starting column of the operator plus =sweep-indent-offset=.
+ starting column of the operator plus =sweeprolog-indent-offset=.
This rule yields the following layout:
@@ -393,36 +393,36 @@ rules:
:END:
#+CINDEX: fontification
-=sweep-mode= integrates with the standard Emacs =font-lock= system which
+=sweeprolog-mode= integrates with the standard Emacs =font-lock= system which
is used for highlighting text in buffers (see [[info:emacs#Font Lock][Font
Lock in the Emacs
-manual]]). =sweep-mode= highlights different tokens in Prolog code
+manual]]). =sweeprolog-mode= highlights different tokens in Prolog code
according to their semantics, determined through static analysis which
-is performed on demand. When a buffer is first opened in =sweep-mode=,
+is performed on demand. When a buffer is first opened in =sweeprolog-mode=,
its entire contents are analyzed to collect and cache cross reference
data, and the buffer is highlighted accordingly. In contrast, when
editing and moving around the buffer, a faster, local analysis is
invoked to updated the semantic highlighting in response to changes in
the buffer.
-#+FINDEX: sweep-colourise-buffer
-At any point in a =sweep-mode= buffer, the command =C-c C-c= (or =M-x
-sweep-colourise-buffer=) can be used to update the cross reference
+#+FINDEX: sweeprolog-colourise-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
cache and highlight the buffer accordingly. This may be useful
e.g. after defining a new predicate.
-#+VINDEX: sweep-colourise-buffer-on-idle
-#+VINDEX: sweep-colourise-buffer-max-size
-#+VINDEX: sweep-colourise-buffer-min-interval
-If the user option =sweep-colourise-buffer-on-idle= is set to non-nil
-(as it is by default), =sweep-mode= also updates semantic highlighting
+#+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
+(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
-=sweep-colourise-buffer-max-size= user option ( 100,000 by default).
+=sweeprolog-colourise-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
-=sweep-colourise-buffer-min-interval=.
+=sweeprolog-colourise-buffer-min-interval=.
-#+CINDEX: sweep-faces
+#+CINDEX: sweeprolog-faces
=sweep= defines more than 60 different faces (named sets of properties
that determine the appearance of a specific text in Emacs buffers, see
also [[info:emacs#Faces][Faces in the Emacs manual]]) to signify the specific
semantics of
@@ -435,14 +435,14 @@ each token in a Prolog code buffer. =sweep= comes with
three /styles/:
- The =dark= style mimics the colors used in the SWI-Prolog built-in
editor in dark mode.
-#+VINDEX: sweep-faces-style
-To choose a style, customize the user option =sweep-faces-style= with
-=M-x customize-option RET sweep-faces-style RET=. The new style will
-apply to all new =sweep-mode= buffers. To apply the new style to an
+#+VINDEX: sweeprolog-faces-style
+To choose a style, customize the user option =sweeprolog-faces-style= with
+=M-x customize-option RET sweeprolog-faces-style RET=. The new style will
+apply to all new =sweeprolog-mode= buffers. To apply the new style to an
existing buffer, use =C-x x f= (=font-lock-update=) in that buffer.
To view and customize all of the faces defined and used in =sweep=, type
-=M-x customize-group RET sweep-faces RET=.
+=M-x customize-group RET sweeprolog-faces RET=.
** Term-based editing and motion commands
:PROPERTIES:
@@ -453,7 +453,7 @@ To view and customize all of the faces defined and used in
=sweep=, type
Emacs includes many useful features for operating on syntactic units
in source code buffer, such as marking, transposing and moving over
expressions. By default, these features are geared towards working
-with Lisp expressions, or "sexps". =sweep-mode= extends the Emacs'
+with Lisp expressions, or "sexps". =sweeprolog-mode= extends the Emacs'
notion of syntactic expressions to accommodate for Prolog terms, which
allows the standard sexp-based commands to operate on them seamlessly.
@@ -461,7 +461,7 @@ allows the standard sexp-based commands to operate on them
seamlessly.
[[info:emacs#Expressions][Expressions in the Emacs manual]] covers the most
important commands
that operate on sexps, and by extension on Prolog terms. Another
useful command for Prolog programmers is =M-x kill-backward-up-list=,
-bound by default to =C-M-^= in =sweep-mode= buffers. This command
+bound by default to =C-M-^= in =sweeprolog-mode= buffers. This command
replaces the parent term containing the term at point with the term
itself. To illustrate the utility of this command, consider the
following clause:
@@ -486,11 +486,11 @@ directly:
** Definitions and references
:PROPERTIES:
-:CUSTOM_ID: sweep-xref
+:CUSTOM_ID: sweeprolog-xref
:END:
#+CINDEX: xref
-=sweep-mode= integrates with the Emacs =xref= API to facilitate quick
+=sweeprolog-mode= integrates with the Emacs =xref= API to facilitate quick
access to predicate definitions and references in Prolog code buffers.
This enables the many commands that the =xref= interface provides, like
=M-.= for jumping to the definition of the predicate at point. Refer to
@@ -498,7 +498,7 @@ This enables the many commands that the =xref= interface
provides, like
commands.
#+CINDEX: imenu
-=sweep-mode= also integrates with Emacs' =imenu=, which provides a simple
+=sweeprolog-mode= also integrates with Emacs' =imenu=, which provides a simple
facility for looking up and jumping to definitions in the current
buffer. To jump to a definition in the current buffer, type =M-x imenu=
(bound by default to =M-g i= in Emacs version 29). For information
@@ -509,9 +509,9 @@ about customizing =imenu=, see [[info:emacs#Imenu][Imenu in
the Emacs manual]].
:CUSTOM_ID: following-file-specs
:END:
-#+FINDEX: sweep-find-file-at-point
-File specifications that occur in =sweep-mode= buffers can be followed
-with =C-c C-o= (or =M-x sweep-find-file-at-point=) whenever point is over
+#+FINDEX: sweeprolog-find-file-at-point
+File specifications that occur in =sweeprolog-mode= buffers can be followed
+with =C-c C-o= (or =M-x sweeprolog-find-file-at-point=) whenever point is over
a valid file specification. For example, consider a Prolog file buffer with
the common
directive =use_module/1=:
@@ -531,16 +531,16 @@ For more information about file specifications in
SWI-Prolog, see
:END:
#+CINDEX: loading
-#+FINDEX: sweep-load-buffer
-The command =M-x sweep-load-buffer= can be used to load the contents of
-a =sweep-mode= buffer into the embedded SWI-Prolog runtime. After a
+#+FINDEX: sweeprolog-load-buffer
+The command =M-x sweeprolog-load-buffer= can be used to load the contents of
+a =sweeprolog-mode= buffer into the embedded SWI-Prolog runtime. After a
buffer is loaded, the predicates it defines can be queried from Elisp
(see [[Querying Prolog]]) and from the =sweep= top-level (see [[The Prolog
-top-level]]). In =sweep-mode= buffers, =sweep-load-buffer= is bound by
+top-level]]). In =sweeprolog-mode= buffers, =sweeprolog-load-buffer= is bound
by
default to =C-c C-l=. By default this command loads the current buffer
-if its major mode is =sweep-mode=, and prompts for an appropriate buffer
+if its major mode is =sweeprolog-mode=, and prompts for an appropriate buffer
otherwise. To choose a different buffer to load while visiting a
-=sweep-mode= buffer, invoke =sweep-load-buffer= with a prefix argument
+=sweeprolog-mode= buffer, invoke =sweeprolog-load-buffer= with a prefix
argument
(=C-u C-c C-l=).
More relevant information about loading code in SWI-Prolog can be
@@ -552,16 +552,16 @@ found in
[[https://www.swi-prolog.org/pldoc/man?section=consulting][Loading Prol
:END:
#+CINDEX: top-level
-#+FINDEX: sweep-top-level
+#+FINDEX: sweeprolog-top-level
=sweep= provides a classic Prolog top-level interface for interacting
with the embedded Prolog runtime. To start the top-level, use =M-x
-sweep-top-level=. This command opens a buffer called =*sweep-top-level*=
+sweeprolog-top-level=. This command opens a buffer called
=*sweeprolog-top-level*=
which hosts the live Prolog top-level.
-#+FINDEX: sweep-top-level-mode
-#+VINDEX: sweep-top-level-mode
+#+FINDEX: sweeprolog-top-level-mode
+#+VINDEX: sweeprolog-top-level-mode
The top-level buffer uses a major mode named
-=sweep-top-level-mode=. This mode derives from =comint-mode=, which is the
+=sweeprolog-top-level-mode=. This mode derives from =comint-mode=, which is the
common mode used in Emacs REPL interfaces. As a result, the top-level
buffer inherits the features present in other =comint-mode= derivatives,
most of which are described in [[info:emacs#Shell Mode][the Emacs manual]].
@@ -572,30 +572,30 @@ most of which are described in [[info:emacs#Shell
Mode][the Emacs manual]].
:END:
Any number of top-levels can be created and used concurrently, each in
-its own buffer. If a top-level buffer already exists, =sweep-top-level=
+its own buffer. If a top-level buffer already exists, =sweeprolog-top-level=
will simply open it by default. To create another one or more
-top-level buffers, run =sweep-top-level= with a prefix argument
-(i.e. =C-u M-x sweep-top-level-mode=) to choose a different buffer name.
+top-level buffers, run =sweeprolog-top-level= with a prefix argument
+(i.e. =C-u M-x sweeprolog-top-level-mode=) to choose a different buffer name.
Alternatively, run the command =C-x x u= (or =M-x rename-uniquely=) in the
-buffer called =*sweep-top-level*= and then run =M-x sweep-top-level=
+buffer called =*sweeprolog-top-level*= and then run =M-x sweeprolog-top-level=
again. This will change the name of the original top-level buffer to
-something like =*sweep-top-level*<2>= and allow the new top-level to
-claim the buffer name =*sweep-top-level*=.
+something like =*sweeprolog-top-level*<2>= and allow the new top-level to
+claim the buffer name =*sweeprolog-top-level*=.
** Top-level history
:PROPERTIES:
:CUSTOM_ID: top-level-history
:END:
-=sweep-top-level-mode= buffers provide a history of previously user
+=sweeprolog-top-level-mode= buffers provide a history of previously user
inputs, similarly to other =comint-mode= derivatives such as =shell-mode=.
To insert the last input from the history at the prompt, use =M-p=
(=comint-previous-input=). For a full description of history related
commands, see [[info:emacs#Shell History][Shell History in the Emacs manual]].
-#+VINDEX: sweep-top-level-min-history-length
+#+VINDEX: sweeprolog-top-level-min-history-length
The =sweep= top-level history only records inputs whose length is at
-least =sweep-top-level-min-history-length=. This user option is set to
+least =sweeprolog-top-level-min-history-length=. This user option is set to
3 by default, and should generally be set to at least 2 to keep the
history from being clobbered with single-character inputs, which are
common in the top-level interaction, e.g. =;= as used to invoke
@@ -606,7 +606,7 @@ backtracking.
:CUSTOM_ID: completion-in-top-level
:END:
-The =sweep-top-level-mode=, enabled in the =sweep= top-level buffer,
+The =sweeprolog-top-level-mode=, enabled in the =sweep= top-level buffer,
integrates with the standard Emacs symbol completion mechanism to
provide completion for predicate names. To complete a partial
predicate name in the top-level prompt, use =C-M-i= (or =M-<TAB>=). For
@@ -617,16 +617,16 @@ more information see [[info:emacs#Symbol
Completion][Symbol Completion in the Em
:CUSTOM_ID: finding-prolog-code
:END:
-#+FINDEX: sweep-find-module
-=sweep= provides the command =M-x sweep-find-module= for
+#+FINDEX: sweeprolog-find-module
+=sweep= provides the command =M-x sweeprolog-find-module= for
selecting and jumping to the source code of a loaded or auto-loadable
Prolog module. =sweep= integrates with Emacs' standard completion API
to annotate candidate modules in the completion UI with their =PLDoc=
description when available.
-#+FINDEX: sweep-find-predicate
-Along with =M-x sweep-find-module=, =sweep= provides the
-command =M-x sweep-find-predicate= jumping to the definition a
+#+FINDEX: sweeprolog-find-predicate
+Along with =M-x sweeprolog-find-module=, =sweep= provides the
+command =M-x sweeprolog-find-predicate= jumping to the definition a
loaded or auto-loadable Prolog predicate.
** Prolog file specification expansion
@@ -649,19 +649,19 @@ source of the =pldoc_man= module from the Prolog library,
and likewise
:CUSTOM_ID: quick-command-access
:END:
-#+VINDEX: sweep-prefix-map
-=sweep= defines a keymap called =sweep-prefix-map= which provides
+#+VINDEX: sweeprolog-prefix-map
+=sweep= defines a keymap called =sweeprolog-prefix-map= which provides
keybinding for several useful =sweep= commands. By default,
-=sweep-prefix-map= itself is not bound to any key. To bind it globally
+=sweeprolog-prefix-map= itself is not bound to any key. To bind it globally
to a prefix key, e.g. =C-c p=, use:
#+begin_src emacs-lisp
- (keymap-global-set "C-c p" sweep-prefix-map)
+ (keymap-global-set "C-c p" sweeprolog-prefix-map)
#+end_src
As an example, with the above binding the =sweep= top-level can be
accessed from anywhere with =C-c p t=, which invokes the command
-=sweep-top-level=.
+=sweeprolog-top-level=.
* Examining Prolog messages
:PROPERTIES:
@@ -669,11 +669,11 @@ accessed from anywhere with =C-c p t=, which invokes the
command
:END:
#+CINDEX: messages
-#+VINDEX: sweep-messages-buffer-name
+#+VINDEX: sweeprolog-messages-buffer-name
Messages emitted by the embedded Prolog are redirected by =sweep= to a
dedicated Emacs buffer. By default, the =sweep= messages buffer is
named =*sweep Messages*=. To instruct =sweep= to use another buffer name
-instead, type =M-x customize-option RET sweep-messages-buffer-name RET=
+instead, type =M-x customize-option RET sweeprolog-messages-buffer-name RET=
and set the option to a suitable value.
The =sweep= messages buffer uses the minor mode =compilation-minor-mode=,
@@ -682,10 +682,10 @@ warning directly from the corresponding message in the
=sweep= messages
buffer. For more information about the features enabled by
=compilation-minor-mode=, see [[info:emacs#Compilation Mode][Compilation Mode
in the Emacs manual]].
-#+FINDEX: sweep-view-messages
-=sweep= includes the command =sweep-view-messages= for quickly switching
+#+FINDEX: sweeprolog-view-messages
+=sweep= includes the command =sweeprolog-view-messages= for quickly switching
to the =sweep= messages buffer. This command is bound by default in
-=sweep-prefix-map= to the =e= key (see [[Quick access to sweep commands]]).
+=sweeprolog-prefix-map= to the =e= key (see [[Quick access to sweep
commands]]).
* Setting Prolog flags
:PROPERTIES:
@@ -693,8 +693,8 @@ to the =sweep= messages buffer. This command is bound by
default in
:END:
#+CINDEX: prolog flags
-#+FINDEX: sweep-set-prolog-flag
-The command =M-x sweep-set-prolog-flag= can be used to interactively
+#+FINDEX: sweeprolog-set-prolog-flag
+The command =M-x sweeprolog-set-prolog-flag= can be used to interactively
configure the embedded Prolog execution environment by changing the
values of Prolog flags. This command first prompts the user for a
Prolog flag to set, with completion candidates annotated with their
@@ -715,7 +715,7 @@ A = "foo".
We can change the interpretation of double quotes to denote lists of
character codes, by setting the value the =double_quotes= flag to =codes=
-with =M-x sweep-set-prolog-flag RET double_quotes RET codes RET=.
+with =M-x sweeprolog-set-prolog-flag RET double_quotes RET codes RET=.
Evaluating =A = "foo"= again exhibits the different interpretation:
#+begin_src prolog
@@ -728,8 +728,8 @@ A = [102, 111, 111].
:CUSTOM_ID: prolog-packages
:END:
-#+FINDEX: sweep-pack-install
-The command =M-x sweep-pack-install= can be used to install
+#+FINDEX: sweeprolog-pack-install
+The command =M-x sweeprolog-pack-install= can be used to install
or upgrade a SWI-Prolog =pack=. When selecting a =pack= to install, the
completion candidates are annotated with description and the version
of each package.
diff --git a/sweep.c b/sweep.c
index bf224b01c3..301362b862 100644
--- a/sweep.c
+++ b/sweep.c
@@ -550,7 +550,7 @@ emacs_module_init (struct emacs_runtime *runtime)
{
emacs_env *env = runtime->get_environment (runtime);
- emacs_value symbol_initialize = env->intern (env, "sweep-initialize");
+ emacs_value symbol_initialize = env->intern (env, "sweeprolog-initialize");
emacs_value func_initialize =
env->make_function(env,
1, emacs_variadic_function,
@@ -562,7 +562,7 @@ REST is passed as the rest of the command line arguments to
Prolog.",
emacs_value args_initialize[] = {symbol_initialize, func_initialize};
env->funcall (env, env->intern (env, "defalias"), 2, args_initialize);
- emacs_value symbol_is_initialized = env->intern (env, "sweep-initialized-p");
+ emacs_value symbol_is_initialized = env->intern (env,
"sweeprolog-initialized-p");
emacs_value func_is_initialized =
env->make_function(env,
0, 0,
@@ -572,7 +572,7 @@ REST is passed as the rest of the command line arguments to
Prolog.",
emacs_value args_is_initialized[] = {symbol_is_initialized,
func_is_initialized};
env->funcall (env, env->intern (env, "defalias"), 2, args_is_initialized);
- emacs_value symbol_open_query = env->intern (env, "sweep-open-query");
+ emacs_value symbol_open_query = env->intern (env, "sweeprolog-open-query");
emacs_value func_open_query =
env->make_function(env,
4, 5,
@@ -583,23 +583,23 @@ ARG2 and ARG3 are strings designating the module and
predicate name of the Prolo
ARG4 is any object that can be converted to a Prolog term, and will be passed
as the first argument of the invoked predicate.\n\
The second argument of the predicate is left unbound and is assumed to treated
by the invoked predicate as an output variable.\n\
If ARG5 is non-nil, reverse the order of the predicate arguments such that the
first argument is the output variable and the second argument is the input term
derived from ARG4.\n\
-Further instantiations of the output variable can be examined via
`sweep-next-solution'.",
+Further instantiations of the output variable can be examined via
`sweeprolog-next-solution'.",
NULL);
emacs_value args_open_query[] = {symbol_open_query, func_open_query};
env->funcall (env, env->intern (env, "defalias"), 2, args_open_query);
- emacs_value symbol_next_solution = env->intern (env, "sweep-next-solution");
+ emacs_value symbol_next_solution = env->intern (env,
"sweeprolog-next-solution");
emacs_value func_next_solution =
env->make_function(env,
0, 0,
sweep_next_solution,
"Return the next solution from Prolog, or nil if there
are none.\n\
-See also `sweep-open-query'.",
+See also `sweeprolog-open-query'.",
NULL);
emacs_value args_next_solution[] = {symbol_next_solution,
func_next_solution};
env->funcall (env, env->intern (env, "defalias"), 2, args_next_solution);
- emacs_value symbol_cut_query = env->intern (env, "sweep-cut-query");
+ emacs_value symbol_cut_query = env->intern (env, "sweeprolog-cut-query");
emacs_value func_cut_query =
env->make_function(env,
0, 0,
@@ -610,7 +610,7 @@ This function retains the current instantiation of the
query variables.",
emacs_value args_cut_query[] = {symbol_cut_query, func_cut_query};
env->funcall (env, env->intern (env, "defalias"), 2, args_cut_query);
- emacs_value symbol_close_query = env->intern (env, "sweep-close-query");
+ emacs_value symbol_close_query = env->intern (env, "sweeprolog-close-query");
emacs_value func_close_query =
env->make_function(env,
0, 0,
@@ -622,7 +622,7 @@ This function drops the current instantiation of the query
variables.",
env->funcall (env, env->intern (env, "defalias"), 2, args_close_query);
- emacs_value symbol_cleanup = env->intern (env, "sweep-cleanup");
+ emacs_value symbol_cleanup = env->intern (env, "sweeprolog-cleanup");
emacs_value func_cleanup = env->make_function (env, 0, 0, sweep_cleanup,
"Cleanup Prolog.", NULL);
emacs_value args_cleanup[] = {symbol_cleanup, func_cleanup};
env->funcall (env, env->intern (env, "defalias"), 2, args_cleanup);
diff --git a/sweep.pl b/sweep.pl
index 844bd36f18..b1fba490bb 100644
--- a/sweep.pl
+++ b/sweep.pl
@@ -134,7 +134,7 @@ sweep_colourise_buffer_(Path0, Contents, []) :-
sweep_handle_color(1)),
forall(sweep_current_comment(Kind, Start, Len),
( atom_string(Kind, String),
- user:sweep_funcall("sweep--colourise",
[Start,Len,"comment"|String], _)
+ user:sweep_funcall("sweeprolog--colourise",
[Start,Len,"comment"|String], _)
)),
erase(Ref0),
erase(Ref1).
@@ -325,7 +325,7 @@ sweep_colourise_some_terms_(Path0, Offset, Contents, []) :-
[operators(Ops)]),
forall(sweep_current_comment(Kind, Start, Len),
( atom_string(Kind, String),
- user:sweep_funcall("sweep--colourise",
[Start,Len,"comment"|String], _)
+ user:sweep_funcall("sweeprolog--colourise",
[Start,Len,"comment"|String], _)
)).
sweep_documentation([Path, Functor, Arity], Docs) :-
@@ -614,7 +614,7 @@ sweep_colourise_query([String|Offset], _) :-
sweep_handle_query_color(Offset, Col, Beg, Len) :-
sweep_color_normalized(Offset, Col, Nom),
Start is Beg + Offset,
- user:sweep_funcall("sweep--colourise", [Start,Len|Nom], _).
+ user:sweep_funcall("sweeprolog--colourise", [Start,Len|Nom], _).
sweep_color_normalized(Offset, Col, Nom) :-
Col =.. [Nom0|Rest],
@@ -674,14 +674,14 @@ sweep_setup_message_hook(_, _) :-
retractall(user:thread_message_hook(_, _, _)),
asserta((
user:thread_message_hook(Term, Kind, Lines) :-
- sweep_message_hook(Term, Kind, Lines)
+ sweep_message_hook(Term, Kind, Lines)
)).
sweep_message_hook(Term, Kind0, _Lines) :-
should_handle_message_kind(Kind0, Kind),
!,
message_to_string(Term, String),
- user:sweep_funcall("sweep-message", [Kind|String], _).
+ user:sweep_funcall("sweeprolog-message", [Kind|String], _).
should_handle_message_kind(error, "error").
should_handle_message_kind(warning, "warning").
diff --git a/sweep-tests.el b/sweeprolog-tests.el
similarity index 62%
rename from sweep-tests.el
rename to sweeprolog-tests.el
index 6733838780..bb51661d69 100644
--- a/sweep-tests.el
+++ b/sweeprolog-tests.el
@@ -1,36 +1,38 @@
-;;; sweep-tests.el --- ERT suite for sweep -*- lexical-binding:t -*-
+;;; sweeprolog-tests.el --- ERT suite for sweep -*- lexical-binding:t -*-
+
+(require 'sweeprolog)
(ert-deftest lists:member/2 ()
"Tests calling the Prolog predicate permutation/2 from Elisp."
- (should (equal (sweep-open-query "user" "lists" "member" (list 1 2 3) t) t))
- (should (equal (sweep-next-solution) (cons t 1)))
- (should (equal (sweep-next-solution) (cons t 2)))
- (should (equal (sweep-next-solution) (cons '! 3)))
- (should (equal (sweep-cut-query) t)))
+ (should (equal (sweeprolog-open-query "user" "lists" "member" (list 1 2 3)
t) t))
+ (should (equal (sweeprolog-next-solution) (cons t 1)))
+ (should (equal (sweeprolog-next-solution) (cons t 2)))
+ (should (equal (sweeprolog-next-solution) (cons '! 3)))
+ (should (equal (sweeprolog-cut-query) t)))
(ert-deftest lists:permutation/2 ()
"Tests calling the Prolog predicate permutation/2 from Elisp."
- (should (equal (sweep-open-query "user" "lists" "permutation" (list 1 2 3))
t))
- (should (equal (sweep-next-solution) (list t 1 2 3)))
- (should (equal (sweep-next-solution) (list t 1 3 2)))
- (should (equal (sweep-next-solution) (list t 2 1 3)))
- (should (equal (sweep-next-solution) (list t 2 3 1)))
- (should (equal (sweep-next-solution) (list t 3 1 2)))
- (should (equal (sweep-next-solution) (list t 3 2 1)))
- (should (equal (sweep-next-solution) nil))
- (should (equal (sweep-cut-query) t)))
+ (should (equal (sweeprolog-open-query "user" "lists" "permutation" (list 1 2
3)) t))
+ (should (equal (sweeprolog-next-solution) (list t 1 2 3)))
+ (should (equal (sweeprolog-next-solution) (list t 1 3 2)))
+ (should (equal (sweeprolog-next-solution) (list t 2 1 3)))
+ (should (equal (sweeprolog-next-solution) (list t 2 3 1)))
+ (should (equal (sweeprolog-next-solution) (list t 3 1 2)))
+ (should (equal (sweeprolog-next-solution) (list t 3 2 1)))
+ (should (equal (sweeprolog-next-solution) nil))
+ (should (equal (sweeprolog-cut-query) t)))
(ert-deftest system:=/2 ()
"Tests unifying Prolog terms with =/2 from Elisp."
- (should (equal (sweep-open-query "user" "system" "=" (list 1 nil (list "foo"
"bar") 3.14)) t))
- (should (equal (sweep-next-solution) (list '! 1 nil (list "foo" "bar")
3.14)))
- (should (equal (sweep-next-solution) nil))
- (should (equal (sweep-cut-query) t)))
+ (should (equal (sweeprolog-open-query "user" "system" "=" (list 1 nil (list
"foo" "bar") 3.14)) t))
+ (should (equal (sweeprolog-next-solution) (list '! 1 nil (list "foo" "bar")
3.14)))
+ (should (equal (sweeprolog-next-solution) nil))
+ (should (equal (sweeprolog-cut-query) t)))
-(defun sweep-test-indentation (given expected)
+(defun sweeprolog-test-indentation (given expected)
(with-temp-buffer
- (sweep-mode)
+ (sweeprolog-mode)
(insert given)
(indent-region-line-by-line (point-min) (point-max))
(should (string= (buffer-substring-no-properties (point-min) (point-max))
@@ -38,7 +40,7 @@
(ert-deftest indentation ()
"Tests indentation rules."
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
some_functor(
arg1,
@@ -50,7 +52,7 @@ some_functor(
arg2,
)."
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
asserta( some_functor(arg1, arg2) :-
body_term
@@ -62,7 +64,7 @@ asserta( some_functor(arg1, arg2) :-
).
"
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
:- module(spam, [ foo,
bar,
@@ -78,7 +80,7 @@ baz
).
"
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
:- module(spam, [
foo,
@@ -96,7 +98,7 @@ baz
).
"
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
[
].
@@ -106,7 +108,7 @@ baz
].
"
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
:-
use_module(foo),
@@ -118,7 +120,7 @@ use_module(bar).
use_module(bar).
"
)
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
colourise_declaration(Module:PI, _, TB,
term_position(_,_,QF,QT,[PM,PG])) :-
@@ -147,7 +149,7 @@ colourise_declaration(Module:PI, _, TB,
; colour_item(type_error(predicate_indicator), TB, PG)
).
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
A is 1 * 2 + 3 *
4.
@@ -156,7 +158,7 @@ A is 1 * 2 + 3 *
A is 1 * 2 + 3 *
4.
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
A is 1 * 2 ^ 3 *
4.
@@ -165,7 +167,7 @@ A is 1 * 2 ^ 3 *
A is 1 * 2 ^ 3 *
4.
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
( if
-> ( iff1, iff2, iff3,
@@ -186,7 +188,7 @@ iff4
; else
)
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
( if
-> ( iff
@@ -205,7 +207,7 @@ iff4
; else
)
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
( if
; then
@@ -218,7 +220,7 @@ iff4
-> else
)
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
asserta( foo(bar, baz) :-
true).
@@ -227,7 +229,7 @@ true).
asserta( foo(bar, baz) :-
true).
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
foo(bar, baz) :-
true.
@@ -237,7 +239,7 @@ foo(bar, baz) :-
true.
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
:- multifile
foo/2.
@@ -247,7 +249,7 @@ foo/2.
foo/2.
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
%%%%
%%%%
@@ -257,14 +259,14 @@ foo/2.
%%%%
")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
(
foo"
"
(
foo")
- (sweep-test-indentation
+ (sweeprolog-test-indentation
"
functor(
foo"
@@ -273,4 +275,4 @@ functor(
foo")
)
-;;; sweep-tests.el ends here
+;;; sweeprolog-tests.el ends here
diff --git a/sweep.el b/sweeprolog.el
similarity index 61%
rename from sweep.el
rename to sweeprolog.el
index c647417f86..e1c3cd9928 100644
--- a/sweep.el
+++ b/sweeprolog.el
@@ -1,4 +1,4 @@
-;;; sweep.el --- Embedded SWI-Prolog -*- lexical-binding:t -*-
+;;; sweeprolog.el --- Embedded SWI-Prolog -*- lexical-binding:t -*-
;; Copyright (C) 2022 Eshel Yaron
@@ -6,7 +6,7 @@
;; Maintainer: Eshel Yaron <me(at)eshelyaron(dot)com>
;; Keywords: prolog languages extensions
;; URL: https://git.sr.ht/~eshel/sweep
-;; Package-Version: 0.3.3
+;; Package-Version: 0.4.0
;; Package-Requires: ((emacs "28"))
;; This file is NOT part of GNU Emacs.
@@ -30,120 +30,120 @@
(require 'comint)
(require 'xref)
-(defgroup sweep nil
+(defgroup sweeprolog nil
"SWI-Prolog Embedded in Emacs."
:group 'prolog)
-(defcustom sweep-indent-offset 4
- "Number of columns to indent lines with in `sweep-mode' buffers."
- :package-version '((sweep . "0.3.1"))
+(defcustom sweeprolog-indent-offset 4
+ "Number of columns to indent lines with in `sweeprolog-mode' buffers."
+ :package-version '((sweeprolog . "0.3.1"))
:type 'integer
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-colourise-buffer-on-idle t
- "If non-nil, update highlighting of `sweep-mode' buffers on idle."
- :package-version '((sweep . "0.2.0"))
+(defcustom sweeprolog-colourise-buffer-on-idle t
+ "If non-nil, update highlighting of `sweeprolog-mode' buffers on idle."
+ :package-version '((sweeprolog . "0.2.0"))
:type 'boolean
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-colourise-buffer-max-size 100000
+(defcustom sweeprolog-colourise-buffer-max-size 100000
"Maximum buffer size to recolourise on idle."
- :package-version '((sweep . "0.2.0"))
+ :package-version '((sweeprolog . "0.2.0"))
:type 'integer
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-colourise-buffer-min-interval 2
+(defcustom sweeprolog-colourise-buffer-min-interval 2
"Minimum idle time to wait before recolourising the buffer."
- :package-version '((sweep . "0.2.0"))
+ :package-version '((sweeprolog . "0.2.0"))
:type 'float
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-swipl-path nil
+(defcustom sweeprolog-swipl-path nil
"Path to the swipl executable.
When non-nil, this is used by the embedded SWI-Prolog runtime to
locate its \"home\" directory. Otherwise, the `executable-find'
is used to find a the swipl executable."
- :package-version '((sweep . "0.1.1"))
+ :package-version '((sweeprolog . "0.1.1"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-messages-buffer-name "*sweep Messages*"
+(defcustom sweeprolog-messages-buffer-name "*sweep Messages*"
"The name of the buffer to use for logging Prolog messages."
- :package-version '((sweep . "0.1.1"))
+ :package-version '((sweeprolog . "0.1.1"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-read-flag-prompt "Flag: "
+(defcustom sweeprolog-read-flag-prompt "Flag: "
"Prompt used for reading a Prolog flag name from the minibuffer."
- :package-version '((sweep . "0.1.2"))
+ :package-version '((sweeprolog . "0.1.2"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-read-module-prompt "Module: "
+(defcustom sweeprolog-read-module-prompt "Module: "
"Prompt used for reading a Prolog module name from the minibuffer."
- :package-version '((sweep . "0.1.0"))
+ :package-version '((sweeprolog . "0.1.0"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-read-predicate-prompt "Predicate: "
+(defcustom sweeprolog-read-predicate-prompt "Predicate: "
"Prompt used for reading a Prolog precicate name from the minibuffer."
- :package-version '((sweep . "0.1.0"))
+ :package-version '((sweeprolog . "0.1.0"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-read-pack-prompt "Pack: "
+(defcustom sweeprolog-read-pack-prompt "Pack: "
"Prompt used for reading a Prolog pack name from the minibuffer."
- :package-version '((sweep . "0.1.0"))
+ :package-version '((sweeprolog . "0.1.0"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-top-level-display-action nil
- "Display action used for displaying the `sweep-top-level' buffer."
- :package-version '((sweep . "0.1.0"))
+(defcustom sweeprolog-top-level-display-action nil
+ "Display action used for displaying the `sweeprolog-top-level' buffer."
+ :package-version '((sweeprolog . "0.1.0"))
:type 'function
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-top-level-min-history-length 3
- "Minimum input length to record in the `sweep-top-level' history.
+(defcustom sweeprolog-top-level-min-history-length 3
+ "Minimum input length to record in the `sweeprolog-top-level' history.
Inputs shorther than the value of this variable will not be
-inserted to the input history in `sweep-top-level-mode' buffers."
- :package-version '((sweep . "0.2.1"))
+inserted to the input history in `sweeprolog-top-level-mode' buffers."
+ :package-version '((sweeprolog . "0.2.1"))
:type 'string
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-init-on-load t
- "If non-nil, initialize Prolog when `sweep' is loaded."
- :package-version '((sweep "0.1.0"))
+(defcustom sweeprolog-init-on-load t
+ "If non-nil, initialize Prolog when `sweeprolog' is loaded."
+ :package-version '((sweeprolog "0.1.0"))
:type 'boolean
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-init-args (list "-q"
+(defcustom sweeprolog-init-args (list "-q"
"--no-signals"
"-g"
"[library(sweep)]")
"List of strings used as initialization arguments for Prolog."
- :package-version '((sweep "0.3.1"))
- :type '(list string)
- :group 'sweep)
+ :package-version '((sweeprolog "0.3.1"))
+ :type '(repeat string)
+ :group 'sweeprolog)
-(defvar sweep-prolog-server-port nil)
+(defvar sweeprolog-prolog-server-port nil)
-(declare-function sweep-initialize "sweep-module")
-(declare-function sweep-initialized-p "sweep-module")
-(declare-function sweep-open-query "sweep-module")
-(declare-function sweep-next-solution "sweep-module")
-(declare-function sweep-cut-query "sweep-module")
-(declare-function sweep-close-query "sweep-module")
-(declare-function sweep-cleanup "sweep-module")
+(declare-function sweeprolog-initialize "sweep-module")
+(declare-function sweeprolog-initialized-p "sweep-module")
+(declare-function sweeprolog-open-query "sweep-module")
+(declare-function sweeprolog-next-solution "sweep-module")
+(declare-function sweeprolog-cut-query "sweep-module")
+(declare-function sweeprolog-close-query "sweep-module")
+(declare-function sweeprolog-cleanup "sweep-module")
-(defun sweep--ensure-module ()
+(defun sweeprolog--ensure-module ()
(let ((sweep-module-path (car
(save-match-data
(split-string
(shell-command-to-string
(concat
- (or sweep-swipl-path (executable-find
"swipl"))
+ (or sweeprolog-swipl-path (executable-find
"swipl"))
" -g"
" write_sweep_module_location"
" -t"
@@ -151,65 +151,65 @@ inserted to the input history in `sweep-top-level-mode'
buffers."
"\n")))))
(load sweep-module-path)))
-(defface sweep-debug-prefix-face
+(defface sweeprolog-debug-prefix-face
'((default :inherit shadow))
"Face used to highlight the \"DEBUG\" message prefix."
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
-(defvar sweep-debug-prefix-face 'sweep-debug-prefix-face
+(defvar sweeprolog-debug-prefix-face 'sweeprolog-debug-prefix-face
"Name of the face used to highlight the \"DEBUG\" message prefix.")
-(defface sweep-debug-topic-face
+(defface sweeprolog-debug-topic-face
'((default :inherit shadow))
"Face used to highlight the topic in debug messages."
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
-(defvar sweep-debug-topic-face 'sweep-debug-topic-face
+(defvar sweeprolog-debug-topic-face 'sweeprolog-debug-topic-face
"Name of the face used to highlight the topic in debug messages.")
-(defface sweep-info-prefix-face
+(defface sweeprolog-info-prefix-face
'((default :inherit default))
"Face used to highlight the \"INFO\" message prefix."
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
-(defvar sweep-info-prefix-face 'sweep-info-prefix-face
+(defvar sweeprolog-info-prefix-face 'sweeprolog-info-prefix-face
"Name of the face used to highlight the \"INFO\" message prefix.")
-(defface sweep-warning-prefix-face
+(defface sweeprolog-warning-prefix-face
'((default :inherit font-lock-warning-face))
"Face used to highlight the \"WARNING\" message prefix."
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
-(defvar sweep-warning-prefix-face 'sweep-warning-prefix-face
+(defvar sweeprolog-warning-prefix-face 'sweeprolog-warning-prefix-face
"Name of the face used to highlight the \"WARNING\" message prefix.")
-(defface sweep-error-prefix-face
+(defface sweeprolog-error-prefix-face
'((default :inherit error))
"Face used to highlight the \"ERROR\" message prefix."
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
-(defvar sweep-error-prefix-face 'sweep-error-prefix-face
+(defvar sweeprolog-error-prefix-face 'sweeprolog-error-prefix-face
"Name of the face used to highlight the \"ERROR\" message prefix.")
-(defun sweep-view-messages ()
+(defun sweeprolog-view-messages ()
"View the log of recent Prolog messages."
(interactive)
- (with-current-buffer (get-buffer-create sweep-messages-buffer-name)
+ (with-current-buffer (get-buffer-create sweeprolog-messages-buffer-name)
(goto-char (point-max))
(let ((win (display-buffer (current-buffer))))
(set-window-point win (point))
win)))
-(defun sweep-current-prolog-flags (&optional prefix)
- (sweep-open-query "user" "sweep" "sweep_current_prolog_flags" (or prefix ""))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(defun sweeprolog-current-prolog-flags (&optional 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))))
-(defun sweep-read-prolog-flag ()
+(defun sweeprolog-read-prolog-flag ()
"Read a Prolog flag from the minibuffer, with completion."
- (let* ((col (sweep-current-prolog-flags))
+ (let* ((col (sweeprolog-current-prolog-flags))
(completion-extra-properties
(list :annotation-function
(lambda (key)
@@ -219,123 +219,123 @@ inserted to the input history in `sweep-top-level-mode'
buffers."
(max (- 32 (length key)) 1) ? )
val)
nil))))))
- (completing-read sweep-read-flag-prompt col)))
+ (completing-read sweeprolog-read-flag-prompt col)))
-(defun sweep-set-prolog-flag (flag value)
+(defun sweeprolog-set-prolog-flag (flag value)
"Set the Prolog flag FLAG to VALUE.
FLAG and VALUE are specified as strings and read as Prolog terms."
- (interactive (let ((f (sweep-read-prolog-flag)))
+ (interactive (let ((f (sweeprolog-read-prolog-flag)))
(list f (read-string (concat "Set " f " to: ")))))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_set_prolog_flag"
(cons flag value))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (if (sweep-true-p sol)
+ (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))))
-(defun sweep-setup-message-hook ()
- (with-current-buffer (get-buffer-create sweep-messages-buffer-name)
+(defun sweeprolog-setup-message-hook ()
+ (with-current-buffer (get-buffer-create sweeprolog-messages-buffer-name)
(setq-local window-point-insertion-type t)
(compilation-minor-mode 1))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_setup_message_hook"
nil)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
sol))
-(defun sweep-message (message)
- (with-current-buffer (get-buffer-create sweep-messages-buffer-name)
+(defun sweeprolog-message (message)
+ (with-current-buffer (get-buffer-create sweeprolog-messages-buffer-name)
(save-excursion
(goto-char (point-max))
(let ((kind (car message))
(content (cdr message)))
(pcase kind
(`("debug" . ,topic)
- (insert (propertize "DEBUG" 'face sweep-debug-prefix-face))
+ (insert (propertize "DEBUG" 'face sweeprolog-debug-prefix-face))
(insert "[")
- (insert (propertize topic 'face sweep-debug-topic-face))
+ (insert (propertize topic 'face sweeprolog-debug-topic-face))
(insert "]: ")
(insert content))
("informational"
- (insert (propertize "INFO" 'face sweep-info-prefix-face))
+ (insert (propertize "INFO" 'face sweeprolog-info-prefix-face))
(insert ": ")
(insert content))
("warning"
- (insert (propertize "WARNING" 'face sweep-warning-prefix-face))
+ (insert (propertize "WARNING" 'face sweeprolog-warning-prefix-face))
(insert ": ")
(insert content))
("error"
- (insert (propertize "ERROR" 'face sweep-error-prefix-face))
+ (insert (propertize "ERROR" 'face sweeprolog-error-prefix-face))
(insert ": ")
(insert content))))
(newline))))
-(defun sweep-start-prolog-server ()
- (sweep-open-query "user"
+(defun sweeprolog-start-prolog-server ()
+ (sweeprolog-open-query "user"
"prolog_server"
"prolog_server"
nil t)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
- (setq sweep-prolog-server-port (cdr sol)))))
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
+ (setq sweeprolog-prolog-server-port (cdr sol)))))
-(defun sweep-init ()
- (apply #'sweep-initialize
- (cons (or sweep-swipl-path (executable-find "swipl"))
- sweep-init-args))
- (sweep-setup-message-hook)
- (sweep-start-prolog-server))
+(defun sweeprolog-init ()
+ (apply #'sweeprolog-initialize
+ (cons (or sweeprolog-swipl-path (executable-find "swipl"))
+ sweeprolog-init-args))
+ (sweeprolog-setup-message-hook)
+ (sweeprolog-start-prolog-server))
-(defvar sweep-predicate-completion-collection nil)
+(defvar sweeprolog-predicate-completion-collection nil)
-(defvar-local sweep-buffer-module "user")
+(defvar-local sweeprolog-buffer-module "user")
-(defun sweep-local-predicates-collection (&optional prefix)
- (sweep-open-query "user" "sweep" "sweep_local_predicate_completion"
- (cons sweep-buffer-module
+(defun sweeprolog-local-predicates-collection (&optional prefix)
+ (sweeprolog-open-query "user" "sweep" "sweep_local_predicate_completion"
+ (cons sweeprolog-buffer-module
prefix))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
- (setq sweep-predicate-completion-collection (cdr sol)))))
-
-(defun sweep-predicates-collection (&optional prefix)
- (sweep-open-query "user" "sweep" "sweep_predicates_collection" prefix)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
+ (setq sweeprolog-predicate-completion-collection (cdr sol)))))
+
+(defun sweeprolog-predicates-collection (&optional 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))))
-(defun sweep-predicate-references (mfn)
- (sweep-open-query "user" "sweep" "sweep_predicate_references" mfn)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(defun sweeprolog-predicate-references (mfn)
+ (sweeprolog-open-query "user" "sweep" "sweep_predicate_references" mfn)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(cdr sol))))
-(defun sweep-predicate-location (mfn)
- (sweep-open-query "user" "sweep" "sweep_predicate_location" mfn)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(defun sweeprolog-predicate-location (mfn)
+ (sweeprolog-open-query "user" "sweep" "sweep_predicate_location" mfn)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(cdr sol))))
-(defun sweep-predicate-apropos (pattern)
- (sweep-open-query "user" "sweep" "sweep_predicate_apropos" pattern)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(defun sweeprolog-predicate-apropos (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))))
-(defun sweep-read-predicate ()
+(defun sweeprolog-read-predicate ()
"Read a Prolog predicate (M:F/N) from the minibuffer, with completion."
- (let* ((col (sweep-predicates-collection))
+ (let* ((col (sweeprolog-predicates-collection))
(completion-extra-properties
(list :annotation-function
(lambda (key)
@@ -343,9 +343,9 @@ FLAG and VALUE are specified as strings and read as Prolog
terms."
(if val
(concat (make-string (- 64 (length key)) ? ) (car val))
nil))))))
- (completing-read sweep-read-predicate-prompt col)))
+ (completing-read sweeprolog-read-predicate-prompt col)))
-(defun sweep-predicate-prefix-boundaries (&optional point)
+(defun sweeprolog-predicate-prefix-boundaries (&optional point)
(let ((case-fold-search nil))
(save-mark-and-excursion
(save-match-data
@@ -364,25 +364,25 @@ FLAG and VALUE are specified as strings and read as
Prolog terms."
(forward-char))
(cons start (point))))))))
-(defun sweep-prefix-operators (&optional file)
- (sweep-open-query "user"
+(defun sweeprolog-prefix-operators (&optional file)
+ (sweeprolog-open-query "user"
"sweep" "sweep_prefix_ops"
(or file (buffer-file-name)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(cdr sol))))
-(defun sweep-completion-at-point-function ()
- (when-let ((bounds (sweep-predicate-prefix-boundaries)))
+(defun sweeprolog-completion-at-point-function ()
+ (when-let ((bounds (sweeprolog-predicate-prefix-boundaries)))
(let ((start (car bounds))
(end (cdr bounds)))
(list start end
- (completion-table-with-cache #'sweep-local-predicates-collection)
+ (completion-table-with-cache
#'sweeprolog-local-predicates-collection)
:exclusive 'no
:annotation-function
(lambda (key)
- (when-let ((ann (cdr (assoc-string key
sweep-predicate-completion-collection))))
+ (when-let ((ann (cdr (assoc-string key
sweeprolog-predicate-completion-collection))))
(concat " " (mapconcat #'identity ann ","))))
:exit-function
(lambda (key sts)
@@ -403,7 +403,7 @@ FLAG and VALUE are specified as strings and read as Prolog
terms."
(cadr
(assoc-string
key
- sweep-predicate-completion-collection)))))
+
sweeprolog-predicate-completion-collection)))))
(insert "(")
(dotimes (_ (1- arity))
(insert "_, "))
@@ -411,12 +411,12 @@ FLAG and VALUE are specified as strings and read as
Prolog terms."
(goto-char (1- opoint))))))))))))))
;;;###autoload
-(defun sweep-find-predicate (mfn)
+(defun sweeprolog-find-predicate (mfn)
"Jump to the definition of the Prolog predicate MFN.
MFN must be a string of the form \"M:F/N\" where M is a Prolog
module name, F is a functor name and N is its arity."
- (interactive (list (sweep-read-predicate)))
- (if-let ((loc (sweep-predicate-location mfn)))
+ (interactive (list (sweeprolog-read-predicate)))
+ (if-let ((loc (sweeprolog-predicate-location mfn)))
(let ((path (car loc))
(line (or (cdr loc) 1)))
(find-file path)
@@ -424,23 +424,23 @@ module name, F is a functor name and N is its arity."
(forward-line (1- line)))
(user-error "Unable to locate predicate %s" mfn)))
-(defun sweep-modules-collection ()
- (sweep-open-query "user" "sweep" "sweep_modules_collection" nil)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(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))))
-(defun sweep-module-path (mod)
- (sweep-open-query "user" "sweep" "sweep_module_path" mod)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+(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))))
-(defun sweep-read-module-name ()
+(defun sweeprolog-read-module-name ()
"Read a Prolog module name from the minibuffer, with completion."
- (let* ((col (sweep-modules-collection))
+ (let* ((col (sweeprolog-modules-collection))
(completion-extra-properties
(list :annotation-function
(lambda (key)
@@ -451,32 +451,32 @@ module name, F is a functor name and N is its arity."
(if des
(concat pat (make-string (max 0 (- 80 (length
pat))) ? ) des)
pat)))))))
- (completing-read sweep-read-module-prompt col)))
+ (completing-read sweeprolog-read-module-prompt col)))
-(defun sweep--set-buffer-module ()
- (sweep-open-query "user" "sweep" "sweep_path_module" (buffer-file-name))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
- (setq sweep-buffer-module (cdr sol)))))
+(defun sweeprolog--set-buffer-module ()
+ (sweeprolog-open-query "user" "sweep" "sweep_path_module" (buffer-file-name))
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
+ (setq sweeprolog-buffer-module (cdr sol)))))
;;;###autoload
-(defun sweep-find-module (mod)
+(defun sweeprolog-find-module (mod)
"Jump to the source file of the Prolog module MOD."
- (interactive (list (sweep-read-module-name)))
- (find-file (sweep-module-path mod)))
-
-(defun sweep-packs-collection ()
- (sweep-open-query "user" "sweep" "sweep_packs_collection" "")
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (interactive (list (sweeprolog-read-module-name)))
+ (find-file (sweeprolog-module-path mod)))
+
+(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))))
-(defun sweep-read-pack-name ()
+(defun sweeprolog-read-pack-name ()
"Read a Prolog pack name from the minibuffer, with completion."
- (let* ((col (sweep-packs-collection))
+ (let* ((col (sweeprolog-packs-collection))
(completion-extra-properties
(list :annotation-function
(lambda (key)
@@ -487,696 +487,695 @@ module name, F is a functor name and N is its arity."
(if des
(concat ver (make-string (max 0 (- 16 (length
ver))) ? ) des)
ver)))))))
- (completing-read sweep-read-pack-prompt col)))
+ (completing-read sweeprolog-read-pack-prompt col)))
-(defun sweep-true-p (sol)
+(defun sweeprolog-true-p (sol)
(or (eq (car sol) '!)
(eq (car sol) t)))
;;;###autoload
-(defun sweep-pack-install (pack)
+(defun sweeprolog-pack-install (pack)
"Install or upgrade Prolog package PACK."
- (interactive (list (sweep-read-pack-name)))
- (sweep-open-query "user" "sweep" "sweep_pack_install" pack)
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (if (sweep-true-p sol)
+ (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!"))))
-;; (defun sweep-file-handler (operation &rest args)
-;; (cond ((eq operation 'expand-file-name) (apply sweep-expand-file-name
args) )
-;; ;; ((eq operation 'file-name-all-completions))
-;; ;; ((eq operation 'file-name-completion))
-;; (t (let ((inhibit-file-name-handlers
-;; (cons 'my-file-handler
-;; (and (eq inhibit-file-name-operation operation)
-;; inhibit-file-name-handlers)))
-;; (inhibit-file-name-operation operation))
-;; (apply operation args)))))
-
-;; (defun sweep-expand-file-name (name &optional dir)
-;; (sweep-open-query "user" "sweep" "sweep_expand_file_name" (cons name dir))
-;; (let ((sol (sweep-next-solution)))
-;; (sweep-close-query)
-;; (when (sweep-true-p sol)
-;; (cdr sol))))
-
-(defgroup sweep-faces nil
+
+(defgroup sweeprolog-faces nil
"Faces used to highlight Prolog code."
- :group 'sweep)
+ :group 'sweeprolog)
-(defcustom sweep-faces-style nil
+(defcustom sweeprolog-faces-style nil
"Style of faces to use for highlighting Prolog code."
:type '(choice (const :tag "Default" nil)
(const :tag "Light" light)
(const :tag "Dark" dark))
- :package-version '((sweep . "0.3.2"))
- :group 'sweep-faces)
+ :package-version '((sweeprolog . "0.3.2"))
+ :group 'sweeprolog-faces)
(eval-when-compile
- (defmacro sweep-defface (name def light dark doc)
- "Define sweep face FACE with doc DOC."
+ (defmacro sweeprolog-defface (name def light dark doc)
+ "Define sweeprolog face FACE with doc DOC."
(declare
(indent defun)
(doc-string 4))
- (let ((func (intern (concat "sweep-" (symbol-name name) "-face")))
- (facd (intern (concat "sweep-" (symbol-name name) "-dark-face")))
- (facl (intern (concat "sweep-" (symbol-name name) "-light-face")))
- (face (intern (concat "sweep-" (symbol-name name) "-default-face"))))
+ (let ((func (intern (concat "sweeprolog-" (symbol-name name) "-face")))
+ (facd (intern (concat "sweeprolog-" (symbol-name name)
"-dark-face")))
+ (facl (intern (concat "sweeprolog-" (symbol-name name)
"-light-face")))
+ (face (intern (concat "sweeprolog-" (symbol-name name)
"-default-face"))))
`(progn
(defface ,facl
'((default . ,light))
,(concat "Light face used to highlight " (downcase doc))
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
(defface ,facd
'((default . ,dark))
,(concat "Dark face used to highlight " (downcase doc))
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
(defface ,face
'((default . ,def))
,(concat "Face used to highlight " (downcase doc))
- :group 'sweep-faces)
+ :group 'sweeprolog-faces)
(defun ,func ()
- (pcase sweep-faces-style
+ (pcase sweeprolog-faces-style
('light ',facl)
('dark ',facd)
(_ ',face)))))))
-(sweep-defface
+(sweeprolog-defface
functor
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "darkcyan")
"Functors.")
-(sweep-defface
+(sweeprolog-defface
arity
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "darkcyan")
"Arities.")
-(sweep-defface
+(sweeprolog-defface
predicate-indicator
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "darkcyan")
"Predicate indicators.")
-(sweep-defface
+(sweeprolog-defface
built-in
(:inherit font-lock-keyword-face)
(:foreground "blue")
(:foreground "cyan")
"Built in predicate calls.")
-(sweep-defface
+(sweeprolog-defface
neck
(:inherit font-lock-preprocessor-face)
(:weight bold)
(:weight bold)
"Necks.")
-(sweep-defface goal
+(sweeprolog-defface goal
(:inherit font-lock-function-name-face)
(:inherit font-lock-function-name-face)
(:inherit font-lock-function-name-face)
"Unspecified predicate goals.")
-(sweep-defface
+(sweeprolog-defface
string
(:inherit font-lock-string-face)
(:foreground "navyblue")
(:foreground "palegreen")
"Strings.")
-(sweep-defface
+(sweeprolog-defface
comment
(:inherit font-lock-comment-face)
(:foreground "darkgreen")
(:foreground "green")
"Comments.")
-(sweep-defface
+(sweeprolog-defface
head-built-in
(:background "orange" :weight bold)
(:background "orange" :weight bold)
(:background "orange" :weight bold)
"Built-in predicate definitons.")
-(sweep-defface
+(sweeprolog-defface
method
(:weight bold)
(:weight bold)
(:weight bold)
"PCE classes.")
-(sweep-defface
+(sweeprolog-defface
class
(:underline t)
(:underline t)
(:underline t)
"PCE classes.")
-(sweep-defface
+(sweeprolog-defface
no-file
(:foreground "red")
(:foreground "red")
(:foreground "red")
"Non-existsing file specifications.")
-(sweep-defface
+(sweeprolog-defface
head-local
(:inherit font-lock-builtin-face)
(:weight bold)
(:weight bold)
"Local predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-meta
(:inherit font-lock-preprocessor-face)
(:inherit default)
(:inherit default)
"Meta predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-multifile
(:inherit font-lock-type-face)
(:foreground "navyblue" :weight bold)
(:foreground "palegreen" :weight bold)
"Multifile predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-extern
(:inherit font-lock-type-face)
(:foreground "blue" :weight bold)
(:foreground "cyan" :weight bold)
"External predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-unreferenced
(:inherit font-lock-warning-face)
(:foreground "red" :weight bold)
(:foreground "red" :weight bold)
"Unreferenced predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-exported
(:inherit font-lock-builtin-face)
(:foreground "blue" :weight bold)
(:foreground "cyan" :weight bold)
"Exported predicate definitions.")
-(sweep-defface
+(sweeprolog-defface
head-hook
(:inherit font-lock-type-face)
(:foreground "blue" :underline t)
(:foreground "cyan" :underline t)
"Hook definitions.")
-(sweep-defface
+(sweeprolog-defface
head-iso
(:inherit font-lock-keyword-face)
(:background "orange" :weight bold)
(:background "orange" :weight bold)
"Hook definitions.")
-(sweep-defface
+(sweeprolog-defface
head-undefined
(:inherit font-lock-warning-face)
(:weight bold)
(:weight bold)
"Undefind head terms.")
-(sweep-defface
+(sweeprolog-defface
head-public
(:inherit font-lock-builtin-face)
(:foreground "#016300" :weight bold)
(:foreground "#016300" :weight bold)
"Public definitions.")
-(sweep-defface
+(sweeprolog-defface
meta-spec
(:inherit font-lock-preprocessor-face)
(:inherit font-lock-preprocessor-face)
(:inherit font-lock-preprocessor-face)
"Meta argument specifiers.")
-(sweep-defface
+(sweeprolog-defface
recursion
(:inherit font-lock-builtin-face)
(:underline t)
(:underline t)
"Recursive calls.")
-(sweep-defface
+(sweeprolog-defface
local
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "darkcyan")
"Local predicate calls.")
-(sweep-defface
+(sweeprolog-defface
autoload
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "darkcyan")
"Autoloaded predicate calls.")
-(sweep-defface
+(sweeprolog-defface
imported
(:inherit font-lock-function-name-face)
(:foreground "blue")
(:foreground "cyan")
"Imported predicate calls.")
-(sweep-defface
+(sweeprolog-defface
extern
(:inherit font-lock-function-name-face)
(:foreground "blue" :underline t)
(:foreground "cyan" :underline t)
"External predicate calls.")
-(sweep-defface
+(sweeprolog-defface
foreign
(:inherit font-lock-keyword-face)
(:foreground "darkturquoise")
(:foreground "darkturquoise")
"Foreign predicate calls.")
-(sweep-defface
+(sweeprolog-defface
meta
(:inherit font-lock-type-face)
(:foreground "red4")
(:foreground "red4")
"Meta predicate calls.")
-(sweep-defface
+(sweeprolog-defface
undefined
(:inherit font-lock-warning-face)
(:foreground "red")
(:foreground "orange")
"Undefined predicate calls.")
-(sweep-defface
+(sweeprolog-defface
thread-local
(:inherit font-lock-constant-face)
(:foreground "magenta" :underline t)
(:foreground "magenta" :underline t)
"Thread local predicate calls.")
-(sweep-defface
+(sweeprolog-defface
global
(:inherit font-lock-keyword-face)
(:foreground "magenta")
(:foreground "darkcyan")
"Global predicate calls.")
-(sweep-defface
+(sweeprolog-defface
multifile
(:inherit font-lock-function-name-face)
(:foreground "navyblue")
(:foreground "palegreen")
"Multifile predicate calls.")
-(sweep-defface
+(sweeprolog-defface
dynamic
(:inherit font-lock-constant-face)
(:foreground "magenta")
(:foreground "magenta")
"Dynamic predicate calls.")
-(sweep-defface
+(sweeprolog-defface
undefined-import
(:inherit font-lock-warning-face)
(:foreground "red")
(:foreground "red")
"Undefined imports.")
-(sweep-defface
+(sweeprolog-defface
html-attribute
(:inherit font-lock-function-name-face)
(:foreground "magenta4")
(:foreground "magenta4")
"HTML attributes.")
-(sweep-defface
+(sweeprolog-defface
html-call
(:inherit font-lock-keyword-face)
(:foreground "magenta4" :weight bold)
(:foreground "magenta4" :weight bold)
"Multifile predicate calls.")
-(sweep-defface
+(sweeprolog-defface
option-name
(:inherit font-lock-constant-face)
(:foreground "#3434ba")
(:foreground "#3434ba")
"Option names.")
-(sweep-defface
+(sweeprolog-defface
no-option-name
(:inherit font-lock-warning-face)
(:foreground "red")
(:foreground "orange")
"Non-existent option names.")
-(sweep-defface
+(sweeprolog-defface
flag-name
(:inherit font-lock-constant-face)
(:foreground "blue")
(:foreground "cyan")
"Flag names.")
-(sweep-defface
+(sweeprolog-defface
no-flag-name
(:inherit font-lock-warning-face)
(:foreground "red")
(:foreground "red")
"Non-existent flag names.")
-(sweep-defface
+(sweeprolog-defface
qq-type
(:inherit font-lock-type-face)
(:weight bold)
(:weight bold)
"Quasi-quotation types.")
-(sweep-defface
+(sweeprolog-defface
qq-sep
(:inherit font-lock-type-face)
(:weight bold)
(:weight bold)
"Quasi-quotation separators.")
-(sweep-defface
+(sweeprolog-defface
qq-open
(:inherit font-lock-type-face)
(:weight bold)
(:weight bold)
"Quasi-quotation open sequences.")
-(sweep-defface
+(sweeprolog-defface
qq-close
(:inherit font-lock-type-face)
(:weight bold)
(:weight bold)
"Quasi-quotation close sequences.")
-(sweep-defface
+(sweeprolog-defface
op-type
(:inherit font-lock-type-face)
(:foreground "blue")
(:foreground "cyan")
"Operator types.")
-(sweep-defface
+(sweeprolog-defface
dict-tag
(:inherit font-lock-constant-face)
(:weight bold)
(:weight bold)
"Dict tags.")
-(sweep-defface
+(sweeprolog-defface
dict-key
(:inherit font-lock-keyword-face)
(:weight bold)
(:weight bold)
"Dict keys.")
-(sweep-defface
+(sweeprolog-defface
dict-sep
(:inherit font-lock-keyword-face)
(:weight bold)
(:weight bold)
"Dict separators.")
-(sweep-defface
+(sweeprolog-defface
file
(:inherit button)
(:foreground "blue" :underline t)
(:foreground "cyan" :underline t)
"File specifiers.")
-(sweep-defface
+(sweeprolog-defface
file-no-depend
(:inherit font-lock-warning-face)
(:foreground "blue" :underline t :background "pink")
(:foreground "cyan" :underline t :background "pink")
"Unused file specifiers.")
-(sweep-defface
+(sweeprolog-defface
unused-import
(:inherit font-lock-warning-face)
(:foreground "blue" :background "pink")
(:foreground "cyan" :background "pink")
"Unused imports.")
-(sweep-defface
+(sweeprolog-defface
identifier
(:inherit font-lock-type-face)
(:weight bold)
(:weight bold)
"Identifiers.")
-(sweep-defface
+(sweeprolog-defface
hook
(:inherit font-lock-preprocessor-face)
(:foreground "blue" :underline t)
(:foreground "cyan" :underline t)
"Hooks.")
-(sweep-defface
+(sweeprolog-defface
module
(:inherit font-lock-type-face)
(:foreground "darkslateblue")
(:foreground "lightslateblue")
"Module names.")
-(sweep-defface
+(sweeprolog-defface
singleton
(:inherit font-lock-warning-face)
(:foreground "red4" :weight bold)
(:foreground "orangered1" :weight bold)
"Singletons.")
-(sweep-defface
+(sweeprolog-defface
fullstop
(:inherit font-lock-negation-char-face)
(:inherit font-lock-negation-char-face)
(:inherit font-lock-negation-char-face)
"Fullstops.")
-(sweep-defface
+(sweeprolog-defface
nil
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
"The empty list.")
-(sweep-defface
+(sweeprolog-defface
variable
(:inherit font-lock-variable-name-face)
(:foreground "red4")
(:foreground "orangered1")
"Variables.")
-(sweep-defface
+(sweeprolog-defface
ext-quant
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
"Existential quantifiers.")
-(sweep-defface
+(sweeprolog-defface
control
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
(:inherit font-lock-keyword-face)
"Control constructs.")
-(sweep-defface
+(sweeprolog-defface
atom
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
"Atoms.")
-(sweep-defface
+(sweeprolog-defface
int
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
"Integers.")
-(sweep-defface
+(sweeprolog-defface
float
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
"Floats.")
-(sweep-defface
+(sweeprolog-defface
codes
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
(:inherit font-lock-constant-face)
"Codes.")
-(sweep-defface
+(sweeprolog-defface
error
(:inherit font-lock-warning-face)
(:background "orange")
(:background "orange")
"Unspecified errors.")
-(sweep-defface
+(sweeprolog-defface
type-error
(:inherit font-lock-warning-face)
(:background "orange")
(:background "orange")
"Type errors.")
-(sweep-defface
+(sweeprolog-defface
instantiation-error
(:inherit font-lock-warning-face)
(:background "orange")
(:background "orange")
"Instantiation errors.")
-(sweep-defface
+(sweeprolog-defface
syntax-error
(:inherit error)
(:background "orange")
(:background "orange")
"Syntax errors.")
-(sweep-defface
+(sweeprolog-defface
around-syntax-error
(:inherit default)
(:inherit default)
(:inherit default)
"Text around a syntax error.")
-(sweep-defface
+(sweeprolog-defface
clause
(:inherit default)
(:inherit default)
(:inherit default)
"Predicate clauses.")
-(sweep-defface
+(sweeprolog-defface
grammar-rule
(:inherit default)
(:inherit default)
(:inherit default)
"DCG grammar rules.")
-(sweep-defface
+(sweeprolog-defface
term
(:inherit default)
(:inherit default)
(:inherit default)
"Top terms.")
-(sweep-defface
+(sweeprolog-defface
directive
(:inherit default)
(:inherit default)
(:inherit default)
"Directives.")
-(sweep-defface
+(sweeprolog-defface
structured-comment
(:inherit font-lock-doc-face)
(:inherit font-lock-doc-face :foreground "darkgreen")
(:inherit font-lock-doc-face :foreground "green")
"Structured comments.")
-(defun sweep--colour-term-to-face (arg)
+(defun sweeprolog--colour-term-to-face (arg)
(pcase arg
- (`("comment" . "structured") (sweep-structured-comment-face))
- (`("comment" . ,_) (sweep-comment-face))
- (`("head" "unreferenced" . ,_) (sweep-head-unreferenced-face))
- (`("head" "meta" . ,_) (sweep-head-meta-face))
- (`("head" "exported" . ,_) (sweep-head-exported-face))
- (`("head" "hook" . ,_) (sweep-head-hook-face))
- (`("head" "built_in" . ,_) (sweep-head-built-in-face))
- (`("head" ,(rx "extern(") . ,_) (sweep-head-extern-face))
- (`("head" ,(rx "public(") . ,_) (sweep-head-public-face))
- (`("head" ,(rx "local(") . ,_) (sweep-head-local-face))
- (`("goal" "recursion" . ,_) (sweep-recursion-face))
- (`("goal" "meta" . ,_) (sweep-meta-face))
- (`("goal" "built_in" . ,_) (sweep-built-in-face))
- (`("goal" "undefined" . ,_) (sweep-undefined-face))
- (`("goal" "global" . ,_) (sweep-global-face))
- (`("goal",(rx "dynamic ") . ,_) (sweep-dynamic-face))
- (`("goal",(rx "multifile ") . ,_) (sweep-multifile-face))
- (`("goal",(rx "thread_local ") . ,_) (sweep-thread-local-face))
- (`("goal",(rx "extern(") . ,_) (sweep-extern-face))
- (`("goal",(rx "autoload(") . ,_) (sweep-autoload-face))
- (`("goal",(rx "imported(") . ,_) (sweep-imported-face))
- (`("goal",(rx "global(") . ,_) (sweep-global-face))
- (`("goal",(rx "local(") . ,_) (sweep-local-face))
+ (`("comment" . "structured")
+ ;; (remove-list-of-text-properties beg end '(font-lock-face))
+ (sweeprolog-structured-comment-face))
+ (`("comment" . ,_)
+ ;; (remove-list-of-text-properties beg end '(font-lock-face))
+ (sweeprolog-comment-face))
+ (`("head" "unreferenced" . ,_) (sweeprolog-head-unreferenced-face))
+ (`("head" "meta" . ,_) (sweeprolog-head-meta-face))
+ (`("head" "exported" . ,_) (sweeprolog-head-exported-face))
+ (`("head" "hook" . ,_) (sweeprolog-head-hook-face))
+ (`("head" "built_in" . ,_) (sweeprolog-head-built-in-face))
+ (`("head" ,(rx "extern(") . ,_) (sweeprolog-head-extern-face))
+ (`("head" ,(rx "public(") . ,_) (sweeprolog-head-public-face))
+ (`("head" ,(rx "local(") . ,_) (sweeprolog-head-local-face))
+ (`("goal" "recursion" . ,_) (sweeprolog-recursion-face))
+ (`("goal" "meta" . ,_) (sweeprolog-meta-face))
+ (`("goal" "built_in" . ,_) (sweeprolog-built-in-face))
+ (`("goal" "undefined" . ,_) (sweeprolog-undefined-face))
+ (`("goal" "global" . ,_) (sweeprolog-global-face))
+ (`("goal",(rx "dynamic ") . ,_) (sweeprolog-dynamic-face))
+ (`("goal",(rx "multifile ") . ,_) (sweeprolog-multifile-face))
+ (`("goal",(rx "thread_local ") . ,_) (sweeprolog-thread-local-face))
+ (`("goal",(rx "extern(") . ,_) (sweeprolog-extern-face))
+ (`("goal",(rx "autoload(") . ,_) (sweeprolog-autoload-face))
+ (`("goal",(rx "imported(") . ,_) (sweeprolog-imported-face))
+ (`("goal",(rx "global(") . ,_) (sweeprolog-global-face))
+ (`("goal",(rx "local(") . ,_) (sweeprolog-local-face))
(`("syntax_error" ,_message ,eb ,ee)
(with-silent-modifications
(put-text-property eb ee 'font-lock-face
- (sweep-around-syntax-error-face)))
- (sweep-syntax-error-face))
- ("unused_import" (sweep-unused-import-face))
- ("undefined_import" (sweep-undefined-import-face))
- ("html_attribute" (sweep-html-attribute-face))
- ("html_call" (sweep-html-call-face))
- ("dict_tag" (sweep-dict-tag-face))
- ("dict_key" (sweep-dict-key-face))
- ("dict_sep" (sweep-dict-sep-face))
- ("meta" (sweep-meta-spec-face))
- ("flag_name" (sweep-flag-name-face))
- ("no_flag_name" (sweep-flag-name-face))
- ("ext_quant" (sweep-ext-quant-face))
- ("atom" (sweep-atom-face))
- ("float" (sweep-float-face))
- ("int" (sweep-int-face))
- ("singleton" (sweep-singleton-face))
- ("option_name" (sweep-option-name-face))
- ("no_option_name" (sweep-no-option-name-face))
- ("control" (sweep-control-face))
- ("var" (sweep-variable-face))
- ("fullstop" (sweep-fullstop-face))
- ("functor" (sweep-functor-face))
- ("arity" (sweep-arity-face))
- ("predicate_indicator" (sweep-predicate-indicator-face))
- ("string" (sweep-string-face))
- ("module" (sweep-module-face))
- ("neck" (sweep-neck-face))
- ("hook" (sweep-hook-face))
- ("qq_type" (sweep-qq-type-face))
- ("qq_sep" (sweep-qq-sep-face))
- ("qq_open" (sweep-qq-open-face))
- ("qq_close" (sweep-qq-close-face))
- ("identifier" (sweep-identifier-face))
- ("file" (sweep-file-face))
- ("file_no_depend" (sweep-file-no-depend-face))
- ("nofile" (sweep-no-file-face))
- ("op_type" (sweep-op-type-face))
- ("directive" (sweep-directive-face))
- ("clause" (sweep-clause-face))
- ("term" (sweep-term-face))
- ("grammar_rule" (sweep-grammar-rule-face))
- ("method" (sweep-method-face))
- ("class" (sweep-class-face))))
-
-(defun sweep--colourise (args)
+ (sweeprolog-around-syntax-error-face)))
+ (sweeprolog-syntax-error-face))
+ ("unused_import" (sweeprolog-unused-import-face))
+ ("undefined_import" (sweeprolog-undefined-import-face))
+ ("html_attribute" (sweeprolog-html-attribute-face))
+ ("html_call" (sweeprolog-html-call-face))
+ ("dict_tag" (sweeprolog-dict-tag-face))
+ ("dict_key" (sweeprolog-dict-key-face))
+ ("dict_sep" (sweeprolog-dict-sep-face))
+ ("meta" (sweeprolog-meta-spec-face))
+ ("flag_name" (sweeprolog-flag-name-face))
+ ("no_flag_name" (sweeprolog-flag-name-face))
+ ("ext_quant" (sweeprolog-ext-quant-face))
+ ("atom" (sweeprolog-atom-face))
+ ("float" (sweeprolog-float-face))
+ ("int" (sweeprolog-int-face))
+ ("singleton" (sweeprolog-singleton-face))
+ ("option_name" (sweeprolog-option-name-face))
+ ("no_option_name" (sweeprolog-no-option-name-face))
+ ("control" (sweeprolog-control-face))
+ ("var" (sweeprolog-variable-face))
+ ("fullstop" (sweeprolog-fullstop-face))
+ ("functor" (sweeprolog-functor-face))
+ ("arity" (sweeprolog-arity-face))
+ ("predicate_indicator" (sweeprolog-predicate-indicator-face))
+ ("string" (sweeprolog-string-face))
+ ("module" (sweeprolog-module-face))
+ ("neck" (sweeprolog-neck-face))
+ ("hook" (sweeprolog-hook-face))
+ ("qq_type" (sweeprolog-qq-type-face))
+ ("qq_sep" (sweeprolog-qq-sep-face))
+ ("qq_open" (sweeprolog-qq-open-face))
+ ("qq_close" (sweeprolog-qq-close-face))
+ ("identifier" (sweeprolog-identifier-face))
+ ("file" (sweeprolog-file-face))
+ ("file_no_depend" (sweeprolog-file-no-depend-face))
+ ("nofile" (sweeprolog-no-file-face))
+ ("op_type" (sweeprolog-op-type-face))
+ ("directive"
+ ;; (with-silent-modifications
+ ;; (remove-list-of-text-properties beg end '(font-lock-face)))
+ (sweeprolog-directive-face))
+ ("clause"
+ ;; (with-silent-modifications
+ ;; (remove-list-of-text-properties beg end '(font-lock-face)))
+ (sweeprolog-clause-face))
+ ("term"
+ ;; (with-silent-modifications
+ ;; (remove-list-of-text-properties beg end '(font-lock-face)))
+ (sweeprolog-term-face))
+ ("grammar_rule"
+ ;; (with-silent-modifications
+ ;; (remove-list-of-text-properties beg end '(font-lock-face)))
+ (sweeprolog-grammar-rule-face))
+ ("method" (sweeprolog-method-face))
+ ("class" (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))
- (flf (sweep--colour-term-to-face arg)))
+ (flf (sweeprolog--colour-term-to-face arg)))
(with-silent-modifications
- (put-text-property beg end 'font-lock-face flf))))
+ (font-lock--add-text-property beg end 'font-lock-face flf
(current-buffer) nil))))
-(defun sweep-colourise-buffer (&optional buffer)
+(defun sweeprolog-colourise-buffer (&optional buffer)
(interactive)
(with-current-buffer (or buffer (current-buffer))
(let* ((beg (point-min))
@@ -1184,38 +1183,38 @@ module name, F is a functor name and N is its arity."
(contents (buffer-substring-no-properties beg end)))
(with-silent-modifications
(font-lock-unfontify-region beg end))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_colourise_buffer"
(cons contents (buffer-file-name)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
sol))))
-(defun sweep-colourise-some-terms (beg0 end0 &optional _verbose)
+(defun sweeprolog-colourise-some-terms (beg0 end0 &optional _verbose)
(let* ((beg (save-mark-and-excursion
(goto-char beg0)
- (sweep-beginning-of-top-term)
+ (sweeprolog-beginning-of-top-term)
(max (1- (point)) (point-min))))
(end (save-mark-and-excursion
(goto-char end0)
- (sweep-end-of-top-term)
+ (sweeprolog-end-of-top-term)
(point)))
(contents (buffer-substring-no-properties beg end)))
(with-silent-modifications
(font-lock-unfontify-region beg end))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_colourise_some_terms"
(list contents
(buffer-file-name)
beg))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
`(jit-lock-bounds ,beg . ,end)))))
-(defun sweep-colourise-query (buffer)
+(defun sweeprolog-colourise-query (buffer)
(when (buffer-live-p buffer)
(with-current-buffer buffer
(when-let ((beg (cdr comint-last-prompt))
@@ -1223,51 +1222,51 @@ module name, F is a functor name and N is its arity."
(query (buffer-substring-no-properties beg end)))
(with-silent-modifications
(font-lock-unfontify-region beg end))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_colourise_query"
(cons query (marker-position beg)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
sol)))))
-(defun sweep-load-buffer (buffer)
+(defun sweeprolog-load-buffer (buffer)
"Load the Prolog buffer BUFFER into the embedded SWI-Prolog runtime.
Interactively, if the major mode of the current buffer is
-`sweep-mode' and the command is called without a prefix argument,
-load the current buffer. Otherwise, prompt for a `sweep-mode'
+`sweeprolog-mode' and the command is called without a prefix argument,
+load the current buffer. Otherwise, prompt for a `sweeprolog-mode'
buffer to load."
(interactive (list
(if (and (not current-prefix-arg)
- (eq major-mode 'sweep-mode))
+ (eq major-mode 'sweeprolog-mode))
(current-buffer)
(read-buffer "Load buffer: "
- (when (eq major-mode 'sweep-mode)
+ (when (eq major-mode 'sweeprolog-mode)
(buffer-name))
t
(lambda (b)
(let ((n (or (and (consp b) (car b)) b)))
(with-current-buffer n
- (eq major-mode 'sweep-mode))))))))
+ (eq major-mode 'sweeprolog-mode))))))))
(with-current-buffer buffer
(let* ((beg (point-min))
(end (point-max))
(contents (buffer-substring-no-properties beg end)))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_load_buffer"
(cons contents (buffer-file-name)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (if (sweep-true-p sol)
+ (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)))))))
;;;###autoload
-(defun sweep-top-level (&optional buffer)
+(defun sweeprolog-top-level (&optional buffer)
"Run a Prolog top-level in BUFFER.
-If BUFFER is nil, a buffer called \"*sweep-top-level*\" is used
+If BUFFER is nil, a buffer called \"*sweeprolog-top-level*\" is used
by default.
Interactively, a prefix arg means to prompt for BUFFER."
@@ -1275,23 +1274,23 @@ Interactively, a prefix arg means to prompt for BUFFER."
(let* ((buffer
(and current-prefix-arg
(read-buffer "Top-level buffer: "
- (if (and (eq major-mode 'sweep-top-level-mode)
+ (if (and (eq major-mode
'sweeprolog-top-level-mode)
(null (get-buffer-process
(current-buffer))))
(buffer-name)
- (generate-new-buffer-name
"*sweep-top-level*"))))))
+ (generate-new-buffer-name
"*sweeprolog-top-level*"))))))
(list buffer)))
- (let ((buf (get-buffer-create (or buffer "*sweep-top-level*"))))
+ (let ((buf (get-buffer-create (or buffer "*sweeprolog-top-level*"))))
(with-current-buffer buf
- (unless (eq major-mode 'sweep-top-level-mode)
- (sweep-top-level-mode)))
- (make-comint-in-buffer "sweep-top-level"
+ (unless (eq major-mode 'sweeprolog-top-level-mode)
+ (sweeprolog-top-level-mode)))
+ (make-comint-in-buffer "sweeprolog-top-level"
buf
(cons "localhost"
- sweep-prolog-server-port))
- (pop-to-buffer buf sweep-top-level-display-action)))
+ sweeprolog-prolog-server-port))
+ (pop-to-buffer buf sweeprolog-top-level-display-action)))
-(defun sweep-top-level--post-self-insert-function ()
+(defun sweeprolog-top-level--post-self-insert-function ()
(when-let ((pend (cdr comint-last-prompt)))
(let* ((pstart (car comint-last-prompt))
(prompt (buffer-substring-no-properties pstart pend)))
@@ -1304,66 +1303,66 @@ Interactively, a prefix arg means to prompt for BUFFER."
(not (string= "| " prompt)))
(comint-send-input)))))
-(defvar-local sweep-top-level-timer nil "Buffer-local timer.")
+(defvar-local sweeprolog-top-level-timer nil "Buffer-local timer.")
;;;###autoload
-(define-derived-mode sweep-top-level-mode comint-mode "sweep Top-level"
+(define-derived-mode sweeprolog-top-level-mode comint-mode "sweep Top-level"
"Major mode for interacting with an inferior Prolog interpreter."
- :group 'sweep-top-level
+ :group 'sweeprolog-top-level
(setq-local comint-prompt-regexp (rx line-start "?- ")
comint-input-ignoredups t
comint-prompt-read-only t
comint-input-filter (lambda (s)
- (<
sweep-top-level-min-history-length
+ (<
sweeprolog-top-level-min-history-length
(length s)))
comint-delimiter-argument-list '(?,)
comment-start "%")
- (add-hook 'post-self-insert-hook
#'sweep-top-level--post-self-insert-function nil t)
- (setq sweep-buffer-module "user")
- (add-hook 'completion-at-point-functions
#'sweep-completion-at-point-function nil t)
- (setq sweep-top-level-timer (run-with-idle-timer 0.2 t
#'sweep-colourise-query (current-buffer)))
+ (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
(lambda ()
- (when (timerp sweep-top-level-timer)
- (cancel-timer sweep-top-level-timer)))))
+ (when (timerp sweeprolog-top-level-timer)
+ (cancel-timer sweeprolog-top-level-timer)))))
-(sweep--ensure-module)
-(when sweep-init-on-load (sweep-init))
+(sweeprolog--ensure-module)
+(when sweeprolog-init-on-load (sweeprolog-init))
;;;###autoload
-(defvar sweep-prefix-map
+(defvar sweeprolog-prefix-map
(let ((map (make-sparse-keymap)))
- (define-key map "m" #'sweep-find-module)
- (define-key map "p" #'sweep-find-predicate)
- (define-key map "t" #'sweep-top-level)
- (define-key map "l" #'sweep-load-buffer)
- (define-key map "P" #'sweep-pack-install)
- (define-key map "F" #'sweep-set-prolog-flag)
- (define-key map "e" #'sweep-view-messages)
+ (define-key map "m" #'sweeprolog-find-module)
+ (define-key map "p" #'sweeprolog-find-predicate)
+ (define-key map "t" #'sweeprolog-top-level)
+ (define-key map "l" #'sweeprolog-load-buffer)
+ (define-key map "P" #'sweeprolog-pack-install)
+ (define-key map "F" #'sweeprolog-set-prolog-flag)
+ (define-key map "e" #'sweeprolog-view-messages)
map)
- "Keymap for `sweep' global commands.")
+ "Keymap for `sweeprolog' global commands.")
;;;###autoload
-(defun sweep-file-name-handler (operation &rest args)
+(defun sweeprolog-file-name-handler (operation &rest args)
(cond ((eq operation 'expand-file-name)
(let ((fn (car args))
(dn (cadr args)))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_expand_file_name"
(cons fn dn))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (if (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (if (sweeprolog-true-p sol)
(cdr sol)
(let ((inhibit-file-name-handlers
- (cons 'sweep-file-name-handler
+ (cons 'sweeprolog-file-name-handler
(and (eq inhibit-file-name-operation operation)
inhibit-file-name-handlers)))
(inhibit-file-name-operation operation))
(apply operation args))))))
(t (let ((inhibit-file-name-handlers
- (cons 'sweep-file-name-handler
+ (cons 'sweeprolog-file-name-handler
(and (eq inhibit-file-name-operation operation)
inhibit-file-name-handlers)))
(inhibit-file-name-operation operation))
@@ -1371,9 +1370,9 @@ Interactively, a prefix arg means to prompt for BUFFER."
(add-to-list 'file-name-handler-alist
(cons (rx bol (one-or-more lower) "(")
- #'sweep-file-name-handler))
+ #'sweeprolog-file-name-handler))
-(defun sweep-beginning-of-top-term (&optional arg)
+(defun sweeprolog-beginning-of-top-term (&optional arg)
(let ((times (or arg 1)))
(if (< 0 times)
(let ((p (point)))
@@ -1391,9 +1390,9 @@ Interactively, a prefix arg means to prompt for BUFFER."
(setq safe-start (or (nth 8 (syntax-ppss))
(nth 8 (syntax-ppss (1+ (point)))))))))
(not (= p (point))))
- (sweep-beginning-of-next-top-term (- times)))))
+ (sweeprolog-beginning-of-next-top-term (- times)))))
-(defun sweep-beginning-of-next-top-term (times)
+(defun sweeprolog-beginning-of-next-top-term (times)
(let ((p (point)))
(while (and (< 0 times) (not (eobp)))
(setq times (1- times))
@@ -1405,7 +1404,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(re-search-forward (rx bol graph) nil t)))
(not (= p (point)))))
-(defun sweep-end-of-top-term ()
+(defun sweeprolog-end-of-top-term ()
(unless (eobp)
(while (and (nth 8 (syntax-ppss)) (not (eobp)))
(forward-char))
@@ -1417,7 +1416,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(or (re-search-forward (rx "." (or white "\n")) nil t)
(goto-char (point-max))))))
-(defvar sweep-mode-syntax-table
+(defvar sweeprolog-mode-syntax-table
(let ((table (make-syntax-table)))
(modify-syntax-entry ?_ "_" table)
(modify-syntax-entry ?+ "." table)
@@ -1434,17 +1433,17 @@ Interactively, a prefix arg means to prompt for BUFFER."
(modify-syntax-entry ?/ ". 14" table)
table))
-(defvar sweep-mode-map
+(defvar sweeprolog-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "C-c C-l") #'sweep-load-buffer)
- (define-key map (kbd "C-c C-c") #'sweep-colourise-buffer)
- (define-key map (kbd "C-c C-t") #'sweep-top-level)
- (define-key map (kbd "C-c C-o") #'sweep-find-file-at-point)
+ (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-t") #'sweeprolog-top-level)
+ (define-key map (kbd "C-c C-o") #'sweeprolog-find-file-at-point)
(define-key map (kbd "C-M-^") #'kill-backward-up-list)
map)
- "Keymap for `sweep-mode'.")
+ "Keymap for `sweeprolog-mode'.")
-(defun sweep-token-boundaries (&optional pos)
+(defun sweeprolog-token-boundaries (&optional pos)
(let ((point (or pos (point))))
(save-excursion
(goto-char point)
@@ -1474,7 +1473,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
((= syn ?>) nil)
(t (list 'else beg (point)))))))))
-(defun sweep-next-token-boundaries (&optional pos)
+(defun sweeprolog-next-token-boundaries (&optional pos)
(let ((point (or pos (point))))
(save-excursion
(goto-char point)
@@ -1505,7 +1504,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
((= syn ?>) nil)
(t (list 'else beg (point)))))))))
-(defun sweep-last-token-boundaries (&optional pos)
+(defun sweeprolog-last-token-boundaries (&optional pos)
(let ((point (or pos (point)))
(go t))
(save-excursion
@@ -1540,8 +1539,8 @@ Interactively, a prefix arg means to prompt for BUFFER."
(list 'close (1- end) end))
(t (list 'else (1- end) end))))))))
-(defun sweep--forward-term (pre)
- (pcase (sweep-next-token-boundaries)
+(defun sweeprolog--forward-term (pre)
+ (pcase (sweeprolog-next-token-boundaries)
('nil
(signal 'scan-error
(list "Cannot scan beyond end of buffer."
@@ -1555,11 +1554,11 @@ Interactively, a prefix arg means to prompt for BUFFER."
(`(open ,obeg ,_)
(goto-char obeg)
(goto-char (scan-lists (point) 1 0))
- (sweep--forward-term pre))
+ (sweeprolog--forward-term pre))
(`(functor ,_ ,oend)
(goto-char (1- oend))
(goto-char (scan-lists (point) 1 0))
- (sweep--forward-term pre))
+ (sweeprolog--forward-term pre))
(`(operator ,obeg ,oend)
(if (and (string= "." (buffer-substring-no-properties obeg oend))
(member (char-syntax (char-after (1+ obeg))) '(?> ? )))
@@ -1567,7 +1566,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(list "Cannot scan beyond fullstop."
obeg
(1+ obeg)))
- (if-let ((opre (sweep-op-infix-precedence
+ (if-let ((opre (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1575,8 +1574,8 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char oend)
- (sweep--forward-term pre))
- (if-let ((ppre (sweep-op-suffix-precedence
+ (sweeprolog--forward-term pre))
+ (if-let ((ppre (sweeprolog-op-suffix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1584,11 +1583,11 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char oend)
- (sweep--forward-term pre))
+ (sweeprolog--forward-term pre))
(goto-char oend)
- (sweep--forward-term pre)))))
+ (sweeprolog--forward-term pre)))))
(`(symbol ,obeg ,oend)
- (if-let ((opre (sweep-op-infix-precedence
+ (if-let ((opre (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1596,8 +1595,8 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char oend)
- (sweep--forward-term pre))
- (if-let ((ppre (sweep-op-prefix-precedence
+ (sweeprolog--forward-term pre))
+ (if-let ((ppre (sweeprolog-op-prefix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1605,20 +1604,20 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char oend)
- (sweep--forward-term pre))
+ (sweeprolog--forward-term pre))
(goto-char oend)
- (sweep--forward-term pre))))
+ (sweeprolog--forward-term pre))))
(`(,_ ,_ ,oend)
(goto-char oend)
- (sweep--forward-term pre))))
+ (sweeprolog--forward-term pre))))
-(defun sweep-forward-term (pre)
+(defun sweeprolog-forward-term (pre)
(condition-case _
- (sweep--forward-term pre)
+ (sweeprolog--forward-term pre)
(scan-error nil)))
-(defun sweep--backward-term (pre)
- (pcase (sweep-last-token-boundaries)
+(defun sweeprolog--backward-term (pre)
+ (pcase (sweeprolog-last-token-boundaries)
('nil
(signal 'scan-error
(list "Cannot scan backwards beyond beginning of buffer."
@@ -1641,7 +1640,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(list "Cannot scan backwards beyond fullstop."
obeg
(1+ obeg)))
- (if-let ((opre (sweep-op-infix-precedence
+ (if-let ((opre (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1649,8 +1648,8 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char obeg)
- (sweep--backward-term pre))
- (if-let ((ppre (sweep-op-prefix-precedence
+ (sweeprolog--backward-term pre))
+ (if-let ((ppre (sweeprolog-op-prefix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1658,11 +1657,11 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char obeg)
- (sweep--backward-term pre))
+ (sweeprolog--backward-term pre))
(goto-char obeg)
- (sweep--backward-term pre)))))
+ (sweeprolog--backward-term pre)))))
(`(symbol ,obeg ,oend)
- (if-let ((opre (sweep-op-infix-precedence
+ (if-let ((opre (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1670,8 +1669,8 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char obeg)
- (sweep--backward-term pre))
- (if-let ((ppre (sweep-op-prefix-precedence
+ (sweeprolog--backward-term pre))
+ (if-let ((ppre (sweeprolog-op-prefix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
(signal 'scan-error
@@ -1679,77 +1678,77 @@ Interactively, a prefix arg means to prompt for BUFFER."
obeg
oend))
(goto-char obeg)
- (sweep--backward-term pre))
+ (sweeprolog--backward-term pre))
(goto-char obeg)
- (sweep--backward-term pre))))
+ (sweeprolog--backward-term pre))))
(`(close ,lbeg ,_lend)
(goto-char (nth 1 (syntax-ppss lbeg)))
(when (or (= (char-syntax (char-before)) ?w)
(= (char-syntax (char-before)) ?_))
(skip-syntax-backward "w_"))
- (sweep--backward-term pre))
+ (sweeprolog--backward-term pre))
(`(,_ ,lbeg ,_)
(goto-char lbeg)
- (sweep--backward-term pre))))
+ (sweeprolog--backward-term pre))))
-(defun sweep-backward-term (pre)
+(defun sweeprolog-backward-term (pre)
(condition-case _
- (sweep--backward-term pre)
+ (sweeprolog--backward-term pre)
(scan-error nil)))
-(defvar-local sweep--forward-sexp-first-call t)
+(defvar-local sweeprolog--forward-sexp-first-call t)
-(defun sweep--backward-sexp ()
+(defun sweeprolog--backward-sexp ()
(let ((point (point))
- (prec (pcase (sweep-last-token-boundaries)
+ (prec (pcase (sweeprolog-last-token-boundaries)
(`(operator ,obeg ,oend)
(unless (and nil
(string= "." (buffer-substring-no-properties
obeg oend))
(member (char-syntax (char-after (1+ obeg)))
'(?> ? )))
(if-let ((pprec
- (sweep-op-infix-precedence
+ (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(progn (goto-char obeg) (1- pprec))
0)))
(_ 0))))
(condition-case error
- (sweep--backward-term prec)
+ (sweeprolog--backward-term prec)
(scan-error (when (= point (point))
(signal 'scan-error (cdr error)))))))
-(defun sweep--forward-sexp ()
+(defun sweeprolog--forward-sexp ()
(let ((point (point))
- (prec (pcase (sweep-next-token-boundaries)
+ (prec (pcase (sweeprolog-next-token-boundaries)
(`(operator ,obeg ,oend)
(unless (and nil
(string= "." (buffer-substring-no-properties
obeg oend))
(member (char-syntax (char-after (1+ obeg)))
'(?> ? )))
(if-let ((pprec
- (sweep-op-infix-precedence
+ (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(progn (goto-char oend) (1- pprec))
0)))
(_ 0))))
(condition-case error
- (sweep--forward-term prec)
+ (sweeprolog--forward-term prec)
(scan-error (when (= point (point))
(signal 'scan-error (cdr error)))))))
-(defun sweep-forward-sexp-function (arg)
+(defun sweeprolog-forward-sexp-function (arg)
(let* ((times (abs arg))
(func (or (and (not (= arg 0))
(< 0 (/ times arg))
- #'sweep--forward-sexp)
- #'sweep--backward-sexp)))
+ #'sweeprolog--forward-sexp)
+ #'sweeprolog--backward-sexp)))
(while (< 0 times)
(funcall func)
(setq times (1- times)))))
-(defun sweep-op-suffix-precedence (token)
- (sweep-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
+(defun sweeprolog-op-suffix-precedence (token)
+ (sweeprolog-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
(let ((res nil) (go t))
(while go
- (if-let ((sol (sweep-next-solution))
+ (if-let ((sol (sweeprolog-next-solution))
(det (car sol))
(fix (cadr sol))
(pre (cddr sol)))
@@ -1758,14 +1757,14 @@ Interactively, a prefix arg means to prompt for BUFFER."
(when (eq '! det)
(setq go nil)))
(setq go nil)))
- (sweep-close-query)
+ (sweeprolog-close-query)
res))
-(defun sweep-op-prefix-precedence (token)
- (sweep-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
+(defun sweeprolog-op-prefix-precedence (token)
+ (sweeprolog-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
(let ((res nil) (go t))
(while go
- (if-let ((sol (sweep-next-solution))
+ (if-let ((sol (sweeprolog-next-solution))
(det (car sol))
(fix (cadr sol))
(pre (cddr sol)))
@@ -1774,14 +1773,14 @@ Interactively, a prefix arg means to prompt for BUFFER."
(when (eq '! det)
(setq go nil)))
(setq go nil)))
- (sweep-close-query)
+ (sweeprolog-close-query)
res))
-(defun sweep-op-infix-precedence (token)
- (sweep-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
+(defun sweeprolog-op-infix-precedence (token)
+ (sweeprolog-open-query "user" "sweep" "sweep_op_info" (cons token
(buffer-file-name)))
(let ((res nil) (go t))
(while go
- (if-let ((sol (sweep-next-solution))
+ (if-let ((sol (sweeprolog-next-solution))
(det (car sol))
(fix (cadr sol))
(pre (cddr sol)))
@@ -1790,38 +1789,38 @@ Interactively, a prefix arg means to prompt for BUFFER."
(when (eq '! det)
(setq go nil)))
(setq go nil)))
- (sweep-close-query)
+ (sweeprolog-close-query)
res))
-(defun sweep-indent-line-after-functor (fbeg _fend)
+(defun sweeprolog-indent-line-after-functor (fbeg _fend)
(save-excursion
(goto-char fbeg)
- (+ (current-column) sweep-indent-offset)))
+ (+ (current-column) sweeprolog-indent-offset)))
-(defun sweep-indent-line-after-open (fbeg _fend)
+(defun sweeprolog-indent-line-after-open (fbeg _fend)
(save-excursion
(goto-char fbeg)
- (+ (current-column) sweep-indent-offset)))
+ (+ (current-column) sweeprolog-indent-offset)))
-(defun sweep-indent-line-after-prefix (fbeg _fend _pre)
+(defun sweeprolog-indent-line-after-prefix (fbeg _fend _pre)
(save-excursion
(goto-char fbeg)
(+ (current-column) 4)))
-(defun sweep-indent-line-after-term ()
+(defun sweeprolog-indent-line-after-term ()
(if-let ((open (nth 1 (syntax-ppss))))
(save-excursion
(goto-char open)
(current-column))
'noindent))
-(defun sweep-indent-line-after-neck (fbeg _fend)
+(defun sweeprolog-indent-line-after-neck (fbeg _fend)
(save-excursion
(goto-char fbeg)
- (sweep-backward-term 1200)
- (+ (current-column) sweep-indent-offset)))
+ (sweeprolog-backward-term 1200)
+ (+ (current-column) sweeprolog-indent-offset)))
-(defun sweep-indent-line-after-infix (fbeg _fend pre)
+(defun sweeprolog-indent-line-after-infix (fbeg _fend pre)
(save-excursion
(goto-char fbeg)
(let ((lim (or (nth 1 (syntax-ppss)) (point-min)))
@@ -1829,15 +1828,15 @@ Interactively, a prefix arg means to prompt for BUFFER."
(go t))
(while go
(setq cur (point))
- (sweep-backward-term pre)
+ (sweeprolog-backward-term pre)
(when (< (point) lim)
(goto-char cur))
(when (= (point) cur)
(setq go nil))))
(current-column)))
-(defun sweep-indent-line ()
- "Indent the current line in a `sweep-mode' buffer."
+(defun sweeprolog-indent-line ()
+ "Indent the current line in a `sweeprolog-mode' buffer."
(interactive)
(let ((pos (- (point-max) (point))))
(back-to-indentation)
@@ -1856,31 +1855,31 @@ Interactively, a prefix arg means to prompt for BUFFER."
(eolp))
(skip-syntax-backward "w_")))
(current-column))
- (pcase (sweep-last-token-boundaries)
+ (pcase (sweeprolog-last-token-boundaries)
('nil 'noindent)
(`(functor ,lbeg ,lend)
- (sweep-indent-line-after-functor lbeg lend))
+ (sweeprolog-indent-line-after-functor lbeg lend))
(`(open ,lbeg ,lend)
- (sweep-indent-line-after-open lbeg lend))
+ (sweeprolog-indent-line-after-open lbeg lend))
(`(symbol ,lbeg ,lend)
(let ((sym (buffer-substring-no-properties lbeg
lend)))
(cond
- ((pcase (sweep-op-prefix-precedence sym)
- ('nil (sweep-indent-line-after-term))
- (pre (sweep-indent-line-after-prefix lbeg lend
pre)))))))
+ ((pcase (sweeprolog-op-prefix-precedence sym)
+ ('nil (sweeprolog-indent-line-after-term))
+ (pre (sweeprolog-indent-line-after-prefix lbeg
lend pre)))))))
(`(operator ,lbeg ,lend)
(let ((op (buffer-substring-no-properties lbeg lend)))
(cond
((string= op ".") 'noindent)
- ((pcase (sweep-op-infix-precedence op)
+ ((pcase (sweeprolog-op-infix-precedence op)
('nil nil)
- (1200 (sweep-indent-line-after-neck lbeg lend))
- (pre (sweep-indent-line-after-infix lbeg lend
pre))))
- ((pcase (sweep-op-prefix-precedence op)
+ (1200 (sweeprolog-indent-line-after-neck lbeg
lend))
+ (pre (sweeprolog-indent-line-after-infix lbeg
lend pre))))
+ ((pcase (sweeprolog-op-prefix-precedence op)
('nil nil)
- (pre (sweep-indent-line-after-prefix lbeg lend
pre)))))))
+ (pre (sweeprolog-indent-line-after-prefix lbeg
lend pre)))))))
(`(,_ltyp ,_lbeg ,_lend)
- (sweep-indent-line-after-term)))))))
+ (sweeprolog-indent-line-after-term)))))))
(when (numberp indent)
(unless (= indent (current-column))
(combine-after-change-calls
@@ -1890,7 +1889,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(goto-char (- (point-max) pos)))
indent)))
-(defun sweep-syntax-propertize (start end)
+(defun sweeprolog-syntax-propertize (start end)
(goto-char start)
(let ((case-fold-search nil))
(funcall
@@ -1903,87 +1902,87 @@ Interactively, a prefix arg means to prompt for BUFFER."
(string-to-syntax "w")))))
start end)))
-(defun sweep-at-beginning-of-top-term-p ()
+(defun sweeprolog-at-beginning-of-top-term-p ()
(and (looking-at-p (rx bol graph))
(not (nth 8 (syntax-ppss)))))
-(defun sweep-file-at-point (&optional point)
+(defun sweeprolog-file-at-point (&optional point)
(let* ((p (or point (point)))
(beg (save-mark-and-excursion
(goto-char p)
- (unless (sweep-at-beginning-of-top-term-p)
- (sweep-beginning-of-top-term))
+ (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)
- (sweep-end-of-top-term)
+ (sweeprolog-end-of-top-term)
(point)))
(contents (buffer-substring-no-properties beg end)))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_file_at_point"
(list contents
(buffer-file-name)
(- p beg)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(cdr sol)))))
-(defun sweep-find-file-at-point (point)
+(defun sweeprolog-find-file-at-point (point)
"Find file specificed by the Prolog file spec at POINT.
Interactively, POINT is set to the current point."
- (interactive "d" sweep-mode)
- (if-let ((file (sweep-file-at-point point)))
+ (interactive "d" sweeprolog-mode)
+ (if-let ((file (sweeprolog-file-at-point point)))
(find-file file)
(user-error "No file specification found at point!")))
-(defun sweep-identifier-at-point (&optional point)
+(defun sweeprolog-identifier-at-point (&optional point)
(let* ((p (or point (point)))
(beg (save-mark-and-excursion
(goto-char p)
- (unless (sweep-at-beginning-of-top-term-p)
- (sweep-beginning-of-top-term))
+ (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)
- (sweep-end-of-top-term)
+ (sweeprolog-end-of-top-term)
(point)))
(contents (buffer-substring-no-properties beg end)))
- (sweep-open-query "user"
+ (sweeprolog-open-query "user"
"sweep"
"sweep_identifier_at_point"
(list contents
(buffer-file-name)
(- p beg)))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(cdr sol)))))
-(defun sweep--xref-backend ()
+(defun sweeprolog--xref-backend ()
"Hook for `xref-backend-functions'."
- 'sweep)
+ 'sweeprolog)
-(cl-defmethod xref-backend-identifier-at-point ((_backend (eql sweep)))
- (sweep-identifier-at-point))
+(cl-defmethod xref-backend-identifier-at-point ((_backend (eql sweeprolog)))
+ (sweeprolog-identifier-at-point))
-(cl-defmethod xref-backend-identifier-completion-table ((_backend (eql sweep)))
- (completion-table-with-cache #'sweep-predicates-collection))
+(cl-defmethod xref-backend-identifier-completion-table ((_backend (eql
sweeprolog)))
+ (completion-table-with-cache #'sweeprolog-predicates-collection))
-(cl-defmethod xref-backend-identifier-completion-ignore-case ((_backend (eql
sweep)))
+(cl-defmethod xref-backend-identifier-completion-ignore-case ((_backend (eql
sweeprolog)))
"Case is always significant for Prolog identifiers, so return nil."
nil)
-(cl-defmethod xref-backend-definitions ((_backend (eql sweep)) mfn)
- (when-let ((loc (sweep-predicate-location mfn))
+(cl-defmethod xref-backend-definitions ((_backend (eql sweeprolog)) mfn)
+ (when-let ((loc (sweeprolog-predicate-location mfn))
(path (car loc))
(line (or (cdr loc) 1)))
(list (xref-make (concat path ":" (number-to-string line))
(xref-make-file-location path line 0)))))
-(cl-defmethod xref-backend-references ((_backend (eql sweep)) mfn)
- (let ((refs (sweep-predicate-references mfn)))
+(cl-defmethod xref-backend-references ((_backend (eql sweeprolog)) mfn)
+ (let ((refs (sweeprolog-predicate-references mfn)))
(seq-map (lambda (loc)
(let ((by (car loc))
(path (cadr loc))
@@ -1991,8 +1990,8 @@ Interactively, POINT is set to the current point."
(xref-make by (xref-make-file-location path line 0))))
refs)))
-(cl-defmethod xref-backend-apropos ((_backend (eql sweep)) pattern)
- (let ((matches (sweep-predicate-apropos pattern)))
+(cl-defmethod xref-backend-apropos ((_backend (eql sweeprolog)) pattern)
+ (let ((matches (sweeprolog-predicate-apropos pattern)))
(seq-map (lambda (match)
(let ((mfn (car match))
(path (cadr match))
@@ -2001,14 +2000,14 @@ Interactively, POINT is set to the current point."
(xref-make-file-location path line 0))))
matches)))
-(defun sweep-create-index-function ()
- (sweep-open-query "user"
+(defun sweeprolog-create-index-function ()
+ (sweeprolog-open-query "user"
"sweep"
"sweep_imenu_index"
(buffer-file-name))
- (let ((sol (sweep-next-solution)))
- (sweep-close-query)
- (when (sweep-true-p sol)
+ (let ((sol (sweeprolog-next-solution)))
+ (sweeprolog-close-query)
+ (when (sweeprolog-true-p sol)
(seq-map (lambda (entry)
(let ((car (car entry))
(line (cdr entry)))
@@ -2017,55 +2016,55 @@ Interactively, POINT is set to the current point."
(cons car (line-beginning-position))))
(cdr sol)))))
-(defvar-local sweep--timer nil)
-(defvar-local sweep--colourise-buffer-duration 0.2)
+(defvar-local sweeprolog--timer nil)
+(defvar-local sweeprolog--colourise-buffer-duration 0.2)
;;;###autoload
-(define-derived-mode sweep-mode prog-mode "sweep"
+(define-derived-mode sweeprolog-mode prog-mode "sweep"
"Major mode for reading and editing Prolog code."
- :group 'sweep
+ :group 'sweeprolog
(setq-local comment-start "%")
(setq-local comment-start-skip "\\(?:/\\*+ *\\|%+ *\\)")
(setq-local parens-require-spaces nil)
- (setq-local imenu-create-index-function #'sweep-create-index-function)
- (setq-local beginning-of-defun-function #'sweep-beginning-of-top-term)
- (setq-local end-of-defun-function #'sweep-end-of-top-term)
- (setq-local forward-sexp-function #'sweep-forward-sexp-function)
- (setq-local syntax-propertize-function #'sweep-syntax-propertize)
- (setq-local indent-line-function #'sweep-indent-line)
+ (setq-local imenu-create-index-function #'sweeprolog-create-index-function)
+ (setq-local beginning-of-defun-function #'sweeprolog-beginning-of-top-term)
+ (setq-local end-of-defun-function #'sweeprolog-end-of-top-term)
+ (setq-local forward-sexp-function #'sweeprolog-forward-sexp-function)
+ (setq-local syntax-propertize-function #'sweeprolog-syntax-propertize)
+ (setq-local indent-line-function #'sweeprolog-indent-line)
(setq-local font-lock-defaults
'(nil
nil
nil
nil
nil
- (font-lock-fontify-region-function .
sweep-colourise-some-terms)))
+ (font-lock-fontify-region-function .
sweeprolog-colourise-some-terms)))
(let ((time (current-time)))
- (sweep-colourise-buffer)
- (setq sweep--colourise-buffer-duration (float-time (time-since time))))
- (sweep--set-buffer-module)
- (add-hook 'xref-backend-functions #'sweep--xref-backend nil t)
- (add-hook 'file-name-at-point-functions #'sweep-file-at-point nil t)
- (add-hook 'completion-at-point-functions
#'sweep-completion-at-point-function nil t)
- (when sweep-colourise-buffer-on-idle
- (setq sweep--timer (run-with-idle-timer (max
sweep-colourise-buffer-min-interval
- (* 10
sweep--colourise-buffer-duration))
+ (sweeprolog-colourise-buffer)
+ (setq sweeprolog--colourise-buffer-duration (float-time (time-since
time))))
+ (sweeprolog--set-buffer-module)
+ (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)
+ (when sweeprolog-colourise-buffer-on-idle
+ (setq sweeprolog--timer (run-with-idle-timer (max
sweeprolog-colourise-buffer-min-interval
+ (* 10
sweeprolog--colourise-buffer-duration))
t
(let ((buffer (current-buffer)))
(lambda ()
- (unless (<
sweep-colourise-buffer-max-size
+ (unless (<
sweeprolog-colourise-buffer-max-size
(buffer-size
buffer))
- (sweep-colourise-buffer
buffer))))))
+ (sweeprolog-colourise-buffer
buffer))))))
(add-hook 'kill-buffer-hook
(lambda ()
- (when (timerp sweep--timer)
- (cancel-timer sweep--timer))))))
+ (when (timerp sweeprolog--timer)
+ (cancel-timer sweeprolog--timer))))))
;;;; Testing:
;; (add-to-list 'load-path (file-name-directory (buffer-file-name)))
-;; (require 'sweep)
+;; (require 'sweeprolog)
-(provide 'sweep)
+(provide 'sweeprolog)
-;;; sweep.el ends here
+;;; sweeprolog.el ends here
- [nongnu] elpa/sweeprolog 0db900634f 120/166: DOC: update commentary section in sweep.el, (continued)
- [nongnu] elpa/sweeprolog 0db900634f 120/166: DOC: update commentary section in sweep.el, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6f7aa88050 100/166: ENHANCED: (sweep-load-buffer): report results, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 12fbadf13b 137/166: sweep.el: remove outdated sweep--compile-module function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog c6066eabb9 144/166: ADDED: support imenu in sweep-mode buffers, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 8179cb4204 135/166: FIXED: qualify calls to sweep_funcall/2, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 7085c2e830 142/166: ADDED: sweep-mode: make sexp-based commands work on Prolog terms, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6434715829 149/166: FIXED: use a more robust mechanism for finding sweep-module, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 69be982c41 150/166: FIXED: don't rely on string-lines added in Emacs 28.1, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 3e6fae1244 146/166: DOC: fix typos in README.org, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6517af47b3 134/166: FIXED: sweep-init-args separate arguments, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 24a1e14ee9 151/166: MODIFIED: Breaking change: rename sweep.el to sweeprolog.el...,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog 13c7551015 156/166: ENHANCED: only fontify visible sweeprolog-mode buffers on idle, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog cada0d3871 166/166: DOC: document quasi-quotation highlighting in the manual, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 85af4010e8 158/166: Use a public mailing list in the Maintainer package header, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 353ef846fb 035/166: ENHANCED: Pass keystrokes to the top-level directly when appropriate, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 72cc4d516b 014/166: PORT: detect linux vs macOS shared object extension in Makefile, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog e029eb3e3c 016/166: update .build.yml, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 0aa0a46631 017/166: PORT: don't use clang's -fdiagnostics-absolute-paths, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog d4a501e9af 020/166: PORT: use rpath linker option, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog b75179cc6e 022/166: Revert rpath tweaks, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 2f5dd9f13c 024/166: FIXED: Use more robust Prolog to C string conversion, ELPA Syncer, 2022/09/30