use if-else as an enhanced replacement for if

jbr · Dec 23, 2014 · 2957f60 · 2957f60
1 parent 52e559f
commit 2957f60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/include/macros.sibilant b/include/macros.sibilant
@@ -358,8 +358,7 @@
 
        ("(function() {" (apply indent lines) "})()"))
 
-
-(macro if-else (...args)
+(macro if (...args)
        ("(function() {"
         (indent
          (join " else "
@@ -437,7 +436,7 @@
 (macro var (...pairs)
        (var destructured [])
        (bulk-map pairs (#(lhs rhs)
-                         (if-else
+                         (if
                           (= 'list (first lhs))
                              (do
                               (var symbol (^symbol))
@@ -468,7 +467,7 @@
                  ("[ " (join ", " (map args translate)) " ]"))
 
             (each (arg) args
-                  (if-else
+                  (if
                    (= "..." arg) (assign dots true)
                    dots (do (arg-segments.push (translate arg))
                             (assign dots false))

diff --git a/test/test.sibilant b/test/test.sibilant
@@ -447,7 +447,7 @@ thunk(\"world\");
 
 
 (assert-translation
- "(if-else a b c d e (do (g) h))"
+ "(if a b c d e (do (g) h))"
  "(function() {
   if (a) {
     return b;
@@ -461,7 +461,7 @@ thunk(\"world\");
 
 
 (assert-translation
-  "(if-else a b c d e)"
+  "(if a b c d e)"
   "(function() {
   if (a) {
     return b;