updated web

Author: mkhan45

lib/parser.ml

@@ -458,7 +458,7 @@ and parse_map = function
                     printf "Expected comma";
                     assert false
         in
-        let rec aux ls acc = match ls with
+        let rec aux ls acc = match (skip_newlines ls) with
             | {data = RBrace; _}::more -> ((acc, None), more)
             | {data = Comma; _}::xs ->
                 let xs = skip_newlines xs in
@@ -475,7 +475,14 @@ and parse_map = function
                         printf "Invalid map expression\n";
                         assert false
                 end
-            | _ -> assert false
+            | {data; location}::_ -> 
+                printf "Expected Pipe, Comma, or RBrace at %s, got %s" 
+                    (location_to_string location) 
+                    (string_of_tok data);
+                Caml.exit 0
+            | [] -> 
+                printf "Expected Pipe, Comma, or RBrace at end of file" ;
+                Caml.exit 0
         in begin match rest with
             | {data = RBrace; _}::xs ->
                 (MapExpr ([], None), xs)

lib/stdlib.rsc

@@ -1,3 +1,8 @@
+let merge_maps(m1, m2) = {
+    let m1_list = map_to_list(m1)
+    fold(m2, fn(acc, (k, v)) => %{k => v | acc}, m1_list)
+}
+
 let count(ls) = {
     let loop(ls, counter) = match ls
 	| [] -> counter

rustscript.install

@@ -0,0 +1,47 @@
+lib: [
+  "_build/install/default/lib/rustscript/META"
+  "_build/install/default/lib/rustscript/dune-package"
+  "_build/install/default/lib/rustscript/eval.ml"
+  "_build/install/default/lib/rustscript/opam"
+  "_build/install/default/lib/rustscript/operators.ml"
+  "_build/install/default/lib/rustscript/parser.ml"
+  "_build/install/default/lib/rustscript/preprocess.ml"
+  "_build/install/default/lib/rustscript/run.ml"
+  "_build/install/default/lib/rustscript/rustscript.a"
+  "_build/install/default/lib/rustscript/rustscript.cma"
+  "_build/install/default/lib/rustscript/rustscript.cmi"
+  "_build/install/default/lib/rustscript/rustscript.cmt"
+  "_build/install/default/lib/rustscript/rustscript.cmx"
+  "_build/install/default/lib/rustscript/rustscript.cmxa"
+  "_build/install/default/lib/rustscript/rustscript.ml"
+  "_build/install/default/lib/rustscript/rustscript__Eval.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Eval.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Eval.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Operators.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Operators.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Operators.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Parser.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Parser.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Parser.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Preprocess.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Preprocess.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Preprocess.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Run.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Run.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Run.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Scanner.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Scanner.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Scanner.cmx"
+  "_build/install/default/lib/rustscript/rustscript__Types.cmi"
+  "_build/install/default/lib/rustscript/rustscript__Types.cmt"
+  "_build/install/default/lib/rustscript/rustscript__Types.cmx"
+  "_build/install/default/lib/rustscript/scanner.ml"
+  "_build/install/default/lib/rustscript/types.ml"
+]
+libexec: [
+  "_build/install/default/lib/rustscript/rustscript.cmxs"
+]
+doc: [
+  "_build/install/default/doc/rustscript/LICENSE"
+  "_build/install/default/doc/rustscript/README.md"
+]