Improve Lisp (#344)

* Add println

* Rewrite fib

* Refactor parse

* Update lisp completer

* Store args in env

* Add 'or' and 'and' builtins

* Add factorial.lsp

* Update docs

* Add cat operation

* Add join operation

* Add system command

* Add time command (#346)

* Add time command

* Fix merge artefact

* Fix call to realtime

* Replace clock syscalls with device files (#345)

* Replace clock syscalls with device files

* Add missing newline to read

* Update time command

* Use Rc<RefCell<Env>>

* Add first TCO

* Remove Box

* Change result of env_for_lambda

* Run clippy

* Remove env clone

* Remove TCO

* Change return type of env_for_lambda

doc/lisp.md

@@ -3,13 +3,13 @@
 A minimalist Lisp interpreter is available in MOROS to extend the capabilities
 of the Shell.
 
+MOROS Lisp is a Lisp-1 dialect inspired by Scheme and Clojure.
+
 It started from [Risp](https://github.com/stopachka/risp) and was extended to
 include the seven primitive operators and the two special forms of John
 McCarthy's paper "Recursive Functions of Symbolic Expressions and Their
 Computation by Machine" (1960) and "The Roots of Lisp" (2002) by Paul Graham.
 
-MOROS Lisp dialect is also inspired by Scheme and Clojure.
-
 In version 0.2.0 the whole implementation was refactored and the parser was
 rewritten to use [Nom](https://github.com/Geal/nom). This allowed the addition
 of strings to the language and reading from the filesystem.
@@ -53,18 +53,17 @@ And it can execute a file. For example a file located in `/tmp/fibonacci.lsp`
 with the following content:
 
 ```lisp
-(label fib
-  (lambda (n)
-    (cond
-      ((< n 2) n)
-      (true (+ (fib (- n 1)) (fib (- n 2)))))))
+(defn fib (n)
+  (cond
+    ((< n 2) n)
+    (true (+ (fib (- n 1)) (fib (- n 2))))))
 
-(print (fib 6))
+(println (fib 10))
 ```
 
 Would produce the following output:
 
 ```
 > lisp /tmp/fibonacci.lsp
-8
+55
 ```

dsk/ini/lisp/core.lsp

@@ -41,3 +41,6 @@
 
 (defn third (lst)
   (second (rest lst)))
+
+(defn println (exp)
+  (do (print exp) (print "\n")))

dsk/tmp/lisp/factorial.lsp

@@ -0,0 +1,15 @@
+(load "/ini/lisp/core.lsp")
+
+(defn fact-acc (n acc)
+  (cond
+    ((< n 2) acc)
+    (true (fact-acc (- n 1) (* acc n)))))
+
+(defn fact (n)
+  (fact-acc n 1))
+
+(println
+  (fact
+    (cond
+      ((null? args) 10)
+      (true (parse (car args))))))

dsk/tmp/lisp/fibonacci.lsp

@@ -0,0 +1,12 @@
+(load "/ini/lisp/core.lsp")
+
+(defn fib (n)
+  (cond
+    ((< n 2) n)
+    (true (+ (fib (- n 1)) (fib (- n 2))))))
+
+(println
+  (fib
+    (cond
+      ((null? args) 10)
+      (true (parse (car args))))))

src/usr/install.rs

@@ -42,7 +42,10 @@ pub fn copy_files(verbose: bool) {
     copy_file("/ini/fonts/zap-vga-8x16.psf", include_bytes!("../../dsk/ini/fonts/zap-vga-8x16.psf"), verbose);
 
     copy_file("/tmp/alice.txt", include_bytes!("../../dsk/tmp/alice.txt"), verbose);
-    copy_file("/tmp/fibonacci.lsp", include_bytes!("../../dsk/tmp/fibonacci.lsp"), verbose);
+
+    create_dir("/tmp/lisp", verbose);
+    copy_file("/tmp/lisp/factorial.lsp", include_bytes!("../../dsk/tmp/lisp/factorial.lsp"), verbose);
+    copy_file("/tmp/lisp/fibonacci.lsp", include_bytes!("../../dsk/tmp/lisp/fibonacci.lsp"), verbose);
 
     create_dir("/tmp/beep", verbose);
     copy_file("/tmp/beep/tetris.sh", include_bytes!("../../dsk/tmp/beep/tetris.sh"), verbose);