# HG changeset patch # User # Date 2020-06-24 12:28:13 # Node ID cd6f7adb5ee3d513e37a833cf40e4ba34a235447 # Parent d8716915459cd4e70649f8c96b75dcd703ccac2f Rename system to txt2web diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ BIN = txt2web PKG = $(BIN) +SYSTEM = $(BIN) DIST = txt2web.tar.xz LISP = sbcl @@ -14,7 +15,7 @@ graphs: diagrams.png $(BIN): *.asd src/*.lisp src/*.ps strings/*.sexp buildapp.$(LISP) --asdf-path .\ --asdf-tree .qlot/dists\ - --load-system $(PKG)\ + --load-system $(SYSTEM)\ --entry $(PKG):entry-point\ --output $(BIN) @@ -40,7 +41,7 @@ clean: rm -f $(BIN) $(DIST) clean-deps: - rm qlfile.lock - rm -rf .qlot + -rm qlfile.lock + -rm -rf .qlot .PHONY: all graphs install-deps update-deps clean upload diff --git a/qlfile.lock b/qlfile.lock --- a/qlfile.lock +++ b/qlfile.lock @@ -1,52 +1,52 @@ ("quicklisp" . (:class qlot/source/dist:source-dist :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest) - :version "2020-04-27")) + :version "2020-06-10")) ("alexandria" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("system-locale" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("esrap" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("parenscript" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("flute" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("cl-ppcre" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("anaphora" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("named-readtables" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("assoc-utils" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("let-over-lambda" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("documentation-utils" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) ("trivial-indent" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) - :version "ql-2020-04-27")) + :version "ql-2020-06-10")) diff --git a/qsp-txt2web.asd b/qsp-txt2web.asd deleted file mode 100644 --- a/qsp-txt2web.asd +++ /dev/null @@ -1,24 +0,0 @@ - -(defsystem qsp-txt2web - :description "QSP compiler to monolithic HTML page" - :depends-on (:alexandria :system-locale ;; General - :esrap ;; Parsing - :parenscript :flute ;; Codegening - ) - :pathname "src/" - :serial t - :components ((:file "package") - (:file "utils") - (:file "l10n") - (:file "walker") - - (:file "patches") - (:file "js-syms") - (:file "main-macros") - (:file "ps-macros") - (:file "api-macros") - (:file "intrinsic-macros") - - (:file "class") - (:file "main") - (:file "parser"))) diff --git a/src/api-macros.lisp b/src/api-macros.lisp --- a/src/api-macros.lisp +++ b/src/api-macros.lisp @@ -1,5 +1,5 @@ -(in-package sugar-qsp.api) +(in-package txt2web.api) (defpsmacro with-call-args (args &body body) `(progn diff --git a/src/api.ps b/src/api.ps --- a/src/api.ps +++ b/src/api.ps @@ -1,5 +1,5 @@ -(in-package sugar-qsp.api) +(in-package txt2web) ;;; API deals with DOM manipulation and some bookkeeping for the ;;; intrinsics, namely variables diff --git a/src/class.lisp b/src/class.lisp --- a/src/class.lisp +++ b/src/class.lisp @@ -1,5 +1,5 @@ -(in-package sugar-qsp) +(in-package txt2web) (defclass compiler () ((body :accessor body :initform #.(load-src "extras/body.html")) diff --git a/src/intrinsic-macros.lisp b/src/intrinsic-macros.lisp --- a/src/intrinsic-macros.lisp +++ b/src/intrinsic-macros.lisp @@ -1,5 +1,5 @@ -(in-package sugar-qsp.lib) +(in-package txt2web.lib) ;;;; Macros implementing some intrinsics where it makes sense ;;;; E.g. an equivalent JS function exists, or it's a direct API call diff --git a/src/intrinsics.ps b/src/intrinsics.ps --- a/src/intrinsics.ps +++ b/src/intrinsics.ps @@ -1,5 +1,5 @@ -(in-package sugar-qsp.lib) +(in-package txt2web) ;;;; Functions and procedures defined by the QSP language. ;;;; They can call api and deal with locations and other data directly. diff --git a/src/js-syms.lisp b/src/js-syms.lisp --- a/src/js-syms.lisp +++ b/src/js-syms.lisp @@ -1,5 +1,5 @@ -(in-package sugar-qsp.js) +(in-package txt2web.js) ;;; Contains symbols from standard JS library to avoid obfuscating ;;; and/or namespacing them diff --git a/txt2web.asd b/txt2web.asd new file mode 100644 --- /dev/null +++ b/txt2web.asd @@ -0,0 +1,24 @@ + +(defsystem txt2web + :description "QSP compiler to monolithic HTML page" + :depends-on (:alexandria :system-locale ;; General + :esrap ;; Parsing + :parenscript :flute ;; Codegening + ) + :pathname "src/" + :serial t + :components ((:file "package") + (:file "utils") + (:file "l10n") + (:file "walker") + + (:file "patches") + (:file "js-syms") + (:file "main-macros") + (:file "ps-macros") + (:file "api-macros") + (:file "intrinsic-macros") + + (:file "class") + (:file "main") + (:file "parser")))