Merge branch 'master' of http://gitea.stocksriddle.one/vaclavt/mlisp

Readme.md

@@ -79,7 +79,7 @@ utils/local_install.sh
 - execute system command should capture stderr
 - add some mem stats to benchmark
 - order of arguments in functions like member and filter - filter swap lambda and list
-- better output of !e in repl
+- better output of !e in repl (resp !e !ee)
 
 #### Doc
 - fix man entry on (member) example and retval

stdlib/stdlib.lsp

@@ -228,7 +228,7 @@
         nil
         (do
             (def minn (index l 0))
-            (def i 1)            
+            (def i 1)
             (while (< i (len l))
                 (if (< (index l i) minn)
                     (set! minn (index l i)))

utils/Lisp.tmLanguage

@@ -51,7 +51,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(?:\()((?i:defn|def|lambda)+)</string>
+			<string>(?:\()((?i:def|defn|lambda)+)</string>
 			<key>name</key>
 			<string>meta.function.lisp</string>
 		</dict>
@@ -136,13 +136,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?<=\()(?i:\*|\*\*|\*\*\*|\+|\+\+|\+\+\+|\-|/|//|///|/=|1\+|1\-|<|<=|=|>|>=|if|cond|do|for|while|scope|quote|defn|and|or|set!|eval|type|parse|list|insert|index|remove|len|push|pop|head|tail|first|last|range|map|filter|reduce|exit|quit|print|input|random|include|read-file|read-file-lines|write-file|read-url|system-cmd|ls-dir|is-file?|is-dir?|tcp-server|tcp-client|parse-csv|parse-json|get-universal-time|date-to-str|str-to-date|date-add|debug|sprintf|display|string-replace|string-replace-re|string-regex?|string-regex-list|string-split|string-pad|string-rltrim|string-case|string-len|string-substr|string-find|benchmark|thread-create|thread-under-lock|thread-sleep|threads-join|try|throw|usql|first|second|third|fourth|fifth|sixth|seventh|eight|nth|print|get-universal-time|not|is-pos?|is-neg?|neg|dec|inc|string-ltrim|string-rtrim|string-trim|string-rpad|string-lpad|string-upcase|string-downcase|string-join|itok|ktoi|sleep|get-env|member|make-list-of|make-list|empty-list?|uniq|flatten|quick-sort-by|quick-sort|quick-sort-reverse|start-of-day|end-of-day|start-of-month|start-of-next-month|end-of-next-month|end-of-month|start-of-prev-month|end-of-prev-month|start-of-year|end-of-year|make-csv)(?=\s+)</string>
+			<string>(?<=\()(?i:\*|\*\*|\*\*\*|\+|\+\+|\+\+\+|\-|/|//|///|/=|1\+|1\-|<|<=|=|>|>=|if|cond|do|for|while|scope|quote|and|or|set\!|eval|type|parse|list|insert|index|remove|len|push|pop|head|tail|first|last|range|map|filter|reduce|exit|quit|print|input|random|include|read-file|read-file-lines|write-file|read-url|system-cmd|ls-dir|is-file?|is-dir?|tcp-server|tcp-client|parse-csv|parse-json|get-universal-time|date-to-str|str-to-date|date-add|debug|sprintf|display|string-replace|string-replace-re|string-regex?|string-regex-list|string-split|string-pad|string-rltrim|string-case|string-len|string-substr|string-find|benchmark|thread-create|thread-under-lock|thread-sleep|threads-join|try|throw|usql|first|second|third|fourth|fifth|sixth|seventh|eight|nth|print|get-universal-time|not|is-pos?|is-neg?|neg|dec|inc|string-ltrim|string-rtrim|string-trim|string-rpad|string-lpad|string-upcase|string-downcase|string-join|itok|ktoi|sleep|get-env|member|make-list-of|make-list|empty-list?|uniq|flatten|quick-sort-by|quick-sort|quick-sort-reverse|start-of-day|end-of-day|start-of-month|start-of-next-month|end-of-next-month|end-of-month|start-of-prev-month|end-of-prev-month|start-of-year|end-of-year|make-csv)(?=\s+)</string>
 			<key>name</key>
 			<string>keyword.control.lisp</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?<=^|\s|[()])(?i:nil|t)(?=$|\s|[()])</string>
+			<string>(?<=^|\s|[()])(?i:nil|\#t)(?=$|\s|[()])</string>
 			<key>name</key>
 			<string>constant.language.lisp</string>
 		</dict>

utils/local_install.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
 
 echo "cleaning"
-cmake --build ./build --config Release --target clean -j 4 --
+cmake -DCMAKE_BUILD_TYPE=Release .
+cmake --build ./ --target clean -j 4 --
 echo "building ml"
-cmake --build ./build --config Release --target all -j 4 --
+cmake --build ./ --target all -j 4 --
 
 echo ""
 echo "copying lsp files"
@@ -12,13 +13,13 @@ cp stdlib/*.lsp /usr/local/var/mlisp/
 echo "copying doc files"
 cp doc/*.md /usr/local/var/mlisp/
 echo "copying ml file"
-cp ./build/ml /usr/local/bin/ml
+mv ./ml /usr/local/bin/ml
+
+
 
 echo ""
 echo "if syntax has changed you may use"
 echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.12/syntaxes/"
-echo "or"
-echo "cp utils/Lisp.tmLanguage ~/.vscode/extensions/mattn.lisp-0.1.12/syntaxes/"
 echo ""
 
 ml -v