Skip to content

Commit 0398177

Browse files
yuhan0bbatsov
authored andcommitted
Rename some variables
Mark the rx spec defconst vars as private Vars named `-regexp` should be strings, not rx specs
1 parent 2cdac01 commit 0398177

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

cider-eval.el

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ It delegates the actual error content to the eval or op handler."
564564
;; Reference:
565565
;; https://github.com/clojure/clojure/blob/clojure-1.10.0/src/clj/clojure/main.clj#L251
566566
;; See `cider-compilation-regexp' for interpretation of match groups.
567-
(defconst cider-clojure-1.10--location
567+
(defconst cider--clojure-1.10-location
568568
'(sequence
569569
"at " (minimal-match (zero-or-more anything)) ;; the fully-qualified name of the function that triggered the error
570570
"("
@@ -574,7 +574,7 @@ It delegates the actual error content to the eval or op handler."
574574
":" (group-n 4 (one-or-more (any "-" digit)))) ; column number
575575
")."))
576576

577-
(defconst cider-clojure-1.10-error
577+
(defconst cider--clojure-1.10-error
578578
`(sequence
579579
(or "Syntax error reading source " ; phase = :read-source
580580
(sequence
@@ -583,10 +583,10 @@ It delegates the actual error content to the eval or op handler."
583583
(or "macroexpanding " ; phase = :macro-syntax-check / :macroexpansion
584584
"compiling ") ; phase = :compile-syntax-check / :compilation
585585
(minimal-match (zero-or-more anything)))) ; optional symbol, eg. foo/bar
586-
,cider-clojure-1.10--location)
586+
,cider--clojure-1.10-location)
587587
"Regexp matching error messages triggered in compilation / read / print phases.")
588588

589-
(defconst cider-clojure-warning
589+
(defconst cider--clojure-warning
590590
`(sequence
591591
(minimal-match (zero-or-more anything))
592592
(group-n 1 "warning")
@@ -601,8 +601,8 @@ It delegates the actual error content to the eval or op handler."
601601
;; which is a subset of these regexes.
602602
(defconst cider-clojure-compilation-regexp
603603
(rx-to-string
604-
`(seq bol (or ,cider-clojure-warning
605-
,cider-clojure-1.10-error))
604+
`(seq bol (or ,cider--clojure-warning
605+
,cider--clojure-1.10-error))
606606
'nogroup)
607607
"A few example values that will match:
608608
\"Reflection warning, /tmp/foo/src/foo/core.clj:14:1 - \"
@@ -611,7 +611,7 @@ It delegates the actual error content to the eval or op handler."
611611

612612
(defconst cider-clojure-compilation-error-regexp
613613
(rx-to-string
614-
`(seq bol ,cider-clojure-1.10-error)
614+
`(seq bol ,cider--clojure-1.10-error)
615615
'nogroup)
616616
"Like `cider-clojure-compilation-regexp',
617617
but excluding warnings such as reflection warnings.
@@ -620,25 +620,25 @@ A few example values that will match:
620620
\"Syntax error compiling at (src/workspace_service.clj:227:3).\"
621621
\"Unexpected error (ClassCastException) macroexpanding defmulti at (src/haystack/parser.cljc:21:1).\"")
622622

623-
(defconst cider--clojure-execution-error-regexp
623+
(defconst cider--clojure-execution-error
624624
`(sequence
625625
(or "Error reading eval result " ; phase = :read-eval-result
626626
"Error printing return value " ; phase = :print-eval-result
627627
"Execution error ") ; phase = :execution
628628
(minimal-match (zero-or-more anything)) ; optional class, eg. (ArithmeticException)
629-
,cider-clojure-1.10--location))
629+
,cider--clojure-1.10-location))
630630

631-
(defconst cider--clojure-spec-execution-error-regexp
631+
(defconst cider--clojure-spec-execution-error
632632
`(sequence
633633
"Execution error - invalid arguments to "
634634
(minimal-match (one-or-more anything))
635635
" "
636-
,cider-clojure-1.10--location))
636+
,cider--clojure-1.10-location))
637637

638638
(defconst cider-clojure-runtime-error-regexp
639639
(rx-to-string
640-
`(seq bol (or ,cider--clojure-execution-error-regexp
641-
,cider--clojure-spec-execution-error-regexp))
640+
`(seq bol (or ,cider--clojure-execution-error
641+
,cider--clojure-spec-execution-error))
642642
'nogroup)
643643
"Matches runtime errors, as oppsed to compile-time/macroexpansion-time errors.
644644

0 commit comments

Comments
 (0)