doc macro!!!

viebel · Jan 25, 2017 · 9d3a8b8 · 9d3a8b8
1 parent 10d0b2c
commit 9d3a8b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 67 deletions.
diff --git a/resources/public/clojure-dbg.html b/resources/public/clojure-dbg.html
@@ -31,39 +31,21 @@
 (my.m/m 1)
 </div>
 <br/>
-<div class="clojure">
+<div class="klojure">
  (require '[klipse.lang.clojure.env :as e])
- (e/doc* map)
+ (e/doc* 'map)
+</div>
+<br/>
+
+<div class="klojure">
+ (require-macros '[klipse.lang.clojure.env :refer [doc]])
+ (doc map)
 </div>
 <br/>
 <div class="clojure">
  (ns my.ns 
  (:require [clojure.set :as ss]))
-=======
- <head lang="en">
- <meta charset="UTF-8">
- <title>KLIPSE: a simple and elegant online cljs compiler and evaluator</title>
- <link rel='shortcut icon' type='image/x-icon' href='img/klipse.png' />
- <link rel="stylesheet" type="text/css" href="css/codemirror.css">
- </head>
- <body>
- <div class="clojure">
  </div>
- <div class="clojure">
- (ns my.ns
- (:refer-clojure :exclude [distinct group-by update])
- (:require clojure.string
- [sqlingvo.core :as sql :refer [sql db select from]]))
-
-
- (def my-db (db :postgresql))
-
- (sql (select my-db [:first-name]
- (from :people)))
- </div>
- <br/>
-
-
 
  <div class="clojure">
  (require-macros '[gadjett.core :refer [dbg]])
@@ -82,51 +64,17 @@
  `(1 2 ~(map inc [1 2 3]))
  </div>
  <br/>
- <div class="clojure">
- (ns my.m$macros)
- (defmacro m [x] x)
- (my.m/m 1)
- </div>
- <br/>
- <div class="clojure">
- `(let [x# 1] x#)
- </div>
- <br/>
- <div class="clojure">
- (ns my.ns 
- (:require [clojure.set :as ss]))
 
- (str ::ss/xx)
- </div>
  <br/>
- <div class="clojure">
- (ns my.moo$macros)
- (defmacro dbg[x]
- `(let [x# ~x]
- (println (str '~x ": " x#))
- x#))
- (with-out-str
- (my.moo/dbg (map inc [1 2 3])))
- </div>
- <br/>
- <div class="clojure">
- (ns my.test
- (:require
- [cljs.pprint :as pp :refer [pprint]]))
- (with-out-str (pprint (for [x (range 10)] (range x))))
- </div>
-<br/>
-<div class="clojure">
- `(1 2 ~(map inc [1 2 3]))
-</div>
  <br/>
  <script>
  window.klipse_settings = {
+
  };
  if(window.location.search.match(/transpile=1/)) {
  window.klipse_settings.selector_js = '.clojure';
  } else {
- window.klipse_settings.selector = '.clojure';
+ window.klipse_settings.selector = '.klojure';
  }
 
  </script>

diff --git a/src/klipse/lang/clojure.cljs b/src/klipse/lang/clojure.cljs
@@ -92,13 +92,13 @@
  max-eval-duration (max max-eval-duration min-max-eval-duration)
  the-emits (if compile-display-guard (partial my-emits max-eval-duration) original-emits)]
  (with-redefs [compiler/emits the-emits]
- (cljs/eval-str (create-state-eval) s
+ (cljs/eval-str (st) s
  "cljs-in"
  {
  :eval eval-for-compilation
  :ns @current-ns
  :static-fns static-fns
- :*compiler* (set! env/*compiler* (create-state-eval))
+ :*compiler* (set! env/*compiler* (st))
  :verbose (verbose?)
  :load (partial io/load-ns external-libs)
  }
@@ -120,7 +120,7 @@
  {:eval my-eval
  :ns @current-ns
  :def-emits-var true
- :verbose verbose
+ :verbose (verbose?)
  :*compiler* (set! env/*compiler* (st))
  :context :expr
  :static-fns static-fns

diff --git a/src/klipse/lang/clojure/io.cljs b/src/klipse/lang/clojure/io.cljs
@@ -59,8 +59,8 @@
 
 (def skip-ns-macros #{'cljs.core
  'cljs.pprint
+ 'cljs.repl
  'cljs.env.macros
- 'klipse.lang.clojure.env
  'cljs.analyzer.macros
  'cljs.js
  'cljs.compiler.macros})
@@ -139,7 +139,7 @@
  (src-cb nil)))))
 
 (defn cached-macro-ns-regexp []
- (:clojure_cached_macro_ns_regexp (klipse-settings) #"cljs\.core\.[async|match].*|clojure\.math\.macros|gadjett\.core|cljs\.test|clojure.test.check.*|reagent\..*|om\..*|cljs\.spec.*"))
+ (:clojure_cached_macro_ns_regexp (klipse-settings) #"klipse\..*|cljs\.core\.[async|match].*|clojure\.math\.macros|gadjett\.core|cljs\.test|clojure.test.check.*|reagent\..*|om\..*|cljs\.spec.*"))
 
 (defn cached-macro-ns? [name]
  (re-matches (cached-macro-ns-regexp) (str name)))