removed logic code

halgari · Mar 7, 2013 · 26bd3b0 · 26bd3b0
1 parent a1e4612
commit 26bd3b0
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 885 deletions.
diff --git a/project.clj b/project.clj
@@ -5,10 +5,7 @@
   :dependencies [[org.clojure/clojure "1.5.0-RC2"]
                  [speclj "2.5.0"]
                  [net.java.dev.jna/jna "3.4.0"]
-                 [fipp "0.1.0-SNAPSHOT"]
                  [criterium "0.3.1"]
-                 [org.clojure/core.logic "0.8.0-rc2"]
-                 [org.clojure/core.match "0.2.0-alpha11"]
                  [jcuda/jcuda "0.5.0"]]
   :plugins [[speclj "2.5.0"]]
   :test-paths ["spec/"]

diff --git a/spec/mjolnir/.#constructors_spec.clj b/spec/mjolnir/.#constructors_spec.clj
diff --git a/spec/mjolnir/.#expressions_spec.clj b/spec/mjolnir/.#expressions_spec.clj
diff --git a/spec/mjolnir/code_queries_spec.clj b/spec/mjolnir/code_queries_spec.clj
diff --git a/spec/mjolnir/logic_trees_spec.clj b/spec/mjolnir/logic_trees_spec.clj
diff --git a/src/examples/.#bf.clj b/src/examples/.#bf.clj
diff --git a/src/examples/bf.clj b/src/examples/bf.clj
@@ -122,22 +122,18 @@
                                      (if code
                                        (recur ip code)
                                        ip)))))]
-
-    (let [target (config/default-target)]
+
+    (binding [config/*target* (config/default-target)
+              config/*int-type* Int64]
       (let [_ (println "Compiling")
-            built (exp/build (c/module ['examples.bf] cfn))
+            module (c/module ['examples.bf]
+                             cfn)
+            built (exp/build module)
             optimized (exp/optimize built)
             _ (println "Writing Object File")
-            compiled (time (emit-to-file target
+            compiled (time (emit-to-file config/*target*
                                          optimized
-                                         options))]
-        1
-        #_(when-not output-file
-          (println "Running")
-          (time (-> compiled
-                    (exp/run-exe)
-                    (pr-str)
-                    println)))))
+                                         options))]))
     (println "Finished")
     (shutdown-agents)
     0))

diff --git a/src/mjolnir/.#config.clj b/src/mjolnir/.#config.clj
@@ -1 +1 @@
-tim@timbal.4596
+tim@timbal.local.958
diff --git a/src/mjolnir/.#expressions.clj b/src/mjolnir/.#expressions.clj
diff --git a/src/mjolnir/.#types.clj b/src/mjolnir/.#types.clj
diff --git a/src/mjolnir/code_queries.clj b/src/mjolnir/code_queries.clj
diff --git a/src/mjolnir/expressions.clj b/src/mjolnir/expressions.clj
@@ -4,19 +4,9 @@
             [mjolnir.config :refer :all]
             [clojure.java.shell :as shell]
             [clojure.string :as string]
-            [mjolnir.targets.target :as target]
-            [bbloom.fipp.edn :refer (pprint pretty pretty-map) :rename {pprint fipp}])
+            [mjolnir.targets.target :as target])
   (:import [com.sun.jna Native Pointer]))
 
-(defmethod pretty clojure.lang.IRecord [r]
-    [:span (-> r class .getName (clojure.string/split #"\.") last) (pretty-map r)])
-
-(defn pdebug [x]
-  (println "-------------")
-  (fipp x)
-  (println "-------------")
-  x)
-
 (def genname (comp name gensym))
 
 (defprotocol Expression