emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/emacsql 301e2ff4b6 175/427: Drop "simple" from helper meth


From: ELPA Syncer
Subject: [nongnu] elpa/emacsql 301e2ff4b6 175/427: Drop "simple" from helper method names.
Date: Tue, 13 Dec 2022 02:59:39 -0500 (EST)

branch: elpa/emacsql
commit 301e2ff4b6b43981b6df7b92330c4767f8f88ec3
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>

    Drop "simple" from helper method names.
---
 emacsql-psql.el   | 4 ++--
 emacsql-sqlite.el | 4 ++--
 emacsql.el        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emacsql-psql.el b/emacsql-psql.el
index f7a895ef2b..47ed1e0eb7 100644
--- a/emacsql-psql.el
+++ b/emacsql-psql.el
@@ -75,10 +75,10 @@
     (emacsql-clear connection)
     (emacsql-send-string connection sql-string)
     (emacsql-wait connection)
-    (let ((error (emacsql-simple-error-check connection)))
+    (let ((error (emacsql-error-check connection)))
       (if error
           (signal 'emacsql-error (list error))
-        (emacsql-simple-parse connection)))))
+        (emacsql-parse connection)))))
 
 (provide 'emacsql-psql)
 
diff --git a/emacsql-sqlite.el b/emacsql-sqlite.el
index 63018cb6a8..5b5905910b 100644
--- a/emacsql-sqlite.el
+++ b/emacsql-sqlite.el
@@ -127,10 +127,10 @@ buffer. This is for debugging purposes."
     (emacsql-clear connection)
     (emacsql-send-string connection sql-string)
     (emacsql-wait connection)
-    (let ((error (emacsql-simple-error-check connection)))
+    (let ((error (emacsql-error-check connection)))
       (if error
           (signal (emacsql-sqlite-get-condition error) (list error))
-        (emacsql-simple-parse connection)))))
+        (emacsql-parse connection)))))
 
 (provide 'emacsql-sqlite)
 
diff --git a/emacsql.el b/emacsql.el
index e3f6f2067c..a81cd8eea5 100644
--- a/emacsql.el
+++ b/emacsql.el
@@ -156,7 +156,7 @@ This prompt value was chosen because it is unreadable."
                                         (buffer-substring
                                          (- (point-max) 2) (point-max)))))))
 
-(defmethod emacsql-simple-parse ((connection emacsql-simple-parser))
+(defmethod emacsql-parse ((connection emacsql-simple-parser))
   "Parse output into an s-expression.
 Output should have one row per line, separated by whitespace."
   (with-current-buffer (emacsql-buffer connection)
@@ -169,7 +169,7 @@ Output should have one row per line, separated by 
whitespace."
                and do (progn (forward-char 1) (setf row ()))
                finally (cl-return rows)))))
 
-(defmethod emacsql-simple-error-check ((connection emacsql-simple-parser))
+(defmethod emacsql-error-check ((connection emacsql-simple-parser))
   "Return the error message from CONNECTION, or nil for no error."
   (with-current-buffer (emacsql-buffer connection)
     (let ((case-fold-search t))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]