switched % operator to mod

Author: mkhan45

editor/rustscript.vim

@@ -31,6 +31,7 @@ syntax match rscOp "<="
 syntax match rscOp "<"
 syntax match rscOp ">"
 syntax match rscOp ">="
+syntax match rscOp "mod"
 highlight link rscOp Operator
 
 syntax match rscMatchArrow "->" 

examples/caesar.rsc

@@ -6,7 +6,7 @@ let (to_number, to_letter) = {
 }
 
 let encode = fn(text, shift) => {
-    let shift = shift % 26
+    let shift = shift mod 26
 
     let loop = fn(char_ls, acc) => match char_ls
 	| [] -> concat(reverse(acc))
@@ -16,7 +16,7 @@ let encode = fn(text, shift) => {
 		|> to_number
 		|> add(shift, _)
 		|> fn(c) => if c < 0 then 26 + c else c
-		|> fn(c) => to_letter(c % 26)
+		|> fn(c) => to_letter(c mod 26)
 	    loop(xs, [new_letter | acc])
 	}
 

examples/euler1.rsc

@@ -1,2 +1,2 @@
-let euler1 = sum([x for x in [1..1000] if x % 3 == 0 || x % 5 == 0])
+let euler1 = sum([x for x in [1..1000] if x mod 3 == 0 || x mod 5 == 0])
 # inspect(euler1) # 233168

examples/euler1_no_listcomp.rsc

@@ -1,2 +1,2 @@
-let predicate = fn(n) => (n % 3 == 0) || (n % 5 == 0)
+let predicate = fn(n) => (n mod 3 == 0) || (n mod 5 == 0)
 # inspect(sum(filter_rev(predicate, range(1, 1000)))) #233168

examples/euler1_tup.rsc

@@ -24,4 +24,4 @@ let sum_tup = {
     fn (ls) => helper(ls, 0)
 }
 
-let predicate = fn(n) => (n % 3 == 0) || (n % 5 == 0)
+let predicate = fn(n) => (n mod 3 == 0) || (n mod 5 == 0)

examples/euler3.rsc

@@ -2,15 +2,15 @@ let gcd = fn(a, b) => match (a, b)
     | (x, 0) | (0, x) -> x
     | (a, b) when a > b -> gcd(b, a)
     | (a, b) -> {
-        let remainder = b % a
+        let remainder = b mod a
         if remainder != 0 then (gcd(a, remainder)) else a
     }
 
 let pollard = fn(n) => match n
     | 1 -> ()
-    | n when n % 2 == 0 -> 2
+    | n when n mod 2 == 0 -> 2
     | n -> {
-        let g = fn(x, n) => (x * x + 1) % n
+        let g = fn(x, n) => (x * x + 1) mod n
         let iter = fn(x, y, d) => match (x, y, d)
             | (x, y, 1) -> {
                 let x = g(x, n)

examples/euler5.rsc

@@ -1,6 +1,6 @@
 let gcd = fn(a, b) => match (a, b)
     | (a, 0) -> a 
-    | (a, b) -> gcd(b, a % b)
+    | (a, b) -> gcd(b, a mod b)
 
 let lcm = fn(a, b) => (a * b) / gcd(a, b)
 

lib/eval.ml

@@ -650,9 +650,12 @@ and eval_map_expr ?tc:(_tail_call=false) map_pairs tail_map ss loc state =
     let start_map = match tail_map with
         | Some (Dictionary m) -> m
         | None -> Map.empty (module Int)
-        | _ ->
-            printf "Expected a map\n";
-            assert false
+        | Some m ->
+            printf "Expected a map for the tail in map expr at %s, got %s\n"
+                (location_to_string loc)
+                (string_of_val ss m);
+            print_traceback ss;
+            Caml.exit 0
     in
     let (val_map, state) = 
         List.fold_left ~init:(start_map, state) ~f:fold_fn map_pairs

lib/parser.ml

@@ -19,7 +19,6 @@ let prefix_op_bp = 13
 
 let rec complete_expr: expr t -> (token t) list -> int -> (expr t * (token t) list) = 
     fun lhs ls min_bp -> match (skip_newlines ls) with
-    | {data = Percent; location}::xs -> complete_expr lhs (({data = Operator Mod; location})::xs) min_bp
     | ({data = Operator op; location})::xs ->
             let (l_bp, r_bp) = binary_op_bp op in
             if l_bp < min_bp then 
@@ -348,6 +347,7 @@ and parse_args toks =
                             CaptureExprArg nx, rest
                     in
                     let acc = nx::acc in
+                    let rest = skip_newlines rest in
                     match rest with
                         | {data = Comma; _}::rest -> aux rest acc
                         | {data = RParen; _}::rest -> acc, rest

lib/run.ml

@@ -33,6 +33,7 @@ let run_line ss state line =
 let run_string in_string filename (ss, state) =
     let locate = Located.locate {line_num = 0; filename = filename} in
     let tokens = in_string |> Scanner.scan ~filename:filename |> skip_newlines in
+    (* print_toks (List.map ~f:Located.extract tokens); *)
     let expr_ls =
         let rec aux remaining acc = match (skip_newlines remaining) with
             | [] -> acc