And / Or as macros. (#24)

BowenFu · web-flow · commit c8b1233fa850 · 2021-12-18T16:17:46.000+08:00
* Update license.

* and or as macros.

Co-authored-by: Bowen Fu &lt;missing&gt;
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] [Bowen Fu]
+   Copyright 2021 Bowen Fu
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/core.lisp b/core.lisp
@@ -66,6 +66,48 @@
     )
 )
 
+(define and
+    (macro lst
+        (define (impl ls)
+            (if (null? ls)
+                #t
+                (if (cons? ls)
+                    (if (null? (cdr ls))
+                        (car ls)
+                        `(if ,(car ls)
+                            ,(impl (cdr ls))
+                            #f
+                        )
+                    )
+                    #f
+                )
+            )
+        )
+        (impl lst)
+    )
+)
+
+(define or
+    (macro lst
+        (define (impl ls)
+            (if (null? ls)
+                #f
+                (if (cons? ls)
+                    (if (null? (cdr ls))
+                        (car ls)
+                        `(if ,(car ls)
+                            ,(car ls)
+                            ,(impl (cdr ls))
+                        )
+                    )
+                    #f
+                )
+            )
+        )
+        (impl lst)
+    )
+)
+
 (define mycond
   (macro clauses
     (define (cond-clauses->if lst)
diff --git a/include/lisp/evaluator.h b/include/lisp/evaluator.h
@@ -451,42 +451,6 @@ class Sequence final : public Expr
     }
 };
 
-class And final : public Expr
-{
-    std::vector<ExprPtr> mActions;
-public:
-    And(std::vector<ExprPtr> actions)
-    : mActions{actions}
-    {}
-    ExprPtr eval(std::shared_ptr<Env> const& env) override
-    {
-        bool const result = std::all_of(mActions.begin(), mActions.end(), [&env](auto& e){ return isTrue(e->eval(env)); });
-        return result ? true_() : false_();
-    }
-    std::string toString() const override
-    {
-        return "And";
-    }
-};
-
-class Or final : public Expr
-{
-    std::vector<ExprPtr> mActions;
-public:
-    Or(std::vector<ExprPtr> actions)
-    : mActions{actions}
-    {}
-    ExprPtr eval(std::shared_ptr<Env> const& env) override
-    {
-        bool const result = std::any_of(mActions.begin(), mActions.end(), [&env](auto& e){ return isTrue(e->eval(env)); });
-        return result ? true_() : false_();
-    }
-    std::string toString() const override
-    {
-        return "Or";
-    }
-};
-
 template <typename ProcedureT>
 class LambdaBase : public Expr
 {
diff --git a/include/lisp/parser.h b/include/lisp/parser.h
@@ -90,16 +90,6 @@ inline std::shared_ptr<Sequence> sequence(ExprPtr const& expr)
     return std::make_shared<Sequence>(parseActions(expr));
 }
 
-inline ExprPtr and_(ExprPtr const& expr)
-{
-    return std::make_shared<And>(parseActions(expr));
-}
-
-inline ExprPtr or_(ExprPtr const& expr)
-{
-    return std::make_shared<Or>(parseActions(expr));
-}
-
 inline auto parseAsQuoted(ExprPtr const& expr, std::optional<int32_t> quasiquoteLevel) -> ExprPtr;
 
 inline ExprPtr assertIsLastAndGet(ExprPtr const& expr)
@@ -271,8 +261,6 @@ inline auto tryCons(ExprPtr const& expr) -> ExprPtr
     keywordToHandler["if"] = if_;
     keywordToHandler["cond"] = cond;
     keywordToHandler["begin"] = [](auto cdr){ return std::static_pointer_cast<Expr>(sequence(cdr));};
-    keywordToHandler["and"] = and_;
-    keywordToHandler["or"] = or_;
     keywordToHandler["quote"] = quote;
     keywordToHandler["quasiquote"] = quasiquote;
     keywordToHandler["_"] = [car](auto cdr){ return application(car, cdr); };
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
@@ -36,12 +36,6 @@ do_test(test_define_proc "(define (x) 2) (x)" 2)
 do_test(test_cond1 "(define x #t) (cond (x 1) (else 2))" 1)
 do_test(test_cond2 "(define x #f) (cond (x 1) (else 2))" 2)
 
-do_test(test_cond3
-"
-(define lat?  (lambda (l) (cond ((null? l) #t) ((atom? (car l)) (lat? (cdr l))) (else #f)))) (lat? (list 1 2 (list 3)))
-"
-false)
-
 do_test(test_string1
 "
 (define member?
@@ -152,4 +146,16 @@ do_test(test_quasiquote_nested "`(1 `,(+ 1 ,(+ 2 3)) 4)" "\\\\(1 \\\\(\\\\'quasi
 do_test(test_unquote-splicing-nested "`(1 ```,,@,,@(list (+ 1 2)) 4)" "\\\\(1 \\\\(\\\\'quasiquote \\\\(\\\\'quasiquote \\\\(\\\\'quasiquote \\\\(\\\\'unquote \\\\(\\\\'unquote-splicing \\\\(\\\\'unquote 3\\\\)\\\\)\\\\)\\\\)\\\\)\\\\) 4\\\\)")
 
 do_test(test_unquote-splicing "(let ((x '(1))) `(,@x 1))" "\\\\(1 1\\\\)")
-do_test(test_unquote-splicing2 "`(1 2 ,@(list (+ 1 2) (- 5 1)) 5)" "\\\\(1 2 3 4 5\\\\)")
+do_test(test_unquote-splicing2 "`(1 2 ,@(list (+ 1 2) (- 5 1)) 5)" "\\\\(1 2 3 4 5\\\\)")
+
+do_test(test_and_1 "(and)" "true")
+do_test(test_and_2 "(and 1)" "1")
+do_test(test_and_3 "(and 1 \"2\")" "\"2\"")
+do_test(test_and_4 "(and 1 \"2\" 'x)" "\'x")
+do_test(test_and_5 "(and (or 1 \"2\") 'x)" "\'x")
+
+do_test(test_or_1 "(or)" "false")
+do_test(test_or_2 "(or 1)" "1")
+do_test(test_or_3 "(or \"2\" 1)" "\"2\"")
+do_test(test_or_4 "(or 'x \"2\" 1)" "\'x")
+do_test(test_or_5 "(or (and #f 'x) \"2\" 1)" "\'x")
diff --git a/sample/loop.cpp b/sample/loop.cpp
@@ -5,7 +5,7 @@
 #include <filesystem>
 namespace fs = std::filesystem;
 
-#define DEBUG 0
+#define DEBUG 1
 
 auto consOp = [](std::vector<std::shared_ptr<Expr>> const& args)
 {
diff --git a/test/lisp/test.cpp b/test/lisp/test.cpp
@@ -512,23 +512,3 @@ TEST(Parser, begin2)
     }
     EXPECT_TRUE(p.eof());
 }
-
-TEST(Parser, andor)
-{
-    std::initializer_list<std::pair<std::string, std::string> > expected = {{"Or", "true"}};
-
-    Lexer lex("(or 1 2 (and 3) #t)");
-    MetaParser p(lex);
-    
-    auto env = std::make_shared<Env>();
-    env->defineVariable("#t", true_());
-
-    for (auto s : expected)
-    {
-        auto me = p.sexpr();
-        auto e = parse(me);
-        EXPECT_EQ(e->toString(), s.first);
-        EXPECT_EQ(e->eval(env)->toString(), s.second);
-    }
-    EXPECT_TRUE(p.eof());
-}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <filesystem>`
`6`	`6`	`namespace fs = std::filesystem;`
`7`	`7`
`8`		`-#define DEBUG 0`
	`8`	`+#define DEBUG 1`
`9`	`9`
`10`	`10`	`auto consOp = [](std::vector<std::shared_ptr<Expr>> const& args)`
`11`	`11`	`{`