Further optimization in Tramp's file name decomposition

* lisp/net/tramp.el (tramp-syntax): Recompute all file name
components.  Call `custom-set-variables' after loading.
(tramp-build-prefix-format, tramp-build-prefix-regexp)
(tramp-build-method-regexp)
(tramp-build-postfix-method-format)
(tramp-build-postfix-method-regexp)
(tramp-build-prefix-ipv6-format)
(tramp-build-prefix-ipv6-regexp)
(tramp-build-postfix-ipv6-format)
(tramp-build-postfix-ipv6-regexp)
(tramp-build-postfix-host-format)
(tramp-build-postfix-host-regexp)
(tramp-build-file-name-regexp)
(tramp-build-completion-file-name-regexp): New defuns.
(tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp)
(tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-file-name-regexp): Convert defuns into defvars.
(tramp-prefix-regexp-alist)
(tramp-postfix-method-regexp-alist)
(tramp-prefix-ipv6-regexp-alist)
(tramp-postfix-ipv6-regexp-alist)
(tramp-postfix-host-regexp-alist)
(tramp-remote-file-name-spec-regexp-alist): Remove.
(tramp-build-remote-file-name-spec-regexp)
(tramp-build-file-name-structure): Simplify.
(tramp-completion-file-name-regexp-alist): New defconst.
(tramp-tramp-file-p, tramp-dissect-file-name)
(tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name)
(tramp-rfn-eshadow-update-overlay-regexp)
(tramp-register-file-name-handlers)
(tramp-completion-handle-file-name-all-completions)
(tramp-completion-dissect-file-name, tramp-clear-passwd):
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered)
(tramp-compute-multi-hops): Use variables but functions for
file name components.

* test/lisp/net/tramp-tests.el (tramp-test24-file-name-completion):
Use variables but functions for file name components.

1 files changed, 11 insertions, 11 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 4139d50ff01..13e2e30cab4 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2852,16 +2852,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (tramp-change-syntax syntax)
             (let ;; This is needed for the `simplified' syntax.
                 ((method-marker
-                  (if (zerop (length (tramp-method-regexp)))
+                  (if (zerop (length tramp-method-regexp))
                       "" tramp-default-method-marker))
                  ;; This is needed for the `separate' syntax.
-                 (prefix-format (substring (tramp-prefix-format) 1)))
+                 (prefix-format (substring tramp-prefix-format 1)))
               ;; Complete method name.
               (unless (or (zerop (length method))
-                          (zerop (length (tramp-method-regexp))))
+                          (zerop (length tramp-method-regexp)))
                 (should
                  (member
-                  (concat prefix-format method (tramp-postfix-method-format))
+                  (concat prefix-format method tramp-postfix-method-format)
                   (file-name-all-completions
                    (concat prefix-format (substring method 0 1)) "/"))))
               ;; Complete host name for default method.  With gvfs
@@ -2873,25 +2873,25 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                   (should
                    (member
                     (concat
-                     prefix-format method-marker (tramp-postfix-method-format)
-                     host (tramp-postfix-host-format))
+                     prefix-format method-marker tramp-postfix-method-format
+                     host tramp-postfix-host-format)
                     (file-name-all-completions
                      (concat
-                      prefix-format method-marker (tramp-postfix-method-format)
+                      prefix-format method-marker tramp-postfix-method-format
                       (substring host 0 1))
                      "/")))))
               ;; Complete host name.
               (unless (or (zerop (length method))
-                          (zerop (length (tramp-method-regexp)))
+                          (zerop (length tramp-method-regexp))
                           (zerop (length host))
                           (tramp--test-gvfs-p method))
                 (should
                  (member
                   (concat
-                   prefix-format method (tramp-postfix-method-format)
-                   host (tramp-postfix-host-format))
+                   prefix-format method tramp-postfix-method-format
+                   host tramp-postfix-host-format)
                   (file-name-all-completions
-                   (concat prefix-format method (tramp-postfix-method-format))
+                   (concat prefix-format method tramp-postfix-method-format)
                    "/"))))))
 
         ;; Cleanup.