aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Smith-Mannschott <bsmith.occs@gmail.com>2010-08-23 20:30:51 +0200
committerStuart Sierra <mail@stuartsierra.com>2010-09-03 12:23:36 -0400
commit6321145ba58dc4773b8c866abecc49180dfe5309 (patch)
treeef53fe568014c4c30cfbc4debc30d03239cb4574
parenta5e611beb358b518d86d7c4c9aef5261fee078b7 (diff)
remove derecated clojure.contrib.apply-macro
Signed-off-by: Stuart Sierra <mail@stuartsierra.com>
-rw-r--r--modules/apply-macro/pom.xml16
-rw-r--r--modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj45
-rw-r--r--modules/complete/pom.xml5
-rw-r--r--modules/gen-html-docs/src/main/clojure/clojure/contrib/gen_html_docs.clj1
-rw-r--r--pom.xml1
5 files changed, 0 insertions, 68 deletions
diff --git a/modules/apply-macro/pom.xml b/modules/apply-macro/pom.xml
deleted file mode 100644
index 23048791..00000000
--- a/modules/apply-macro/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http//www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.clojure.contrib</groupId>
- <artifactId>parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>apply-macro</artifactId>
- <dependencies>
- </dependencies>
-</project> \ No newline at end of file
diff --git a/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj b/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj
deleted file mode 100644
index 9df85407..00000000
--- a/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj
+++ /dev/null
@@ -1,45 +0,0 @@
-;;; apply_macro.clj: make macros behave like functions
-
-;; by Stuart Sierra, http://stuartsierra.com/
-;; January 28, 2009
-
-;; Copyright (c) Stuart Sierra, 2009. All rights reserved. The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution. By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license. You must not
-;; remove this notice, or any other, from this software.
-
-
-;; Don't use this. I mean it. It's evil. How evil? You can't
-;; handle it, that's how evil it is. That's right. I did it so you
-;; don't have to, ok? Look but don't touch. Use this lib and you'll
-;; go blind.
-
-;; DEPRECATED in 1.2 with no replacement.
-
-(ns ^{:deprecated "1.2"}
- clojure.contrib.apply-macro)
-
-;; Copied from clojure.core/spread, which is private.
-(defn- spread
- "Flatten final argument list as in apply."
- [arglist]
- (cond
- (nil? arglist) nil
- (nil? (rest arglist)) (seq (first arglist))
- :else (cons (first arglist) (spread (rest arglist)))))
-
-(defmacro apply-macro
- "This is evil. Don't ever use it. It makes a macro behave like a
- function. Seriously, how messed up is that?
-
- Evaluates all args, then uses them as arguments to the macro as with
- apply.
-
- (def things [true true false])
- (apply-macro and things)
- ;; Expands to: (and true true false)"
- [macro & args]
- (cons macro (spread (map eval args))))
diff --git a/modules/complete/pom.xml b/modules/complete/pom.xml
index 624d84fb..d1c4bb9c 100644
--- a/modules/complete/pom.xml
+++ b/modules/complete/pom.xml
@@ -47,11 +47,6 @@
</dependency>
<dependency>
<groupId>org.clojure.contrib</groupId>
- <artifactId>apply-macro</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.clojure.contrib</groupId>
<artifactId>base64</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
diff --git a/modules/gen-html-docs/src/main/clojure/clojure/contrib/gen_html_docs.clj b/modules/gen-html-docs/src/main/clojure/clojure/contrib/gen_html_docs.clj
index 73166510..466c3fb4 100644
--- a/modules/gen-html-docs/src/main/clojure/clojure/contrib/gen_html_docs.clj
+++ b/modules/gen-html-docs/src/main/clojure/clojure/contrib/gen_html_docs.clj
@@ -475,7 +475,6 @@ emits the generated HTML to the path named by path."
'clojure.zip
'clojure.xml
'clojure.contrib.accumulators
- 'clojure.contrib.apply-macro
'clojure.contrib.auto-agent
'clojure.contrib.combinatorics
'clojure.contrib.command-line
diff --git a/pom.xml b/pom.xml
index ad38a1fa..4a1696d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
<module>modules/accumulators</module>
<module>modules/agent-utils</module>
- <module>modules/apply-macro</module>
<module>modules/base64</module>
<module>modules/classpath</module>
<module>modules/combinatorics</module>