mirrors/clog
1
Fork 0
mirror of https://github.com/rabbibotton/clog.git synced 2025-12-06 10:40:45 -08:00
Code Issues Projects Releases Wiki Activity

remove macro expand btn

Browse source
This commit is contained in:
David Botton 2022-09-11 18:08:43 -04:00
parent 59c5124af7
commit 262104eb29
1 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tools/clog-builder.lisp
View file

@ -2548,9 +2548,8 @@ It parse the string TEXT without using READ functions."
(btn-load (create-img tool-bar :alt-text "load" :url-src img-btn-load :class btn-class)) (btn-load (create-img tool-bar :alt-text "load" :url-src img-btn-load :class btn-class))
(spacer (create-span tool-bar :content " ")) (spacer (create-span tool-bar :content " "))
(btn-efrm (create-button tool-bar :content "Eval Form" :class (format nil "w3-tiny ~A" btn-class))) (btn-efrm (create-button tool-bar :content "Eval Form" :class (format nil "w3-tiny ~A" btn-class)))
(btn-esel (create-button tool-bar :content "Eval Sel" :class (format nil "w3-tiny ~A" btn-class))) (btn-esel (create-button tool-bar :content "Eval Sel" :class (format nil "w3-tiny ~A" btn-class)))
(btn-test (create-button tool-bar :content "Eval" :class (format nil "w3-tiny ~A" btn-class))) (btn-test (create-button tool-bar :content "Eval All" :class (format nil "w3-tiny ~A" btn-class)))
(btn-mexp (create-button tool-bar :content "Macroexp" :class (format nil "w3-tiny ~A" btn-class)))
(spacer (create-span tool-bar :content "  ")) (spacer (create-span tool-bar :content "  "))
(btn-help (create-span tool-bar :content "?" :class "w3-tiny w3-ripple")) (btn-help (create-span tool-bar :content "?" :class "w3-tiny w3-ripple"))
(content (center-panel box)) (content (center-panel box))
@ -2580,7 +2579,6 @@ It parse the string TEXT without using READ functions."
(setf (advisory-title btn-efrm) "evaluate form") (setf (advisory-title btn-efrm) "evaluate form")
(setf (advisory-title btn-esel) "evaluate selection") (setf (advisory-title btn-esel) "evaluate selection")
(setf (advisory-title btn-test) "evaluate") (setf (advisory-title btn-test) "evaluate")
(setf (advisory-title btn-mexp) "macroexpand")
(setf (height btn-copy) "12px") (setf (height btn-copy) "12px")
(setf (height btn-paste) "12px") (setf (height btn-paste) "12px")
(setf (height btn-cut) "12px") (setf (height btn-cut) "12px")
@ -2592,12 +2590,10 @@ It parse the string TEXT without using READ functions."
(setf (height btn-efrm) "12px") (setf (height btn-efrm) "12px")
(setf (height btn-esel) "12px") (setf (height btn-esel) "12px")
(setf (height btn-test) "12px") (setf (height btn-test) "12px")
(setf (height btn-mexp) "12px")
(setf (height btn-help) "12px") (setf (height btn-help) "12px")
(setf (width btn-efrm) "43px") (setf (width btn-efrm) "43px")
(setf (width btn-esel) "43px") (setf (width btn-esel) "43px")
(setf (width btn-test) "43px") (setf (width btn-test) "43px")
(setf (width btn-mexp) "43px")
(setf (positioning ace) :absolute) (setf (positioning ace) :absolute)
(setf (positioning status) :absolute) (setf (positioning status) :absolute)
(set-geometry pac-line :units "" :top "20px" :left "0px" (set-geometry pac-line :units "" :top "20px" :left "0px"
@ -2614,13 +2610,16 @@ It parse the string TEXT without using READ functions."
(set-on-click btn-help (set-on-click btn-help
(lambda (obj) (lambda (obj)
(alert-dialog win (alert-dialog win
"cmd/alt-, Configure editor<br> "<table>
cmd/alt-. Launch system browser<br> <tr><td>cmd/alt-,</td><td>Configure editor</td></tr>
cmd/alt-[ Evaluate form<br> <tr><td>cmd/alt-.</td><td> Launch system browser</td></tr>
cmd/ctl-s Save<br> <tr><td>cmd/alt-[</td><td> Evaluate form</td></tr>
opt/alt-m Macroexpand<br> <tr><td>cmd/ctl-s</td><td> Save</td></tr>
ctl-= Expand region" <tr><td>ctl-=</td><td>Expand region</td></tr>
:title "Help"))) <tr><td>opt/alt-m</td><td>Macroexpand</td></tr>
</table>"
:width 400 :height 300
:title "Help")))
(set-on-window-size-done win (set-on-window-size-done win
(lambda (obj) (lambda (obj)
(declare (ignore obj)) (declare (ignore obj))
@ -2748,26 +2747,7 @@ It parse the string TEXT without using READ functions."
(unless (equal val "") (unless (equal val "")
(let ((result (capture-eval val :clog-obj obj (let ((result (capture-eval val :clog-obj obj
:eval-in-package (text-value pac-line)))) :eval-in-package (text-value pac-line))))
(on-open-file obj :title-class "w3-blue" :title "file eval" :text result)))))) (on-open-file obj :title-class "w3-blue" :title "file eval" :text result))))))))
(set-on-click btn-mexp (lambda (obj)
(let ((p (parse-integer
(js-query obj
(format nil "~A.session.doc.positionToIndex (~A.selection.getCursor(), 0);"
(clog-ace::js-ace ace)
(clog-ace::js-ace ace)))
:junk-allowed t))
(tv (text-value ace))
(lf nil)
(cp 0))
(loop
(setf (values lf cp) (read-from-string tv nil nil :start cp))
(unless lf (return nil))
(when (> cp p) (return lf)))
(let ((result (handler-case
(prin1-to-string (macroexpand lf))
(error (condition)
(format nil "Error: ~A" condition)))))
(on-open-file obj :title-class "w3-blue" :title "macroexpand result" :text result)))))))
(defun on-repl (obj) (defun on-repl (obj)
"Open a REPL" "Open a REPL"