From af3fa90e8bb41c306c5fe2d2cf105db6bbabd1d9 Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Tue, 19 Oct 2021 10:53:45 -0700
Subject: Feat: word operators and more robust crashing

Added the length and concatenate operators.
Slightly improved the robustness on syntax errors.
---
 sys/cmd/rc/exec.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 2 deletions(-)

(limited to 'sys/cmd/rc/exec.c')

diff --git a/sys/cmd/rc/exec.c b/sys/cmd/rc/exec.c
index d78cb5d..87b6bb7 100644
--- a/sys/cmd/rc/exec.c
+++ b/sys/cmd/rc/exec.c
@@ -582,7 +582,11 @@ Xreadcmd(void)
     root = runner;
 
     if(yyparse()){
-        exit(1);
+        // resource cleanup?
+        if(runner->flag.eof)
+            Xreturn();
+        else
+            --root->code.i;
     }else{
         --root->code.i;    /* re-execute Xreadcmd after codebuf runs */
         run(compiled, 1, root->local);
@@ -670,9 +674,66 @@ Xbasic(void)
     foreground(runner, 0); // waits for child
 }
 
+void
+Xcount(void)
+{
+    Word *arg;
+    char *str, num[12];
+
+    if(count(runner->args->word) != 1){
+        Xerror("variable name not a singleton\n");
+        return;
+    }
+
+    str = runner->args->word->str;
+    arg = var(str)->val;
+    poplist();
+
+    itoa(num, count(arg));
+    pushword(num);
+}
+
+void
+Xflat(void)
+{
+    int   len;
+    char *str;
+    Word *arg, *a;
+
+    if(count(runner->args->word)!=1){
+        Xerror("variable name is not a singleton\n");
+        return;
+    }
+
+    str = runner->args->word->str;
+    arg = var(str)->val;
+    poplist();
+
+    len = count(arg);
+    if(!len){
+        pushword("");
+        return;
+    }
+
+    for(a=arg; a; a=a->link)
+        len += strlen(a->str);
+
+    str = emalloc(len);
+    if(arg){
+        strcpy(str, arg->str);
+        for(a = arg->link; a; a = a->link){
+            strcat(str," ");
+            strcat(str,a->str);
+        }
+    }else
+        str[0] = 0;
+
+    pushword(str);
+    efree(str);
+}
+
 void
 Xexit(void)
 {
     exit(shell.status);
 }
-
-- 
cgit v1.2.1