regexp-search added, std lib loader changes, more REadme items

.gitignore

@@ -3,3 +3,4 @@ build
 .idea
 ml
 .DS_Store
+CMakeFiles

Readme.md

@@ -1,5 +1,6 @@
 
 ### TODO
+- make-list
 - print-table
 - download 1 year of data from api.nasdaq.com into test dir
 - support for including lisp libs at startup from dir
@@ -14,7 +15,6 @@
 - add instrumentation (time, nr of evals, debug info, debug environment etc)
 - in casting functions (as_string..) better exception description
 - add better print (syntax high-lighting)
-- format (printf)
 - add comman line options -h -v
 - readline
 - execute system command should capture stderr
@@ -32,6 +32,10 @@
 - conversion functions like parse-integer
 - list function nth
 - in test.lisp some explaining prints
+- format (printf)
+- setq
+- mapcar (funcall, apply)
+- if then else, else part is optionw, allow then clause
 
 #### Performance
 - push_back - repeatedly without reserving size

debug.lisp

@@ -2,36 +2,17 @@
 
 ; (print (make-csv '(("r1c1" "r1c2") ("r2c1" "r2c2"))))
 
-(defun divi-dates (date-str)
+(define path '("/usr/local/var/mlisp"))
-    (do
-        (define curl_cmd (+ "curl -H \"Accept: application/json, text/plain, */*\" -H \"Origin: https://www.nasdaq.com/\" -H \"User-Agent: Mozilla/5.0 (Windows NT 10.0)\" https://api.nasdaq.com/api/calendar/dividends/?date=" date-str " 2>/dev/null"))
-        (define curl_out (system-cmd curl_cmd))
 
-        (define json_list (parse-json (last curl_out)))
+(for d path
-        
+    (if (is-dir? d)
-        (define data (first json_list))
+        (for f (ls-dir d)
-        (define calendar (index data 1))
+            (if (regex-search? f "^.*\.l(i)?sp$")
-        (define calendar_data (index (index calendar 0) 1))
+                (include (+ d "/" f))
-        (define header (index (index calendar_data 0) 1))
+                '())
-        (define rows (index (index calendar_data 1) 1))
+        )
-
+        ()))
-        (define csv_list '())
-        (for e rows
-            ; (("announcement_Date" "01/07/2021") ("companyName" "Itau Unibanco Banco Holding SA") ("dividend_Ex_Date" "02/01/2021") ("dividend_Rate" 0.003) ("indicated_Annual_Dividend" 0.033) ("payment_Date" "03/11/2021") ("record_Date" "02/02/2021") ("symbol" "ITUB"))
-            (define symbol (second  (first (filter (lambda (x) (= (first x) "symbol")) e))))
-            (define divrate (second  (first (filter (lambda (x) (= (first x) "dividend_Rate")) e))))
-            (define adate (second  (first (filter (lambda (x) (= (first x) "announcement_Date")) e))))
-            (define name (second  (first (filter (lambda (x) (= (first x) "companyName")) e))))
-            (define edate (second  (first (filter (lambda (x) (= (first x) "dividend_Ex_Date")) e))))
-            (define pdate (second  (first (filter (lambda (x) (= (first x) "payment_Date")) e))))
-            (define rdate (second  (first (filter (lambda (x) (= (first x) "record_Date")) e))))
-
-            (define csv_list (push csv_list (list symbol edate pdate divrate))))
-        csv_list
-    ))
-
-
-(print (make-csv (divi-dates "2021-02-01")))
 
+(print (regex-search? "test.lsp" "^.*\.l(i)?sp$"))
 
 (print "Debug ends")

ml.cpp

@@ -889,6 +889,7 @@ namespace builtin {
     MlValue if_then_else(std::vector<MlValue> args, MlEnvironment &env) {
 	    if (args.size() != 3)
 		    throw MlError(MlValue("if", if_then_else), env, args.size() > 3 ? TOO_MANY_ARGS : TOO_FEW_ARGS);
+
 	    if (args[0].eval(env).as_bool())
 		    return args[1].eval(env);
 	    else return args[2].eval(env);
@@ -1487,6 +1488,15 @@ namespace builtin {
 	    return MlValue::string(src);
     }
 
+    MlValue regex_search(std::vector<MlValue> args, MlEnvironment &env) {
+	    eval_args(args, env);
+
+	    if (args.size() != 2)		// if (args.size() < 2 || args.size() > 3)
+		    throw MlError(MlValue("regex_search", regex_search), env, args.size() > 3 ? TOO_MANY_ARGS : TOO_FEW_ARGS);
+
+	    return MlValue(regexp_search(args[0].as_string(), args[1].as_string()));
+    }
+
     MlValue display(std::vector<MlValue> args, MlEnvironment &env) {
 	    eval_args(args, env);
 
@@ -1597,14 +1607,19 @@ void repl(MlEnvironment &env) {
 	}
 }
 
-// load lisp std library
 void load_std_lib(MlEnvironment &env) {
-	// TODO iterate through dir with files
+	std::string loader = R"( (define ___lib_path '("/usr/local/var/mlisp"))
-	std::string filename = "stdlib/stdlib.lisp";
+								(for d ___lib_path
+									(if (is-dir? d)
+										(for f (ls-dir d)
+											(if (regex-search? f "^.*\.l(i)?sp$")
+												(include (+ d "/" f))
+												'())
+										)
+										'()))
+							)";
 
-	MlEnvironment e;
+	run(loader, env);
-	MlValue result = run(read_file_contents(filename), e);
-	env.combine(e);
 }
 
 // Does this environment, or its parent environment, have a variable?
@@ -1700,8 +1715,9 @@ MlValue MlEnvironment::get(const std::string &name) const {
 
 	// String operations
 	if (name == "debug") return MlValue("debug", builtin::debug);
-	if (name == "replace") return MlValue("replace", builtin::replace);
 	if (name == "display") return MlValue("display", builtin::display);
+	if (name == "replace") return MlValue("replace", builtin::replace);
+	if (name == "regex-search?") return MlValue("regex-search?", builtin::regex_search);
 
 	// Casting operations
 	if (name == "int") return MlValue("int", builtin::cast_to_int);

ml_string.cpp

@@ -12,3 +12,21 @@ void replace_substring(std::string &src, const std::string &substr, const std::s
 	}
 }
 
+
+// Returns true if where contains regex
+bool regexp_search(const std::string &where, const std::string &regex_str) {
+	// online tester https://www.regextester.com/97722
+	std::regex regex(regex_str);
+	std::smatch match;
+
+	if(std::regex_search(where, match, regex)) {
+		// std::cout << "matches for '" << where << "'\n";
+		// std::cout << "Prefix: '" << match.prefix() << "'\n";
+		// for (size_t i = 0; i < match.size(); ++i)
+		// 	std::cout << i << ": " << match[i] << '\n';
+		// std::cout << "Suffix: '" << match.suffix() << "\'\n\n";
+
+		return true;
+	}
+	return false;
+}

ml_string.h

@@ -4,9 +4,11 @@
 #include "ml.h"
 
 #include <string>
+#include <regex>
 
 
 // Replace a substring with a replacement string in a source string
 void replace_substring(std::string &src, const std::string &substr, const std::string &replacement);
 
-
+// Returns true if where contains regex
+bool regexp_search(const std::string &where, const std::string &regex_str);

tests/test.lisp

@@ -14,11 +14,11 @@
 (defun scitej (n)
    (if (<= n 1)
       1
-      (+ n (scitej
+      (+ n (scitej (- n 1)))
-       (- n 1)))
     ))
 
 (print (scitej 4000))
+; (print (scitej 5))
 
 
 
@@ -97,4 +97,7 @@
 (print (str-to-date "01.01.1970" "%d.%m.%Y"))
 (print (date-add (str-to-date "01.01.1970" "%d.%m.%Y") 1 "day"))
 
+(print (regex-search? "test.lsp" "^.*\.l(i)?sp$"))
+
+
 (print "Test ends")

tmp/divi-dates.lsp

@@ -0,0 +1,32 @@
+
+(defun divi-dates (date-str)
+    (do
+        (define curl_cmd (+ "curl -H \"Accept: application/json, text/plain, */*\" -H \"Origin: https://www.nasdaq.com/\" -H \"User-Agent: Mozilla/5.0 (Windows NT 10.0)\" https://api.nasdaq.com/api/calendar/dividends/?date=" date-str " 2>/dev/null"))
+        (define curl_out (system-cmd curl_cmd))
+
+        (define json_list (parse-json (last curl_out)))
+        
+        (define data (first json_list))
+        (define calendar (index data 1))
+        (define calendar_data (index (index calendar 0) 1))
+        (define header (index (index calendar_data 0) 1))
+        (define rows (index (index calendar_data 1) 1))
+
+        ; (define csv_list '())
+        (define csv_list '("symbol" "ex-date" "pay-date" "div-rate"))
+        (for e rows
+            ; (("announcement_Date" "01/07/2021") ("companyName" "Itau Unibanco Banco Holding SA") ("dividend_Ex_Date" "02/01/2021") ("dividend_Rate" 0.003) ("indicated_Annual_Dividend" 0.033) ("payment_Date" "03/11/2021") ("record_Date" "02/02/2021") ("symbol" "ITUB"))
+            (define symbol (second  (first (filter (lambda (x) (= (first x) "symbol")) e))))
+            (define divrate (second  (first (filter (lambda (x) (= (first x) "dividend_Rate")) e))))
+            (define adate (second  (first (filter (lambda (x) (= (first x) "announcement_Date")) e))))
+            (define name (second  (first (filter (lambda (x) (= (first x) "companyName")) e))))
+            (define exdate (second  (first (filter (lambda (x) (= (first x) "dividend_Ex_Date")) e))))
+            (define paydate (second  (first (filter (lambda (x) (= (first x) "payment_Date")) e))))
+            (define rdate (second  (first (filter (lambda (x) (= (first x) "record_Date")) e))))
+
+            (define csv_list (push csv_list (list symbol exdate paydate divrate))))
+        csv_list
+    ))
+
+
+(print (make-csv (divi-dates "2021-02-01")))