Merge remote-tracking branch 'origin/master' into string-to-bool-conv

doc/langdef.md

@@ -704,27 +704,27 @@ macros are:
     rest to `false`. Any other combination of boolean results evaluates to
     `false`, and any predicate error causes the macro to raise an error.
 *   `e.map(x, t)`:
-  *    transforms a list `e` by taking each element `x` to the
-       function given by the expression `t`, which can use the variable `x`. For
-       instance, `[1, 2, 3].map(n, n * n)` evaluates to `[1, 4, 9]`. Any evaluation
-       error for any element causes the macro to raise an error.
-  *    transforms a map `e` by taking each key in the map `x` to the function
-       given by the expression `t`, which can use the variable `x`. For
-       instance, `{'one': 1, 'two': 2}.map(k, k)` evaluates to `['one', 'two']`.
-       Any evaluation error for any element causes the macro to raise an error.
+    *    transforms a list `e` by taking each element `x` to the
+         function given by the expression `t`, which can use the variable `x`. For
+         instance, `[1, 2, 3].map(n, n * n)` evaluates to `[1, 4, 9]`. Any evaluation
+         error for any element causes the macro to raise an error.
+    *    transforms a map `e` by taking each key in the map `x` to the function
+         given by the expression `t`, which can use the variable `x`. For
+         instance, `{'one': 1, 'two': 2}.map(k, k)` evaluates to `['one', 'two']`.
+         Any evaluation error for any element causes the macro to raise an error.
 *   `e.map(x, p, t)`: Same as the two-arg map but with a conditional `p` filter
     before the value is transformed.
 *   `e.filter(x, p)`:
-  *    for a list `e`, returns the sublist of all elements `x` which
-       evaluate to `true` in the predicate expression `p` (which can use variable
-       `x`). For instance, `[1, 2, 3].filter(i, i % 2 > 0)` evaluates to `[1, 3]`.
-       If no elements evaluate to `true`, the result is an empty list. Any
-       evaluation error for any element causes the macro to raise an error.
-  *    for a map `e`, returns the list of all map keys `x` which
-       evaluate to `true` in the predicate expression `p` (which can use variable
-       `x`). For instance, `{'one': 1, 'two': 2}.filter(k, k == 'one')` evaluates
-       to `['one']`. If no elements evaluate to `true`, the result is an empty
-       list. Any evaluation error for any element causes the macro to raise an error.
+    *    for a list `e`, returns the sublist of all elements `x` which
+         evaluate to `true` in the predicate expression `p` (which can use variable
+         `x`). For instance, `[1, 2, 3].filter(i, i % 2 > 0)` evaluates to `[1, 3]`.
+         If no elements evaluate to `true`, the result is an empty list. Any
+         evaluation error for any element causes the macro to raise an error.
+    *    for a map `e`, returns the list of all map keys `x` which
+         evaluate to `true` in the predicate expression `p` (which can use variable
+         `x`). For instance, `{'one': 1, 'two': 2}.filter(k, k == 'one')` evaluates
+         to `['one']`. If no elements evaluate to `true`, the result is an empty
+         list. Any evaluation error for any element causes the macro to raise an error.
 
 ### Field Selection