clean up x,y -> loc

Author: bluddy

dune-project

@@ -22,7 +22,7 @@
  (description "Requires original files")
  (depends ocaml dune iter containers containers-data gen imagelib tsdl owl-base
           ocamlgraph logs
-          ppx_import ppx_deriving ppx_hash ppx_yojson_conv lens)
+          ppx_import ppx_deriving ppx_hash ppx_yojson_conv ppx_expect ppx_inline_test ppx_update)
  (tags
   (game engine remake)))
 

rails.opam

@@ -25,7 +25,9 @@ depends: [
   "ppx_deriving"
   "ppx_hash"
   "ppx_yojson_conv"
-  "lens"
+  "ppx_expect"
+  "ppx_inline_test"
+  "ppx_update"
   "odoc" {with-doc}
 ]
 build: [

src/rails_lib/backend/backend_low.ml

@@ -210,11 +210,11 @@ module Graph = struct
         when TS.(equal_ixn ixn1 ixn3 && equal_ixn ixn2 ixn4 || equal_ixn ixn1 ixn4 && equal_ixn ixn2 ixn3) ->
           graph
           |> G.remove_segment ~xyd:(ixn1.x,ixn1.y,ixn1.dir)
-          |> G.add_segment ~xyd1:(ixn3.x,ixn3.y,ixn3.dir)
-                           ~xyd2:(x,y,ixn3.search_dir)
+          |> G.add_segment ~xyd1:(ixn3.x, ixn3.y, ixn3.dir)
+                           ~xyd2:(x, y, ixn3.search_dir)
                            ~dist:ixn3.dist
-          |> G.add_segment ~xyd1:(ixn4.x,ixn4.y,ixn4.dir)
-                           ~xyd2:(x,y,ixn4.search_dir)
+          |> G.add_segment ~xyd1:(ixn4.x, ixn4.y, ixn4.dir)
+                           ~xyd2:(x, y, ixn4.search_dir)
                            ~dist:ixn4.dist
 
 

src/rails_lib/dune

@@ -4,7 +4,7 @@
   (libraries iter containers containers-data gen imagelib imagelib.unix tsdl owl-base ocamlgraph logs logs.fmt)
   (inline_tests)
   (preprocess
-    (staged_pps ppx_import ppx_deriving.show ppx_deriving.enum ppx_deriving.eq ppx_deriving.ord lens.ppx_deriving ppx_hash ppx_yojson_conv ppx_expect ppx_inline_test)
+    (staged_pps ppx_import ppx_deriving.show ppx_deriving.enum ppx_deriving.eq ppx_deriving.ord lens.ppx_deriving ppx_hash ppx_yojson_conv ppx_expect ppx_inline_test ppx_update)
     )
   )
 

src/rails_lib/ui/station_map_ui.ml

@@ -106,7 +106,7 @@ let render win (s:State.t) (v:Edit_train_d.station_map) =
 
   (* Info bar *)
   begin match v.selected_station with
-  | Some ((x,y) as loc) ->
+  | Some loc ->
       let write = write ~idx:4 in
       let station = Station_map.get_exn loc s.backend.stations in
       let demand = Station.get_demand_exn station in

src/rails_lib/ui/station_view.ml

@@ -3,7 +3,7 @@ module R = Renderer
 
 (* Station view screen *)
 
-let render win (s:State.t) ((x, y) as loc) ~show_demand =
+let render win (s:State.t) loc ~show_demand =
   let ground_y = 186 in
   let switchingyard_x = 0 in
   let engineshop_x = 64 in