length macro; utf-8 symbol

1 files changed, 9 insertions, 4 deletions

diff --git a/src/interp.c b/src/interp.c
index 8aa4329..6f7871c 100644
--- a/src/interp.c
+++ b/src/interp.c
@@ -449,11 +449,16 @@ end:
 
 int lisp_length(Interp *interp, SExpRef lst) {
     int cnt = 0;
-    while (REF(lst)->type == kPairSExp) {
-        cnt++;
-        lst = CDR(lst);
+    if (VALTYPE(lst) == kPairSExp) {
+        while (REF(lst)->type == kPairSExp) {
+            cnt++;
+            lst = CDR(lst);
+        }
+        return cnt;
+    } else if (VALTYPE(lst) == kStringSExp) {
+        return strlen(REF(lst)->str);
     }
-    return cnt;
+    return 1;
 }
 
 static SExpRef build_function_env(Interp *interp, SExpRef func, SExpRef args) {