Skip to content
Sign up
This repository

public / clojure-refactoring Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
New issue

fixed quoting issues #4

Closed
wants to merge 13 commits into from
 +94 −105

Labels

Milestone

No milestone

Assignee

No one assigned

Notifications

2 participants

Joost Diepenmaat Tom Crayford
Joost Diepenmaat
joodie commented

This patch simplifies the handling of string arguments and should fix all the string-quoting issues.

Tom Crayford
tcrayford commented Owner

Do the tests still pass? I don't have a running clojure env anymore (and as you can see by the last commit date, I don't really work on this project anymore).

If you're interested, you could be a new maintainer.

Joost Diepenmaat
joodie commented
Tom Crayford
tcrayford commented Owner

That's almost definitely to do with clojure 1.2 splitting up clojure contrib (this was built on a pre-release version of clojure 1.2).

If you want to become a maintainer feel free to fork it, and let me know. I'll put a notice on here that this version is depreceated and people should see yours.

Joost Diepenmaat
joodie commented
Tom Crayford
tcrayford commented Owner

I should really move it all to BSD. I don't really have any worries about the licensing of this project (the .el file being under the gpl was just because I copied it from another elisp file)

Joost Diepenmaat
joodie commented
Tom Crayford
tcrayford commented Owner

Awesome. I'm working now, but I'll probably get to it tomorrow or sometime later tonight (EU timezone)

Joost Diepenmaat
joodie commented
Joost Diepenmaat
joodie commented

Hi Tom,

Sorry to bother you again, but I would like to push out a new version of clojure-refactoring with my fixes and update to the latest parsley version and I want to have the licensing cleared up before I do that and "officially" take over as the maintainer.

If you have the time, can you please update the licensing information in your repo so I can pull it in and bake a new release?

Alternatively, just let me know what you want license-wise and I can make the changes myself. In any case, I do need your input on this before I proceed.

Thanks,
Joost.

Tom Crayford
tcrayford commented Owner

Send me a pull request with it all changed to BSD (both the elisp and the clojure). Also put depreciation notices in the readme. I'll accept that, and you can start working.

Sorry I didn't get round to this.

Joost Diepenmaat joodie referenced this pull request Merged

Pull Request #5: Licensing update as discussed in issue #4

Tom Crayford tcrayford referenced this pull request from a commit
Tom Crayford Merge pull request #5 from joodie/licensing … 
Licensing update as discussed in issue #4
 1371560
Tom Crayford tcrayford closed this
Joost Diepenmaat
joodie commented
Tom Crayford
tcrayford commented Owner

No worries. I like that this work might actually go somewhere.

Note I never really announced it on the clojure mailing list, but you might well want to at some point soon (though I still don't think some features [rename]) are ready for mainstream use.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 13 unique commits by 1 author.

Oct 21, 2011
Joost Diepenmaat sane quoting everywhere bfa71b3
Joost Diepenmaat re-indent after thread/unthread action c8df57a
Joost Diepenmaat remove unused elisp functions, set keybinding to C-c C-f 7489c08
Joost Diepenmaat remove dev-dependencies from project. makes the tests work again 1554a86
Joost Diepenmaat test for slime connection before refactoring c2ac02d
Joost Diepenmaat handle reader macros better 35a9546
Oct 22, 2011
Joost Diepenmaat partial work on moving parser to new version of parsley 7c7e786
Joost Diepenmaat fix doc strings 768d670
Joost Diepenmaat update project.clj for new parsley 943829a
Oct 23, 2011
Joost Diepenmaat Merge branch 'master' into new-parsley 5dcf6d6
Joost Diepenmaat fix new parsley code d9fe9cc
Joost Diepenmaat more robust string-literal parsing 9e74634
Oct 24, 2011
Joost Diepenmaat slightly better testing on string parsing 66ebbef
This page is out of date. Refresh to see the latest.

Showing 8 changed files with 94 additions and 105 deletions. Show Diff Stats Hide Diff Stats

  1. 2  README.markdown
  2. 55  clojure-refactoring-mode.el
  3. 7  project.clj
  4. 5  src/clojure_refactoring/ast.clj
  5. 34  src/clojure_refactoring/support/core.clj
  6. 73  src/clojure_refactoring/support/parser.clj
  7. 2  test/clojure_refactoring/ast/zip_test.clj
  8. 21  test/clojure_refactoring/ast_test.clj
2  README.markdown
Source Rendered
View 
@@ -53,7 +53,7 @@ Put clojure-refactoring-mode.el somewhere on your load path and add
53 53 
     (require 'clojure-refactoring-mode)
54 54 
 into your .emacs.
55 55
56   
-Clojure-refactoring-ido will then be bound to C-c C-r.
  56 
+Clojure-refactoring-ido will then be bound to C-c C-f.
57 57
58 58 
 Note that global rename will be slow at first, as it has to read the
59 59 
 source files into a cached.
55  clojure-refactoring-mode.el
View 
@@ -38,32 +38,21 @@
38 38 
 (defun clojure-refactoring-eval-sync (string)
39 39 
   (slime-eval `(swank:eval-and-grab-output ,string)))
40 40
41   
-(defun escape-string-literals (string)
42   
-  (substring-no-properties
43   
-   (with-temp-buffer
44   
-     (insert (substring-no-properties string))
45   
-     (beginning-of-buffer)
46   
-     (buffer-string)
47   
-     (while (search-forward-regexp  "\\\\*\042" nil t)
48   
-       (replace-match "\"")
49   
-       (backward-char)
50   
-       (insert "\\")
51   
-       (forward-char))
52   
-     (buffer-string))))
53   
-
54 41 
 (setq clojure-refactoring-refactorings-list
55 42 
       (list "extract-fn" "thread-last" "extract-global" "thread-first" "unthread" "extract-local" "destructure-map" "rename" "global-rename"))
56 43
57 44 
 (defun clojure-refactoring-ido ()
58 45 
   (interactive)
59   
-  (let ((refactoring (ido-completing-read "Refactoring: " clojure-refactoring-refactorings-list nil t)))
60   
-    (funcall (intern (concat "clojure-refactoring-" refactoring)))))
  46 
+  (if (and (fboundp 'slime-connected-p)
  47 
+           (slime-connected-p))
  48 
+      (let ((refactoring (ido-completing-read "Refactoring: " clojure-refactoring-refactorings-list nil t)))
  49 
+        (funcall (intern (concat "clojure-refactoring-" refactoring))))
  50 
+    (error "clojure-refactoring needs a SLIME connection.")))
61 51
62 52 
 (defun get-sexp ()
63 53 
   (if mark-active
64   
-      (escape-string-literals (delete-and-extract-region (mark) (point)))
65   
-    (let (out (escape-string-literals
66   
-               (format "%s" (sexp-at-point))))
  54 
+      (substring-no-properties (delete-and-extract-region (mark) (point)))
  55 
+    (let ((out (slime-sexp-at-point)))
67 56 
       (forward-kill-sexp)
68 57 
       out)))
69 58 
 
@@ -77,7 +66,8 @@
77 66
78 67 
 ;;formatting
79 68 
 (defun clojure-refactoring-wrap-as-string (s)
80   
-  (format "\"%s\"" s))
  69 
+  (assert (stringp s))
  70 
+  (format "%S" s))
81 71
82 72 
 (defun clojure-refactoring-format-clojure-call (ns name &rest args)
83 73 
   (concat
 
@@ -91,26 +81,14 @@
91 81 
   (clojure-refactoring-call
92 82 
    (apply 'clojure-refactoring-format-call-with-string-args args)))
93 83
94   
-(defun clojure-refactoring-quote (s)
95   
-  (format "'%s" s))
96   
-
97   
-(defun clojure-refactoring-format-call-with-quoted-args (ns name &rest args)
98   
-  (apply 'clojure-refactoring-format-clojure-call ns name (mapcar #'clojure-refactoring-quote args)))
99   
-
100   
-(defun clojure-refactoring-call-with-quoted-args (&rest args)
101   
-  (clojure-refactoring-call
102   
-   (apply 'clojure-refactoring-format-call-with-quoted-args args)))
103   
-
104 84 
 (defun clojure-refactoring-insert-sexp (s)
105 85 
   (insert (read s)))
106 86
107   
-;; FIXME: this will break if there's an escaped \" in any of the code
108   
-;; it reads.
109 87 
 (defun clojure-refactoring-extract-fn ()
110 88 
   "Extracts a function."
111 89 
   (interactive)
112 90 
   (let ((fn-name (read-from-minibuffer "Function name: "))
113   
-        (defn (escape-string-literals (slime-defun-at-point)))
  91 
+        (defn (slime-defun-at-point))
114 92 
         (body (get-sexp)))
115 93 
     (save-excursion
116 94 
       (beginning-of-defun)
 
@@ -127,7 +105,9 @@
127 105 
        (clojure-refactoring-call-with-string-args
128 106 
         "thread-expression"
129 107 
         (format "thread-%s" str)
130   
-        body)))))
  108 
+        body))
  109 
+      (beginning-of-defun)
  110 
+      (indent-sexp))))
131 111
132 112 
 (defun clojure-refactoring-thread-last ()
133 113 
   (interactive)
 
@@ -152,8 +132,7 @@
152 132 
           (new-name (read-from-minibuffer "New name: ")))
153 133 
       (beginning-of-defun)
154 134 
       (mark-sexp)
155   
-      (let ((body (escape-string-literals
156   
-                   (buffer-substring-no-properties (mark t) (point)))))
  135 
+      (let ((body (buffer-substring-no-properties (mark t) (point))))
157 136 
         (forward-kill-sexp)
158 137 
         (clojure-refactoring-insert-sexp
159 138 
          (clojure-refactoring-call-with-string-args
 
@@ -193,7 +172,7 @@
193 172
194 173 
 (defun clojure-refactoring-extract-local ()
195 174 
   (let ((var-name (read-from-minibuffer "Variable name: "))
196   
-        (defn (escape-string-literals (slime-defun-at-point)))
  175 
+        (defn (slime-defun-at-point))
197 176 
         (body (get-sexp)))
198 177 
     (save-excursion
199 178 
       (beginning-of-defun)
 
@@ -208,7 +187,7 @@
208 187
209 188 
 (defun clojure-refactoring-destructure-map ()
210 189 
   (let ((var-name (read-from-minibuffer "Map name: "))
211   
-        (defn (escape-string-literals (slime-defun-at-point))))
  190 
+        (defn (slime-defun-at-point)))
212 191 
     (save-excursion
213 192 
       (beginning-of-defun)
214 193 
       (forward-kill-sexp)
 
@@ -238,7 +217,7 @@
238 217
239 218 
 (defvar clojure-refactoring-mode-map
240 219 
   (let ((map (make-sparse-keymap)))
241   
-    (define-key map (kbd "C-c C-r") 'clojure-refactoring-ido)
  220 
+    (define-key map (kbd "C-c C-f") 'clojure-refactoring-ido)
242 221 
     map)
243 222 
   "Keymap for Clojure refactoring mode.")
244 223
7  project.clj
View 
@@ -2,9 +2,4 @@
2 2 
   :description "Clojure side of a refactoring tool"
3 3 
   :dependencies [[org.clojure/clojure "1.2.0"]
4 4 
                  [org.clojure/clojure-contrib "1.2.0"]
5   
-                 [tcrayford_parsley/parsley "0.1.0"]]
6   
-  :dev-dependencies [[swank-clojure "1.2.1"]
7   
-                     [criterium "0.0.1-SNAPSHOT"]
8   
-                     [lein-difftest "1.3.0"]
9   
-                     [radagast "1.0.0"]]
10   
-  :hooks [leiningen.hooks.difftest])
  5 
+                 [net.cgrand/parsley "0.8.0"]])
5  src/clojure_refactoring/ast.clj
View 
@@ -6,10 +6,11 @@
6 6 
   (:require [clojure.core :as core])
7 7 
   (:use [clojure-refactoring.support.core
8 8 
          :exclude [sub-nodes tree-contains?]])
9   
-  (:require [clojure-refactoring.support.parser :as parser]))
  9 
+  (:require [clojure-refactoring.support.parser :as parser])
  10 
+  (:import net.cgrand.parsley.Node))
10 11
11 12 
 (defn make-node [tag content]
12   
-  {:tag tag :content content})
  13 
+  (Node. tag content))
13 14
14 15 
 (defn symbol [sym]
15 16 
   (make-node :atom (core/list (name sym))))
34  src/clojure_refactoring/support/core.clj
View 
@@ -3,8 +3,9 @@
3 3 
         [clojure.contrib.seq-utils :only [find-first]]
4 4 
         [clojure.walk :only [postwalk-replace]]))
5 5
6   
-(defn format-code [node]
  6 
+(defn format-code
7 7 
   "Outputs code roughly how a human would format it."
  8 
+   [node]
8 9 
   (with-out-str
9 10 
     (with-pprint-dispatch *code-dispatch*
10 11 
       (pprint node))))
 
@@ -14,50 +15,59 @@
14 15 
   (fn [& fns] (fn [& args]
15 16 
                 (f identity (map apply fns (repeat args))))))
16 17
17   
-(def any-of? ^{:doc "Takes predicates and returns a function
  18 
+(def ^{:doc "Takes predicates and returns a function
18 19 
               that returns true if any of the predicates are true"}
19   
-     (predicater-by some))
  20 
+  any-of?
  21 
+  (predicater-by some))
20 22
21   
-(def all-of? ^{:doc "Takes predicates and returns a function
  23 
+(def ^{:doc "Takes predicates and returns a function
22 24 
               that returns true if all of the predicates are true"}
23   
-     (predicater-by every?))
  25 
+  all-of?
  26 
+  (predicater-by every?))
24 27
25 28 
 (defn sub-nodes [tree]
26 29 
   (tree-seq (any-of? sequential? map? set?)
27 30 
             seq tree))
28 31
29   
-(defn count= [seq n]
  32 
+(defn count=
30 33 
   "Checks if the count of seq is equal to n"
  34 
+  [seq n]
31 35 
   (= (count seq) n))
32 36
33 37 
 (def binding-forms
34 38 
      #{'let 'fn 'binding 'for 'doseq 'dotimes 'defn 'loop 'defmacro
35 39 
        'if-let 'when-let 'defn- 'defmethod 'defmethod-})
36 40
37   
-(defn evens [coll]
  41 
+(defn evens
38 42 
   "Returns every other item of coll"
  43 
+  [coll]
39 44 
   (take-nth 2 coll))
40 45
41   
-(defn tree-contains? [coll obj]
  46 
+(defn tree-contains?
42 47 
   "True if coll contains obj at some level of nesting"
  48 
+   [coll obj]
43 49 
   (some #{obj} (sub-nodes coll)))
44 50
45   
-(defn replace-when [pred f coll]
  51 
+(defn replace-when
46 52 
   "Replaces each element of coll if pred returns true on it."
  53 
+  [pred f coll]
47 54 
   (map
48 55 
    (fn [elem]
49 56 
      (if (pred elem) (f elem) elem)) coll))
50 57
51   
-(defn first= [x y]
  58 
+(defn first=
  59 
+  [x y]
52 60 
   (= (first x) y))
53 61
54   
-(defn but-second [coll]
  62 
+(defn but-second
  63 
+  [coll]
55 64 
   (->> (first coll)
56 65 
        (conj (drop 2 coll))))
57 66
58   
-(defn after-each [pred elems coll]
  67 
+(defn after-each
59 68 
   "After each item in coll that matches predicate
60 69 
    add elems."
  70 
+  [pred elems coll]
61 71 
   (reduce
62 72 
    (fn [accum elem]
63 73 
      (if (pred elem)
73  src/clojure_refactoring/support/parser.clj
View
... ... 
@@ -1,48 +1,35 @@
1 1 
 (ns clojure-refactoring.support.parser
2   
-  (:require [net.cgrand.parsley.glr :as glr])
3   
-  (:use net.cgrand.parsley
4   
-        [clojure.contrib.def :only [defonce-]]))
  2 
+  (:use net.cgrand.parsley ))
5 3
6   
-(defonce- sexp
7   
-  (memoize
8   
-   (parser {:space [#{:whitespace :comment :discard}:*]
9   
-            :main :expr*}
10   
-           :expr- #{:atom :list :vector :set :map :string :regex
11   
-                    :meta :deprecated-meta :quote
12   
-                    :unquote :syntax-quote :unquote-splicing
13   
-                    :deref :var :fn :char}
14   
-           :atom1st- #{{\a \z \A \Z \0 \9} (any-of "!$%&*+-./:<=>?_")}
15   
-           :atom (token :atom1st #{:atom1st \#}:* (?! #{:atom1st \#}))
16   
-           :string (token \" #{(none-of \\ \") [\\ any-char]}:* \")
17   
-           :char (token \\ #{any-char "newline" "space" "tab" "backspace"
18   
-                             "formfeed" "return"
19   
-                             (into [\u] (repeat 4 {\0 \9 \a \f \A \F}))
20   
-                             [\u :hex :hex :hex :hex]
21   
-                             [\o {\0 \7}]
22   
-                             [\o {\0 \7} {\0 \7}]
23   
-                             [\o {\0 \3} {\0 \7} {\0 \7}]}
24   
-                        (?! #{:atom1st \#}))
25   
-           :regex (token \# \" #{(none-of \\ \") [\\ any-char]}:* \")
26   
-           :list ["(" :expr* ")"]
27   
-           :vector ["[" :expr* "]"]
28   
-           :set ["#{" :expr* "}"]
29   
-           :map ["{" :expr* "}"]
30   
-           :discard ["#_" :expr]
31   
-           :meta ["^" :expr :expr]
32   
-           :quote [\' :expr]
33   
-           :syntax-quote [\` :expr]
34   
-           :tilda- [\~ (?! \@)]
35   
-           :unquote [:tilda :expr]
36   
-           :unquote-splicing ["~@" :expr]
37   
-           :deprecated-meta ["#^" :expr :expr]
38   
-           :deref [\@ :expr]
39   
-           :var ["#'" :expr]
40   
-           :fn ["#(" :expr* ")"]
  4 
+(def sexp
  5 
+  (parser {:space [#{:whitespace :comment :discard} :*]
  6 
+           :main :expr*}
  7 
+          :expr- #{:atom :list :vector :set :string :regex :map :meta :quote :char
  8 
+                   :syntax-quote :unquote :unquote-splicing :deprecated-meta
  9 
+                     :deref :var :fn}
  10 
+          :atom #"[a-zA-Z0-9!$%&*+\-\./:<=>?_][a-zA-Z0-9!$%&*+\-\./:<=>?_#]*"
  11 
+          :comment #"(#!|;)[^\n]*"
  12 
+          :whitespace [#"[ \t\n,]+"]
  13 
+          :list ["(" :expr* ")"]
  14 
+          :vector ["[" :expr* "]"]
  15 
+          :set ["#{" :expr* "}"]
  16 
+          :regex #"#\"([^\"\\]*|(\\.))*\""
  17 
+          :string #"\"([^\"\\]*|(\\.))*\""
  18 
+          :pair- [:expr :expr]
  19 
+          :map ["{" :pair* "}"]
  20 
+          :discard ["#_" :expr]
  21 
+          :meta ["^" :pair]
  22 
+          :quote ["'" :expr]
  23 
+          :char #"\\(.|newline|space|tab|backspace|formfeed|return|u([0-9a-fA-F]{4}|[0-7]{1,2}|[0-3][0-7]{2}))(?![a-zA-Z0-9!$%&*+\-\./:<=>?_#])"
  24 
+          :syntax-quote ["`" :expr]
  25 
+          :tilde- #"~(?!@)"
  26 
+          :unquote [:tilde :expr]
  27 
+          :unquote-splicing ["~@" :expr]
  28 
+          :deprecated-meta ["#^" :pair]
  29 
+          :deref ["@" :expr]
  30 
+          :var ["#'" :expr]
  31 
+          :fn ["#(" :expr* ")"]))
41 32
42   
-           :comment (token #{"#!" ";"} (none-of \newline):* (?! (none-of \newline)))
43   
-
44   
-           :whitespace (token #{\space \tab \newline \,}:+ (?! #{\space \tab \newline \,})))))
45   
-
46   
-(def parse (comp second first sexp))
  33 
+(def parse (comp :content sexp))
47 34
48 35 
 (def parse1 (comp first parse)) ;;parses one node
2  test/clojure_refactoring/ast/zip_test.clj
View 
@@ -5,7 +5,7 @@
5 5 
   (:require [clojure-refactoring.ast :as ast])
6 6 
   (:use clojure.test))
7 7
8   
-(use-fixtures :once #(time %))
  8 
+(use-fixtures :once #(time (%)))
9 9
10 10 
 (deftest find-node-finds-the-first-instance-of-a-node-in-a-zipper
11 11 
   (is (=
21  test/clojure_refactoring/ast_test.clj
View 
@@ -71,11 +71,28 @@
71 71
72 72 
 (deftest parsley_list
73 73 
   (is (= (ast/list [1 2 3])
74   
-'{:tag :list, :content ("(" 1 {:tag :whitespace, :content (" ")} 2 {:tag :whitespace, :content (" ")} 3 ")")})))
  74 
+         (ast/make-node :list ["("
  75 
+                               1 (ast/make-node :whitespace [" "])
  76 
+                               2 (ast/make-node :whitespace [" "])
  77 
+                               3 ")"]))))
75 78
76 79 
 (deftest parsley_vector
77 80 
   (is (= (ast/vector [1 2 3])
78   
-'{:tag :vector, :content ("[" 1 {:tag :whitespace, :content (" ")} 2 {:tag :whitespace, :content (" ")} 3 "]")})))
  81 
+         (ast/make-node :vector ["["
  82 
+                               1 (ast/make-node :whitespace [" "])
  83 
+                               2 (ast/make-node :whitespace [" "])
  84 
+                               3 "]"]))))
79 85
80 86 
 (deftest parsley_binding_node?
81 87 
   (is (ast/binding-node? (parser/parse1 "(let [a 1] a)"))))
  88 
+
  89 
+(def tricky-sources
  90 
+  { :string
  91 
+  "\"When compiling, generates compiled bytecode for a class with the\n  given package-qualified :name (which, as all names in these\n  parameters, can be a string or symbol), and writes the .class file\n  to the *compile-path* directory.  When not compiling, does\n  nothing. The gen-class construct contains no implementation, as the\n  implementation will be dynamically sought by the generated class in\n  functions in an implementing Clojure namespace. Given a generated\n  class org.mydomain.MyClass with a method named mymethod, gen-class\n  will generate an implementation that looks for a function named by \n  (str prefix mymethod) (default prefix: \\\"-\\\") in a\n  Clojure namespace specified by :impl-ns\n  (defaults to the current namespace). All inherited methods,\n  generated methods, and init and main functions (see :methods, :init,\n  and :main below) will be found similarly prefixed. By default, the\n  static initializer for the generated class will attempt to load the\n  Clojure support code for the class as a resource from the classpath,\n  e.g. in the example case, ``org/mydomain/MyClass__init.class``. This\n  behavior can be controlled by :load-impl-ns\n\n  Note that methods with a maximum of 18 parameters are supported.\n\n  In all subsequent sections taking types, the primitive types can be\n  referred to by their Java names (int, float etc), and classes in the\n  java.lang package can be used without a package qualifier. All other\n  classes must be fully qualified.\n\n  Options should be a set of key/value pairs, all except for :name are optional:\n\n  :name aname\n\n  The package-qualified name of the class to be generated\n\n  :extends aclass\n\n  Specifies the superclass, the non-private methods of which will be\n  overridden by the class. If not provided, defaults to Object.\n\n  :implements [interface ...]\n\n  One or more interfaces, the methods of which will be implemented by the class.\n\n  :init name\n\n  If supplied, names a function that will be called with the arguments\n  to the constructor. Must return [ [superclass-constructor-args] state] \n  If not supplied, the constructor args are passed directly to\n  the superclass constructor and the state will be nil\n\n  :constructors {[param-types] [super-param-types], ...}\n\n  By default, constructors are created for the generated class which\n  match the signature(s) of the constructors for the superclass. This\n  parameter may be used to explicitly specify constructors, each entry\n  providing a mapping from a constructor signature to a superclass\n  constructor signature. When you supply this, you must supply an :init\n  specifier. \n\n  :post-init name\n\n  If supplied, names a function that will be called with the object as\n  the first argument, followed by the arguments to the constructor.\n  It will be called every time an object of this class is created,\n  immediately after all the inherited constructors have completed.\n  It's return value is ignored.\n\n  :methods [ [name [param-types] return-type], ...]\n\n  The generated class automatically defines all of the non-private\n  methods of its superclasses/interfaces. This parameter can be used\n  to specify the signatures of additional methods of the generated\n  class. Static methods can be specified with ^{:static true} in the\n  signature's metadata. Do not repeat superclass/interface signatures\n  here.\n\n  :main boolean\n\n  If supplied and true, a static public main function will be generated. It will\n  pass each string of the String[] argument as a separate argument to\n  a function called (str prefix main).\n\n  :factory name\n\n  If supplied, a (set of) public static factory function(s) will be\n  created with the given name, and the same signature(s) as the\n  constructor(s).\n  \n  :state name\n\n  If supplied, a public final instance field with the given name will be\n  created. You must supply an :init function in order to provide a\n  value for the state. Note that, though final, the state can be a ref\n  or agent, supporting the creation of Java objects with transactional\n  or asynchronous mutation semantics.\n\n  :exposes {protected-field-name {:get name :set name}, ...}\n\n  Since the implementations of the methods of the generated class\n  occur in Clojure functions, they have no access to the inherited\n  protected fields of the superclass. This parameter can be used to\n  generate public getter/setter methods exposing the protected field(s)\n  for use in the implementation.\n\n  :exposes-methods {super-method-name exposed-name, ...}\n\n  It is sometimes necessary to call the superclass' implementation of an\n  overridden method.  Those methods may be exposed and referred in \n  the new method implementation by a local name.\n\n  :prefix string\n\n  Default: \\\"-\\\" Methods called e.g. Foo will be looked up in vars called\n  prefixFoo in the implementing ns.\n\n  :impl-ns name\n\n  Default: the name of the current ns. Implementations of methods will be \n  looked up in this namespace.\n\n  :load-impl-ns boolean\n\n  Default: true. Causes the static initializer for the generated class\n  to reference the load code for the implementing namespace. Should be\n  true when implementing-ns is the default, false if you intend to\n  load the code via some other method.\"\n"
  92 
+
  93 
+  :list
  94 
+  "(defmacro gen-class \n  \"When compiling, generates compiled bytecode for a class with the\n  given package-qualified :name (which, as all names in these\n  parameters, can be a string or symbol), and writes the .class file\n  to the *compile-path* directory.  When not compiling, does\n  nothing. The gen-class construct contains no implementation, as the\n  implementation will be dynamically sought by the generated class in\n  functions in an implementing Clojure namespace. Given a generated\n  class org.mydomain.MyClass with a method named mymethod, gen-class\n  will generate an implementation that looks for a function named by \n  (str prefix mymethod) (default prefix: \\\"-\\\") in a\n  Clojure namespace specified by :impl-ns\n  (defaults to the current namespace). All inherited methods,\n  generated methods, and init and main functions (see :methods, :init,\n  and :main below) will be found similarly prefixed. By default, the\n  static initializer for the generated class will attempt to load the\n  Clojure support code for the class as a resource from the classpath,\n  e.g. in the example case, ``org/mydomain/MyClass__init.class``. This\n  behavior can be controlled by :load-impl-ns\n\n  Note that methods with a maximum of 18 parameters are supported.\n\n  In all subsequent sections taking types, the primitive types can be\n  referred to by their Java names (int, float etc), and classes in the\n  java.lang package can be used without a package qualifier. All other\n  classes must be fully qualified.\n\n  Options should be a set of key/value pairs, all except for :name are optional:\n\n  :name aname\n\n  The package-qualified name of the class to be generated\n\n  :extends aclass\n\n  Specifies the superclass, the non-private methods of which will be\n  overridden by the class. If not provided, defaults to Object.\n\n  :implements [interface ...]\n\n  One or more interfaces, the methods of which will be implemented by the class.\n\n  :init name\n\n  If supplied, names a function that will be called with the arguments\n  to the constructor. Must return [ [superclass-constructor-args] state] \n  If not supplied, the constructor args are passed directly to\n  the superclass constructor and the state will be nil\n\n  :constructors {[param-types] [super-param-types], ...}\n\n  By default, constructors are created for the generated class which\n  match the signature(s) of the constructors for the superclass. This\n  parameter may be used to explicitly specify constructors, each entry\n  providing a mapping from a constructor signature to a superclass\n  constructor signature. When you supply this, you must supply an :init\n  specifier. \n\n  :post-init name\n\n  If supplied, names a function that will be called with the object as\n  the first argument, followed by the arguments to the constructor.\n  It will be called every time an object of this class is created,\n  immediately after all the inherited constructors have completed.\n  It's return value is ignored.\n\n  :methods [ [name [param-types] return-type], ...]\n\n  The generated class automatically defines all of the non-private\n  methods of its superclasses/interfaces. This parameter can be used\n  to specify the signatures of additional methods of the generated\n  class. Static methods can be specified with ^{:static true} in the\n  signature's metadata. Do not repeat superclass/interface signatures\n  here.\n\n  :main boolean\n\n  If supplied and true, a static public main function will be generated. It will\n  pass each string of the String[] argument as a separate argument to\n  a function called (str prefix main).\n\n  :factory name\n\n  If supplied, a (set of) public static factory function(s) will be\n  created with the given name, and the same signature(s) as the\n  constructor(s).\n  \n  :state name\n\n  If supplied, a public final instance field with the given name will be\n  created. You must supply an :init function in order to provide a\n  value for the state. Note that, though final, the state can be a ref\n  or agent, supporting the creation of Java objects with transactional\n  or asynchronous mutation semantics.\n\n  :exposes {protected-field-name {:get name :set name}, ...}\n\n  Since the implementations of the methods of the generated class\n  occur in Clojure functions, they have no access to the inherited\n  protected fields of the superclass. This parameter can be used to\n  generate public getter/setter methods exposing the protected field(s)\n  for use in the implementation.\n\n  :exposes-methods {super-method-name exposed-name, ...}\n\n  It is sometimes necessary to call the superclass' implementation of an\n  overridden method.  Those methods may be exposed and referred in \n  the new method implementation by a local name.\n\n  :prefix string\n\n  Default: \\\"-\\\" Methods called e.g. Foo will be looked up in vars called\n  prefixFoo in the implementing ns.\n\n  :impl-ns name\n\n  Default: the name of the current ns. Implementations of methods will be \n  looked up in this namespace.\n\n  :load-impl-ns boolean\n\n  Default: true. Causes the static initializer for the generated class\n  to reference the load code for the implementing namespace. Should be\n  true when implementing-ns is the default, false if you intend to\n  load the code via some other method.\"\n  {:added \"1.0\"}\n  \n  [& options]\n    (when *compile-files*\n      (let [options-map (into {} (map vec (partition 2 options)))\n            [cname bytecode] (generate-class options-map)]\n        (clojure.lang.Compiler/writeClassFile cname bytecode))))"})
  95 
+
  96 
+(deftest test-tricky-sources
  97 
+  (doseq [s tricky-sources]
  98 
+    (is (= (key s) (:tag (first (parser/parse (val s))))))))
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.