Merge branch 'master' of https://github.com/bakpakin/dst

README.md

@@ -102,22 +102,8 @@ make test
 1. Install [Visual Studio](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15#)
 or [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=15#)
 2. Run a Visual Studio Command Prompt (cl.exe and link.exe need to be on the PATH) and cd to the directory with dst.
-3. Run `build` to compile dst.
+3. Run `build_win` to compile dst.
-4. Run `build test` to make sure everything is working.
+4. Run `build_win test` to make sure everything is working.
-
-```sh
-cd somewhere/my/projects/dst
-mkdir -p build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release ..
-make
-make test
-```
-
-The repl can also be run with the CMake run target.
-```sh
-make run
-```
 
 ## Examples
 

src/core/struct.c

@@ -92,7 +92,8 @@ void dst_struct_put(DstKV *st, Dst key, Dst value) {
          * is closer to their source than current. We use robinhood
          * hashing to ensure that equivalent structs that are contsructed
          * with different order have the same internal layout, and therefor
-         * will compare properly - i.e., {1 2 3 4} should equal {3 4 1 2}. */
+         * will compare properly - i.e., {1 2 3 4} should equal {3 4 1 2}. 
+         * Collisions are resolved via an insertion sort insertion. */
         otherhash = dst_hash(kv->key);
         otherindex = dst_struct_maphash(cap, otherhash);
         otherdist = (i + cap - otherindex) & (cap - 1);
@@ -155,11 +156,7 @@ const DstKV *dst_struct_end(DstKV *st) {
 /* Get an item from a struct */
 Dst dst_struct_get(const DstKV *st, Dst key) {
     const DstKV *kv = dst_struct_find(st, key);
-    if (NULL == kv) {
+    return kv ? kv->value : dst_wrap_nil();
-        return dst_wrap_nil();
-    } else {
-        return kv->value;
-    }
 }
 
 /* Get the next key in a struct */

src/mainclient/init.dst

@@ -9,10 +9,10 @@
   (var *exit-on-error* :private true)
 
   # Flag handlers
-  (def handlers :private 
+  (def handlers :private
-    {"h" (fn [] 
+    {"h" (fn @[]
-           (print "usage: " (get args 0) " [options] scripts...")
+           (print "usage: " (get process.args 0) " [options] scripts...")
-           (print 
+           (print
              `Options are:
   -h Show this help
   -v Print the version string
@@ -28,20 +28,20 @@
      "r" (fn @[] (:= *should-repl* true) 1)
      "p" (fn @[] (:= *exit-on-error* false) 1)
      "-" (fn @[] (:= *handleopts* false) 1)
-     "e" (fn @[i] 
+     "e" (fn @[i]
            (:= *no-file* false)
-           (eval (get args (+ i 1)))
+           (eval (get process.args (+ i 1)))
            2)})
 
   (defn- dohandler @[n i]
     (def h (get handlers n))
-    (if h (h i) (print "unknown flag -" n)))
+    (if h (h i) (do (print "unknown flag -" n) ((get handlers "h")))))
 
   # Process arguments
   (var i 1)
-  (def lenargs (length args))
+  (def lenargs (length process.args))
   (while (< i lenargs)
-    (def arg (get args i))
+    (def arg (get process.args i))
     (if (and *handleopts* (= "-" (string.slice arg 0 1)))
       (+= i (dohandler (string.slice arg 1 2) i))
       (do
@@ -49,7 +49,7 @@
         (import* _env arg :exit *exit-on-error*)
         (++ i))))
 
-  (when (or *should-repl* *no-file*) 
+  (when (or *should-repl* *no-file*)
     (if *raw-stdin*
       (repl nil identity)
       (do

src/mainclient/main.c

@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
     args = dst_array(argc);
     for (i = 0; i < argc; i++)
         dst_array_push(args, dst_cstringv(argv[i]));
-    dst_env_def(env, "args", dst_wrap_array(args));
+    dst_env_def(env, "process.args", dst_wrap_array(args));
 
     /* Expose line getter */
     dst_env_def(env, "getline", dst_wrap_cfunction(dst_line_getter));