pulling out less sensible/optimal string primitives

Author: akjmicro

README.md

@@ -162,7 +162,7 @@ Implemented thus far:
   * Strings:
     * simple string printing w/ `print`
     * fancier right-justified numeric output fields: `.rj`
-    * `strcat`, `strcpy`, `strtok`, `memcpy`
+    * `strtok`, `mempcpy`, `memset`, `mkbuf`, `free`
     * strong comparison with: `strlen`, `str=`, `str<`, `str>`
     * find a substring with `strfind`
     * '#' to end-of-line' for comments

contrib/dclang.nanorc

@@ -30,7 +30,7 @@ color brightred "(^|[[:space:]])((\!|\@|const|var|allot|create|\,|h\@|h\!|hkeys|
 color brightgreen "(^|[[:space:]])((times|again|exittimes|for|next|exitfor|i|j|k|if|else|endif|return)($|[[:space:]]))*"
 # other words
 color cyan "(^|[[:space:]])((cr|print|emit|uemit|ord|tohex|bytes32)($|[[:space:]]))*"
-color cyan "(^|[[:space:]])((free|strlen|str=|str<|str>|strfind|strcat|strcpy|strdup|strtok|memcpy|mempcpy|memset|clock|sleep)($|[[:space:]]))*"
+color cyan "(^|[[:space:]])((strlen|str=|str<|str>|strfind|strtok|mempcpy|memset|mkbuf|free|clock|sleep)($|[[:space:]]))*"
 color cyan "(^|[[:space:]])((fopen|fread|fseek|ftell|fwrite|fflush|fclose|redirect|resetout|flush|open|mkbuf|read|write|close)($|[[:space:]]))*"
 color cyan "(^|[[:space:]])((tcplisten|tcpaccept|tcpconnect|block_sigint|unblock_sigint)($|[[:space:]]))*"
 color yellow "(^|[[:space:]])((words|primitives|import|input)($|[[:space:]]))*"

examples/nano_syntax_highlighting_test.dc

@@ -12,8 +12,8 @@ drop dup over pick depth swap rot -rot nip tuck
 svpush svpop svpick svdrop svclear
 ! @ const var allot create , h@ h! hkeys
 times again exittimes for next exitfor i j k if else endif return
-. h. .. .s .rj cr print emit uemit ord tohex bytes32 free
-strlen str= str< str> strfind strcat strcpy strdup strtok memcpy mempcpy memset
+. h. .. .s .rj cr print emit uemit ord tohex bytes32
+strlen str= str< str> strfind strtok mempcpy memset mkbuf free
 fopen fread fseek ftell fwrite fflush fclose redirect resetout flush
 open mkbuf read tcplisten tcpaccept tcpconnect clock sleep
 words primitives import input

examples/redis_example.dc

@@ -39,7 +39,7 @@ cr
 # END CODE
 
 # STRING
-"Next, we'll do a simlar set/get, but with the grea J.S. Bach as the subject
+"Next, we'll do a simlar set/get, but with the great J.S. Bach as the subject
 of interest. The following is the output of two commands in succession:
 
 \"Bach\" \"Best_composer\" redis_set print cr

examples/sorting.dc

@@ -1,3 +1,5 @@
+"string.dc" import
+
 var iters 24 iters !
 var myarr iters @ allot
 
@@ -28,6 +30,7 @@ showarr
 
 var :tempest_quote
 var :delimiters
+var token_hold
 var word_index 0 word_index !
 create tempest_words
 
@@ -45,25 +48,32 @@ print cr
 
 cr "The quote in question is: " print cr cr :tempest_quote @ print cr
 
-: copy_token
-  16 mkbuf swap strcpy ,
-;
-
 : splitter_main
-  0 :delimiters @ strtok dup
-  0 <> if
-    copy_token
-    splitter_main
-  endif
+    0
+      :delimiters @
+        token_hold
+    strtok
+      dup
+        0
+      <>
+    if
+      ,
+      splitter_main
+    endif
 ;
 
 : splitter
-  :tempest_quote @ :delimiters @ strtok dup  # ( token token )
-  0 <> if
-    copy_token
-    splitter_main
-  endif
-  drop
+    :tempest_quote @
+      :delimiters @
+        token_hold
+    strtok
+      dup  # ( token token )
+        0
+      <>
+    if
+      ,
+      splitter_main
+    endif
 ;
 
 : showstrs

examples/tcpclient.dc

@@ -24,7 +24,10 @@ var prompt "Please enter your message: " prompt !
 
 : msg_to_buf
   zerobuf
-  get_connbuf get_msg strcpy
+    get_connbuf
+      get_msg
+        dup strlen
+  mempcpy drop
 ;
 
 : client_connect "localhost" 5509 tcpconnect serv ! ;

examples/tcpserver.dc

@@ -14,15 +14,21 @@ var accepted_conn
 : get_response_prefix response_prefix @ ;
 : get_response_prefix_len response_prefix_len @ ;
 : zerobuf get_connbuf 0 1024 memset ;
-: msgcpy get_received get_connbuf strcpy ;
+: copyinput
+  get_received
+    get_connbuf
+      dup strlen
+  mempcpy
+  drop
+;
 
 : read_incoming
   zerobuf
   get_accepted_conn get_connbuf 1023 read drop
 ;
 
 : concat_response
-  msgcpy
+  copyinput
   zerobuf
   get_connbuf get_response_prefix get_response_prefix_len mempcpy
   get_received dup strlen mempcpy

lib/redis.dc

@@ -75,7 +75,8 @@ var redis_socket -1 redis_socket !
 : _msg_to_buf
   _set_msg
   _zero_redis_buffer
-  REDIS_BUFFER _get_msg strcpy drop
+  REDIS_BUFFER _get_msg dup strlen mempcpy
+  drop
 ;
 
 : _redis_connect

lib/string.dc

@@ -1,5 +1,14 @@
 "deprecated_stack.dc" import
 
+: strdup
+  # copies a string; leaves the new string's
+  # beginning address on the stack
+  dup strlen
+  swap over mkbuf
+  swap 2 pick mempcpy
+  swap -
+;
+
 : _incr_saved_counter
   svpop 1 + svpush
 ;

primitives.c

@@ -135,18 +135,14 @@ void add_all_primitives()
     add_primitive("tonum", tonumfunc);
     add_primitive("tostr", tostrfunc);
     add_primitive("bytes32", bytes32func);
-    add_primitive("mkbuf", mkbuffunc);
-    add_primitive("free", freefunc);
     add_primitive("strlen", strlenfunc);
     add_primitive("str=", streqfunc);
     add_primitive("str<", strltfunc);
     add_primitive("str>", strgtfunc);
     add_primitive("strfind", strfindfunc);
-    add_primitive("strcat", strcatfunc);
-    add_primitive("strcpy", strcpyfunc);
-    add_primitive("strdup", strdupfunc);
     add_primitive("strtok", strtokfunc);
-    add_primitive("memcpy", memcpyfunc);
+    add_primitive("mkbuf", mkbuffunc);
+    add_primitive("free", freefunc);
     add_primitive("mempcpy", mempcpyfunc);
     add_primitive("memset", memsetfunc);
     // file
@@ -179,6 +175,9 @@ void add_all_primitives()
     // block a SIGINT
     add_primitive("block_sigint", blocksigintfunc);
     add_primitive("unblock_sigint", unblocksigintfunc);
+    // os fork and exit
+    add_primitive("fork", forkfunc);
+    add_primitive("exit", exitfunc);
     // show defined words!
     add_primitive("words", showdefined);
 };

signal_ops.c

@@ -12,3 +12,26 @@ static void unblocksigintfunc()
 {
   sigprocmask(SIG_UNBLOCK, &block_sigint, NULL);
 }
+
+
+static void forkfunc()
+{
+    // This function mainly exists so that a multi-client capable tcp/web server
+    // can be had. It is assumed that the return value will be caught, inspected,
+    // and handled by the caller, so this is really quite a simple c->dclang mapping.
+    // TODO: a future enhancement might be to have a counting system in place for
+    // avoiding fork-bomb DoS attacks. So, the introspection of a connection limit
+    // before granting a new `fork`.
+    push((DCLANG_INT32) fork());
+}
+
+
+static void exitfunc()
+{
+    if (data_stack_ptr < 1) {
+        printf("exit -- need an integer exit code on the stack");
+        return;
+    }
+    DCLANG_INT32 code = (DCLANG_INT32) pop();
+    exit(code);
+}

socket_ops.c

@@ -14,22 +14,22 @@ static void tcplistenfunc()
         printf("tcplisten -- need <port_number> on the\n");
         return;
     }
-    int sockfd = socket(AF_INET, SOCK_STREAM, 0);
-    int true = 1;
-    setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &true, sizeof(int));
+    DCLANG_INT32 sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    DCLANG_INT32 true = 1;
+    setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &true, sizeof(DCLANG_INT32));
     if (sockfd < 0) {
        perror("tcplisten -- ERROR opening socket.");
     }
     bzero((char *) &serv_addr, sizeof(serv_addr));
-    int portno = (int) pop();
+    DCLANG_INT32 portno = (DCLANG_INT32) pop();
     serv_addr.sin_family = AF_INET;
     serv_addr.sin_addr.s_addr = INADDR_ANY;
     serv_addr.sin_port = htons(portno);
     if (bind(sockfd, (struct sockaddr *) &serv_addr,
           sizeof(serv_addr)) < 0)
           perror("ERROR on binding");
     listen(sockfd, 5);
-    push((int) sockfd);
+    push((DCLANG_INT32) sockfd);
 }
 
 
@@ -43,11 +43,11 @@ static void tcpacceptfunc()
         printf("tcpaccept -- need <socket> on the stack");
         return;
     }
-    unsigned int clilen = sizeof(cli_addr);
-    int sockfd = (int) pop();
-    int newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
+    DCLANG_UINT32 clilen = sizeof(cli_addr);
+    DCLANG_INT32 sockfd = (DCLANG_INT32) pop();
+    DCLANG_INT32 newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
     if (newsockfd < 0) perror("tcpaccept -- ERROR on accept step!");
-    push((int) newsockfd);
+    push((DCLANG_INT32) newsockfd);
 }
 
 
@@ -59,9 +59,9 @@ static void tcpconnectfunc()
         printf("tcpconnect -- need <host> <port> on the stack");
         return;
     }
-    int sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    DCLANG_INT32 sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) perror("tcpconnect -- ERROR opening socket");
-    int portno = (int) pop();
+    DCLANG_INT32 portno = (DCLANG_INT32) pop();
     struct sockaddr_in host_addr;
     char *servername = (char *) (DCLANG_UINT) pop();
     struct hostent *server = gethostbyname(servername);
@@ -75,5 +75,5 @@ static void tcpconnectfunc()
     host_addr.sin_port = htons(portno);
     if (connect(sockfd, (struct sockaddr *)&host_addr, sizeof(host_addr)) < 0)
         perror("tcpconnect -- ERROR connecting");
-    push((int) sockfd);
+    push((DCLANG_INT32) sockfd);
 }

string_ops.c

@@ -418,80 +418,6 @@ static void strfindfunc()
     push((DCLANG_INT) strstr(str1, str2));
 }
 
-// destructive/creative string functions:
-static void strcatfunc()
-{
-    if (data_stack_ptr < 2)
-    {
-        printf("strcat -- needs <dest> <source> string pointers on stack! ");
-        return;
-    }
-    DCLANG_UINT string_uint_addr2 = (DCLANG_UINT) pop();
-    DCLANG_UINT string_uint_addr1 = (DCLANG_UINT) pop();
-    if (string_uint_addr1 < MIN_STR || string_uint_addr1 > MAX_STR)
-    {
-        perror("strcat --  <dest> (first) string address out-of-range.");
-        return;
-    }
-    if (string_uint_addr2 < MIN_STR || string_uint_addr2 > MAX_STR)
-    {
-        perror("strcat -- <source> (second) string address out-of-range.");
-        return;
-    }
-    char *str1 = (char *) string_uint_addr1;
-    char *str2 = (char *) string_uint_addr2;
-    push((DCLANG_INT) strcat(str1, str2));
-}
-
-static void strcpyfunc()
-{
-    if (data_stack_ptr < 2)
-    {
-        printf("strcpy -- needs <dest> <source> string pointers on stack! ");
-        return;
-    }
-    DCLANG_UINT string_uint_addr2 = (DCLANG_UINT) pop();
-    DCLANG_UINT string_uint_addr1 = (DCLANG_UINT) pop();
-    if (string_uint_addr1 < MIN_STR || string_uint_addr1 > MAX_STR)
-    {
-        perror("strcpy --  <dest> (first) string address out-of-range.");
-        return;
-    }
-    if (string_uint_addr2 < MIN_STR || string_uint_addr2 > MAX_STR)
-    {
-        perror("strcpy -- <source> (second) string address out-of-range.");
-        return;
-    }
-    char *str1 = (char *) string_uint_addr1;
-    char *str2 = (char *) string_uint_addr2;
-    push((DCLANG_INT) strcpy(str1, str2));
-}
-
-static void strdupfunc()
-{
-    if (data_stack_ptr < 1)
-    {
-        printf("strdup -- needs <string> string pointer on stack! ");
-        return;
-    }
-    DCLANG_UINT string_uint_addr = (DCLANG_UINT) pop();
-    if (string_uint_addr < MIN_STR || string_uint_addr > MAX_STR)
-    {
-        perror("strdup -- string address out-of-range.");
-        return;
-    }
-    char *str1 = strdup((char *) string_uint_addr);
-    DCLANG_UINT str1addr = (DCLANG_UINT) str1;
-    if (str1addr < MIN_STR || MIN_STR == 0)
-    {
-        MIN_STR = str1addr;
-    }
-    if (str1addr > MAX_STR || MAX_STR == 0)
-    {
-        MAX_STR = str1addr;
-    }
-    push((DCLANG_UINT) str1);
-}
 
 static void strtokfunc()
 {
@@ -524,28 +450,6 @@ static void strtokfunc()
     push((DCLANG_INT) strtok_r(str1, str2, savepoint_ptr));
 }
 
-static void memcpyfunc()
-{
-    if (data_stack_ptr < 3)
-    {
-        printf("memcpy -- needs <dest> <source> <size> on stack! ");
-        return;
-    }
-    DCLANG_UINT size = (DCLANG_UINT) pop();
-    DCLANG_UINT source = (DCLANG_UINT) pop();
-    DCLANG_UINT dest = (DCLANG_UINT) pop();
-    if ((dest != 0) && (dest < MIN_STR || dest > MAX_STR))
-    {
-        perror("memcpy --  <dest> string address out-of-range.");
-        return;
-    }
-    if (source < MIN_STR || source > MAX_STR)
-    {
-        perror("memcpy -- <source> string address out-of-range.");
-        return;
-    }
-    push((DCLANG_UINT) memcpy((char *)dest, (char *)source, (DCLANG_UINT) size));
-}
 
 static void mempcpyfunc()
 {