diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index ba516751a..ff4f2e31c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocamlVersion: [5_1] + ocamlVersion: [5_2] steps: - - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v21 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v27 with: extra_nix_config: | extra-substituters = https://anmonteiro.nix-cache.workers.dev diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 12d037a39..28fbb0456 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -24,7 +24,7 @@ jobs: # disabling this for now ocaml-compiler: - - 5.1.1 + - 5.2.0 runs-on: ${{ matrix.os }} diff --git a/dune-project b/dune-project index 56818434a..b71369d9d 100644 --- a/dune-project +++ b/dune-project @@ -40,7 +40,7 @@ (= :version)) (reason (>= 3.10.0)) - (ocaml-lsp-server :with-test) + (ocaml-lsp-server :with-dev-setup) (opam-check-npm-deps (and (= 1.0.0) @@ -60,10 +60,7 @@ (>= 3.10.0)) (ppxlib (>= 0.28.0)) - (merlin - (and - (= 4.13.1-501) - :with-test)) + (merlin :with-test) (ocamlformat (and (= 0.24.0) diff --git a/flake.lock b/flake.lock index 2a5874d72..5043237c4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706769090, - "narHash": "sha256-q4VquXSb9DdBOms28Cf4AJvaA99kPFCDSvyEg6DC7Q8=", + "lastModified": 1716679396, + "narHash": "sha256-TpVGqdxjZp9sevgYEFDMsSJVRrBwmDCv1rnc1oKXeTU=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "d0415cd3ba07920174247c95b96ca7d50cee8753", + "rev": "89b0248f46dec442c13455f97e6e3603969b338d", "type": "github" }, "original": { @@ -56,17 +56,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706672657, - "narHash": "sha256-API05c0SDZrmzz1wpqt/K3iCwlaOqDeDfZGp0YGQnek=", + "lastModified": 1716660083, + "narHash": "sha256-QO7cdjtDhx72KEw6m0NOtuE5FS4asaRExZ65uFR/q8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "632751bf0ceeefc74af7a9d2335ea923ad9c831a", + "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "632751bf0ceeefc74af7a9d2335ea923ad9c831a", + "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 30c9aff30..71e92e60b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [ - (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_1; }) + (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_2; }) ]; in @@ -61,7 +61,9 @@ reason-react-ppx ]; }; - } // { default = packages.reason-react; }; + + default = packages.reason-react; + }; devShells = { default = pkgs.mkShell { diff --git a/ppx/test/dune b/ppx/test/dune index 1e0a153a6..1e2c1cb88 100644 --- a/ppx/test/dune +++ b/ppx/test/dune @@ -8,3 +8,8 @@ %{bin:jq} %{bin:ocamlmerlin} ppx.sh)) + +(cram + (applies_to simple uppercase) + ;; Disabled until https://github.com/reasonml/reason/issues/2737 is fixed + (enabled_if false)) diff --git a/ppx/test/location.t/run.t b/ppx/test/location.t/run.t index fcbebc3a2..0bb05666b 100644 --- a/ppx/test/location.t/run.t +++ b/ppx/test/location.t/run.t @@ -76,7 +76,7 @@ (pos_cnum -1))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ()))) - (((txt (Lident load_path)) + (((txt (Lident hidden_include_dirs)) (loc ((loc_start ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) @@ -106,6 +106,121 @@ (pos_cnum -1))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ()))) + (((txt (Lident load_path)) + (loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true)))) + ((pexp_desc + (Pexp_construct + ((txt (Lident [])) + (loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true)))) + ())) + (pexp_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true))) + (pexp_loc_stack ()) + (pexp_attributes + (((attr_name + ((txt ppxlib.migration.load_path) + (loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true))))) + (attr_payload + (PStr + (((pstr_desc + (Pstr_eval + ((pexp_desc + (Pexp_tuple + (((pexp_desc + (Pexp_construct + ((txt (Lident [])) + (loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_ghost true)))) + ())) + (pexp_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_ghost true))) + (pexp_loc_stack ()) (pexp_attributes ())) + ((pexp_desc + (Pexp_construct + ((txt (Lident [])) + (loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_ghost true)))) + ())) + (pexp_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) + (pos_bol 0) (pos_cnum -1))) + (loc_ghost true))) + (pexp_loc_stack ()) (pexp_attributes ()))))) + (pexp_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true))) + (pexp_loc_stack ()) (pexp_attributes ())) + ())) + (pstr_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true))))))) + (attr_loc + ((loc_start + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_end + ((pos_fname _none_) (pos_lnum 0) (pos_bol 0) + (pos_cnum -1))) + (loc_ghost true)))))))) (((txt (Lident open_modules)) (loc ((loc_start @@ -468,7 +583,7 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true))))) (pval_type ((ptyp_desc @@ -491,16 +606,16 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))) ())) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -513,8 +628,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))) ())) (ptyp_loc @@ -522,8 +637,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -534,8 +649,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -548,7 +663,7 @@ (pos_cnum 0))) (loc_end ((pos_fname output.ml) (pos_lnum 2) - (pos_bol 84) (pos_cnum 152))) + (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))) ((ptyp_desc (Ptyp_var lola)) (ptyp_loc @@ -565,8 +680,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (pof_attributes ()))) Closed)) @@ -575,8 +690,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc @@ -584,16 +699,16 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc @@ -618,25 +733,25 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true))))) (attr_payload (PStr ())) (attr_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))))) (pval_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))))) (pstr_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))) ((pstr_desc (Pstr_value Nonrecursive @@ -686,18 +801,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 18))) + (pos_cnum 17))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 65))) + (pos_cnum 64))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 18))) + (pos_cnum 17))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 65))) + (pos_cnum 64))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -715,10 +830,10 @@ (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 20))) + (pos_cnum 19))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 23))) + (pos_cnum 22))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -730,18 +845,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 20))) + (pos_cnum 19))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 23))) + (pos_cnum 22))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 18))) + (pos_cnum 17))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 65))) + (pos_cnum 64))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes @@ -773,18 +888,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 35))) + (pos_cnum 34))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 47))) + (pos_cnum 46))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 35))) + (pos_cnum 34))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 47))) + (pos_cnum 46))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -794,27 +909,27 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) - (pos_bol 0) (pos_cnum 48))) + (pos_bol 0) (pos_cnum 47))) (loc_end ((pos_fname output.ml) (pos_lnum 1) - (pos_bol 0) (pos_cnum 52))) + (pos_bol 0) (pos_cnum 51))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 48))) + (pos_cnum 47))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 52))) + (pos_cnum 51))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 35))) + (pos_cnum 34))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 52))) + (pos_cnum 51))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -824,42 +939,42 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 54))) + (pos_cnum 53))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 56))) + (pos_cnum 55))) (loc_ghost false)))) ())) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 54))) + (pos_cnum 53))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 56))) + (pos_cnum 55))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 18))) + (pos_cnum 17))) (loc_end ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) - (pos_cnum 65))) + (pos_cnum 64))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 18))) + ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 17))) (loc_end - ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 65))) + ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 64))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 9))) (loc_end - ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 65))) + ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 64))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes @@ -869,8 +984,8 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))))) (attr_payload (PStr @@ -907,20 +1022,20 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))))))) (pvb_attributes ()) (pvb_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost false))))))) (pstr_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost false)))) ((pstr_desc (Pstr_value Nonrecursive @@ -953,16 +1068,16 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))))) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -978,16 +1093,16 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))))) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((ptyp_desc @@ -998,8 +1113,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -1012,7 +1127,7 @@ (pos_bol 0) (pos_cnum 0))) (loc_end ((pos_fname output.ml) (pos_lnum 2) - (pos_bol 84) (pos_cnum 152))) + (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))) ((ptyp_desc (Ptyp_var lola)) (ptyp_loc @@ -1030,7 +1145,7 @@ (pos_bol 0) (pos_cnum 0))) (loc_end ((pos_fname output.ml) (pos_lnum 2) - (pos_bol 84) (pos_cnum 152))) + (pos_bol 83) (pos_cnum 150))) (loc_ghost true))) (pof_attributes ()))) Closed)) @@ -1039,8 +1154,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc @@ -1048,8 +1163,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ppat_loc @@ -1057,8 +1172,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -1071,16 +1186,16 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())) (((Labelled lola) @@ -1162,8 +1277,8 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc @@ -1178,8 +1293,8 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))))) ((pexp_desc (Pexp_ident @@ -1189,22 +1304,22 @@ ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) - (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) + (pos_cnum 150))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ()))) (pvb_attributes ()) @@ -1212,12 +1327,12 @@ ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost false))))))) (pstr_loc ((loc_start ((pos_fname output.ml) (pos_lnum 1) (pos_bol 0) (pos_cnum 0))) (loc_end - ((pos_fname output.ml) (pos_lnum 2) (pos_bol 84) (pos_cnum 152))) + ((pos_fname output.ml) (pos_lnum 2) (pos_bol 83) (pos_cnum 150))) (loc_ghost true)))) ((pstr_desc (Pstr_primitive @@ -1225,9 +1340,9 @@ ((txt makeProps) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true))))) (pval_type ((ptyp_desc @@ -1235,11 +1350,11 @@ ((ptyp_desc (Ptyp_var initialValue)) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 164))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 162))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 176))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 174))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -1249,20 +1364,20 @@ ((txt (Lident string)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))) ())) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -1272,20 +1387,20 @@ ((txt (Lident unit)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))) ())) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -1293,11 +1408,11 @@ ((txt (Ldot (Lident Js) t)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -1307,10 +1422,10 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 153))) + (pos_bol 151) (pos_cnum 151))) (loc_end ((pos_fname output.ml) (pos_lnum 7) - (pos_bol 362) (pos_cnum 394))) + (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))) ((ptyp_desc (Ptyp_constr @@ -1318,65 +1433,65 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false)))) (((ptyp_desc (Ptyp_var initialValue)) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (pof_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (pof_attributes ()))) Closed)) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc @@ -1399,30 +1514,30 @@ ((txt mel.obj) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))))) (attr_payload (PStr ())) (attr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))))) (pval_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))) ((pstr_desc (Pstr_value Nonrecursive @@ -1432,17 +1547,17 @@ ((txt make) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 157))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 155))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 161))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 159))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 157))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 155))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 161))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 159))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -1451,11 +1566,11 @@ (((pexp_desc (Pexp_constant (Pconst_integer 0 ()))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 178))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 176))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 179))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 177))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) ((ppat_desc @@ -1463,19 +1578,19 @@ ((txt initialValue) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 164))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 162))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 176))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 174))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 164))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 162))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 176))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 174))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -1485,20 +1600,20 @@ ((txt (Lident "()")) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 182))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 179))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 184))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 181))) (loc_ghost false)))) ())) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 182))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 179))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 184))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 181))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -1512,18 +1627,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 194))) + (pos_bol 184) (pos_cnum 191))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 199))) + (pos_bol 184) (pos_cnum 196))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 194))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 191))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 199))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 196))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((ppat_desc @@ -1532,35 +1647,35 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 201))) + (pos_bol 184) (pos_cnum 198))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 209))) + (pos_bol 184) (pos_cnum 206))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 201))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 198))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 209))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 206))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ()))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 193))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 190))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 210))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 207))) (loc_ghost false))) (ppat_loc_stack (((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 194))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 191))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 209))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 206))) (loc_ghost false)))) (ppat_attributes ()))) (pvb_expr @@ -1572,18 +1687,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 213))) + (pos_bol 184) (pos_cnum 210))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 227))) + (pos_bol 184) (pos_cnum 224))) (loc_ghost false)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 213))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 210))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 227))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 224))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -1595,19 +1710,19 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 233))) + (pos_bol 184) (pos_cnum 230))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 235))) + (pos_bol 184) (pos_cnum 232))) (loc_ghost false)))) ())) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 233))) + (pos_bol 184) (pos_cnum 230))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 235))) + (pos_bol 184) (pos_cnum 232))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -1616,54 +1731,54 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 239))) + (pos_bol 184) (pos_cnum 236))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 251))) + (pos_bol 184) (pos_cnum 248))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 239))) + (pos_bol 184) (pos_cnum 236))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 251))) + (pos_bol 184) (pos_cnum 248))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 228))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 225))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 252))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 249))) (loc_ghost false))) (pexp_loc_stack (((loc_start ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 229))) + (pos_bol 184) (pos_cnum 226))) (loc_end ((pos_fname output.ml) (pos_lnum 4) - (pos_bol 187) (pos_cnum 251))) + (pos_bol 184) (pos_cnum 248))) (loc_ghost false)))) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 213))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 210))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 252))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 249))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 189))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 186))) (loc_end - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 252))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 249))) (loc_ghost false))))) ((pexp_desc (Pexp_apply @@ -1672,19 +1787,19 @@ ((txt (Ldot (Lident ReactDOM) jsx)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 258))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 255))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 258))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 255))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -1701,11 +1816,11 @@ ()))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 260))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 257))) (loc_end - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 266))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 263))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -1717,18 +1832,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 260))) + (pos_bol 253) (pos_cnum 257))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 266))) + (pos_bol 253) (pos_cnum 263))) (loc_ghost false)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 258))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 255))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes @@ -1760,18 +1875,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 344))) + (pos_bol 318) (pos_cnum 341))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 346))) + (pos_bol 318) (pos_cnum 343))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 344))) + (pos_bol 318) (pos_cnum 341))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 346))) + (pos_bol 318) (pos_cnum 343))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -1781,18 +1896,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 338))) + (pos_bol 318) (pos_cnum 335))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 343))) + (pos_bol 318) (pos_cnum 340))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 338))) + (pos_bol 318) (pos_cnum 335))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 343))) + (pos_bol 318) (pos_cnum 340))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -1802,27 +1917,27 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 347))) + (pos_bol 318) (pos_cnum 344))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 356))) + (pos_bol 318) (pos_cnum 353))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 347))) + (pos_bol 318) (pos_cnum 344))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 356))) + (pos_bol 318) (pos_cnum 353))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 338))) + (pos_bol 318) (pos_cnum 335))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 356))) + (pos_bol 318) (pos_cnum 353))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) ((Labelled onClick) @@ -1832,10 +1947,10 @@ (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 281))) + (pos_bol 253) (pos_cnum 278))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 282))) + (pos_bol 253) (pos_cnum 279))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -1846,18 +1961,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 286))) + (pos_bol 253) (pos_cnum 283))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 294))) + (pos_bol 253) (pos_cnum 291))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 286))) + (pos_bol 253) (pos_cnum 283))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 294))) + (pos_bol 253) (pos_cnum 291))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -1869,20 +1984,20 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 300))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 297))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 305))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 302))) (loc_ghost false)))))) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 300))) + (pos_bol 253) (pos_cnum 297))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 305))) + (pos_bol 253) (pos_cnum 302))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) @@ -1894,22 +2009,22 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 315))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 312))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 316))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 313))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 315))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 312))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 316))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 313))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) @@ -1920,22 +2035,22 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 309))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 306))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 314))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 311))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 309))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 306))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 314))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 311))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) @@ -1946,66 +2061,66 @@ (pexp_loc ((loc_start ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 317))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 314))) (loc_end ((pos_fname output.ml) - (pos_lnum 5) (pos_bol 256) - (pos_cnum 318))) + (pos_lnum 5) (pos_bol 253) + (pos_cnum 315))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 309))) + (pos_bol 253) (pos_cnum 306))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 318))) + (pos_bol 253) (pos_cnum 315))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 295))) + (pos_bol 253) (pos_cnum 292))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 319))) + (pos_bol 253) (pos_cnum 316))) (loc_ghost false))) (pexp_loc_stack (((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 296))) + (pos_bol 253) (pos_cnum 293))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 318))) + (pos_bol 253) (pos_cnum 315))) (loc_ghost false)))) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 286))) + (pos_bol 253) (pos_cnum 283))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 319))) + (pos_bol 253) (pos_cnum 316))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 276))) + (pos_bol 253) (pos_cnum 273))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 320))) + (pos_bol 253) (pos_cnum 317))) (loc_ghost false))) (pexp_loc_stack (((loc_start ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 277))) + (pos_bol 253) (pos_cnum 274))) (loc_end ((pos_fname output.ml) (pos_lnum 5) - (pos_bol 256) (pos_cnum 319))) + (pos_bol 253) (pos_cnum 316))) (loc_ghost false)))) (pexp_attributes ()))) (Nolabel @@ -2015,62 +2130,62 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 358))) + (pos_bol 318) (pos_cnum 355))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 360))) + (pos_bol 318) (pos_cnum 357))) (loc_ghost false)))) ())) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 358))) + (pos_bol 318) (pos_cnum 355))) (loc_end ((pos_fname output.ml) (pos_lnum 6) - (pos_bol 321) (pos_cnum 360))) + (pos_bol 318) (pos_cnum 357))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 258))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 255))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 5) (pos_bol 256) - (pos_cnum 258))) + ((pos_fname output.ml) (pos_lnum 5) (pos_bol 253) + (pos_cnum 255))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 4) (pos_bol 187) - (pos_cnum 189))) + ((pos_fname output.ml) (pos_lnum 4) (pos_bol 184) + (pos_cnum 186))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 371))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 182))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 179))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 374))) - (loc_ghost true))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 181))) + (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 162))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 160))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 374))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 371))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes @@ -2078,11 +2193,11 @@ ((txt warning) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))))) (attr_payload (PStr @@ -2117,24 +2232,24 @@ (loc_ghost true))))))) (attr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))))))) (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost false))))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost false)))) ((pstr_desc (Pstr_value Nonrecursive @@ -2144,17 +2259,17 @@ ((txt make) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 157))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 155))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 161))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 159))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 157))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 155))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 161))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 159))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -2166,19 +2281,19 @@ ((txt Output) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -2191,19 +2306,19 @@ ((txt Props) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((ptyp_desc @@ -2211,11 +2326,11 @@ ((txt (Ldot (Lident Js) t)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -2225,10 +2340,10 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 153))) + (pos_bol 151) (pos_cnum 151))) (loc_end ((pos_fname output.ml) (pos_lnum 7) - (pos_bol 362) (pos_cnum 394))) + (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))) ((ptyp_desc (Ptyp_constr @@ -2236,65 +2351,65 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false)))) (((ptyp_desc (Ptyp_var initialValue)) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (pof_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 153))) + (pos_bol 151) (pos_cnum 151))) (loc_end ((pos_fname output.ml) (pos_lnum 7) - (pos_bol 362) (pos_cnum 394))) + (pos_bol 359) (pos_cnum 391))) (loc_ghost true))) (pof_attributes ()))) Closed)) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -2304,19 +2419,19 @@ ((txt (Lident make)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())) (((Optional initialValue) @@ -2328,18 +2443,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 164))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 162))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 176))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 174))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -2349,18 +2464,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -2370,27 +2485,27 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 164))) + (pos_bol 151) (pos_cnum 162))) (loc_end ((pos_fname output.ml) (pos_lnum 3) - (pos_bol 153) (pos_cnum 176))) + (pos_bol 151) (pos_cnum 174))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 164))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 162))) (loc_end - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 176))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 174))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -2399,11 +2514,11 @@ ((txt (Lident "()")) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))) ())) (pexp_loc @@ -2417,11 +2532,11 @@ (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc @@ -2434,51 +2549,51 @@ (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))))) ((pexp_desc (Pexp_ident ((txt (Lident Output)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) - (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) + (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) - (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) + (pos_cnum 391))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ()))) (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost false))))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 3) (pos_bol 153) (pos_cnum 153))) + ((pos_fname output.ml) (pos_lnum 3) (pos_bol 151) (pos_cnum 151))) (loc_end - ((pos_fname output.ml) (pos_lnum 7) (pos_bol 362) (pos_cnum 394))) + ((pos_fname output.ml) (pos_lnum 7) (pos_bol 359) (pos_cnum 391))) (loc_ghost true)))) ((pstr_desc (Pstr_module @@ -2486,9 +2601,9 @@ ((txt (Uppercase)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 8) (pos_bol 395) (pos_cnum 402))) + ((pos_fname output.ml) (pos_lnum 8) (pos_bol 392) (pos_cnum 399))) (loc_end - ((pos_fname output.ml) (pos_lnum 8) (pos_bol 395) (pos_cnum 411))) + ((pos_fname output.ml) (pos_lnum 8) (pos_bol 392) (pos_cnum 408))) (loc_ghost false))))) (pmb_expr ((pmod_desc @@ -2499,11 +2614,11 @@ ((txt makeProps) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))))) (pval_type ((ptyp_desc @@ -2511,11 +2626,11 @@ ((ptyp_desc (Ptyp_var children)) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -2526,19 +2641,19 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))) ())) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -2549,19 +2664,19 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))) ())) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())) ((ptyp_desc @@ -2570,10 +2685,10 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -2583,56 +2698,56 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))) ((ptyp_desc (Ptyp_var children)) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (pof_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (pof_attributes ()))) Closed)) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ptyp_loc @@ -2659,36 +2774,36 @@ ((txt mel.obj) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))))) (attr_payload (PStr ())) (attr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))))) (pval_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))) ((pstr_desc (Pstr_value Nonrecursive @@ -2698,19 +2813,19 @@ ((txt make) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 431))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 428))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 435))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 432))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 431))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 428))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 435))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 432))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -2721,19 +2836,19 @@ ((txt upperCaseChildren) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -2744,18 +2859,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 11) (pos_bol 467) - (pos_cnum 473))) + ((pos_fname output.ml) (pos_lnum 11) (pos_bol 463) + (pos_cnum 469))) (loc_end - ((pos_fname output.ml) (pos_lnum 11) (pos_bol 467) - (pos_cnum 534))) + ((pos_fname output.ml) (pos_lnum 11) (pos_bol 463) + (pos_cnum 530))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -2765,18 +2880,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -2788,18 +2903,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) (((Labelled children) @@ -2809,18 +2924,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 504))) + (pos_bol 463) (pos_cnum 500))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 521))) + (pos_bol 463) (pos_cnum 517))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 504))) + (pos_bol 463) (pos_cnum 500))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 521))) + (pos_bol 463) (pos_cnum 517))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -2830,46 +2945,46 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 523))) + (pos_bol 463) (pos_cnum 519))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 525))) + (pos_bol 463) (pos_cnum 521))) (loc_ghost false)))) ())) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 523))) + (pos_bol 463) (pos_cnum 519))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 525))) + (pos_bol 463) (pos_cnum 521))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 473))) + (pos_bol 463) (pos_cnum 469))) (loc_end ((pos_fname output.ml) (pos_lnum 11) - (pos_bol 467) (pos_cnum 534))) + (pos_bol 463) (pos_cnum 530))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 11) (pos_bol 467) - (pos_cnum 473))) + ((pos_fname output.ml) (pos_lnum 11) (pos_bol 463) + (pos_cnum 469))) (loc_end - ((pos_fname output.ml) (pos_lnum 11) (pos_bol 467) - (pos_cnum 534))) + ((pos_fname output.ml) (pos_lnum 11) (pos_bol 463) + (pos_cnum 530))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 436))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 433))) (loc_end - ((pos_fname output.ml) (pos_lnum 11) (pos_bol 467) - (pos_cnum 534))) + ((pos_fname output.ml) (pos_lnum 11) (pos_bol 463) + (pos_cnum 530))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes @@ -2877,11 +2992,11 @@ ((txt warning) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))))) (attr_payload (PStr @@ -2918,28 +3033,28 @@ (loc_ghost true))))))) (attr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))))))) (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost false))))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost false)))) ((pstr_desc (Pstr_value Nonrecursive @@ -2949,19 +3064,19 @@ ((txt make) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 431))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 428))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 435))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 432))) (loc_ghost false)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 431))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 428))) (loc_end - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 435))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 432))) (loc_ghost false))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -2974,18 +3089,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))))) (ppat_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ()))) (pvb_expr @@ -2999,18 +3114,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))))) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((ptyp_desc @@ -3019,10 +3134,10 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))) (((ptyp_desc (Ptyp_object @@ -3032,61 +3147,61 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end ((pos_fname output.ml) - (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))) ((ptyp_desc (Ptyp_var children)) (ptyp_loc ((loc_start ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (pof_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (pof_attributes ()))) Closed)) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ()))))) (ptyp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ptyp_loc_stack ()) (ptyp_attributes ())))) (ppat_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (ppat_loc_stack ()) (ppat_attributes ())) ((pexp_desc @@ -3097,18 +3212,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())) (((Labelled children) @@ -3120,18 +3235,18 @@ (loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())) ((Nolabel @@ -3141,20 +3256,20 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ()))) (Nolabel @@ -3164,38 +3279,38 @@ (loc ((loc_start ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 446))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 443))) (loc_end ((pos_fname output.ml) - (pos_lnum 10) (pos_bol 423) - (pos_cnum 463))) + (pos_lnum 10) (pos_bol 420) + (pos_cnum 460))) (loc_ghost false)))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 446))) + (pos_bol 420) (pos_cnum 443))) (loc_end ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 463))) + (pos_bol 420) (pos_cnum 460))) (loc_ghost false))) (pexp_loc_stack ()) (pexp_attributes ())))))) (pexp_loc ((loc_start ((pos_fname output.ml) (pos_lnum 10) - (pos_bol 423) (pos_cnum 427))) + (pos_bol 420) (pos_cnum 424))) (loc_end ((pos_fname output.ml) (pos_lnum 12) - (pos_bol 553) (pos_cnum 622))) + (pos_bol 549) (pos_cnum 618))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc @@ -3210,75 +3325,75 @@ (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))))) ((pexp_desc (Pexp_ident ((txt (Lident Output$Uppercase)) (loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true)))))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ())))) (pexp_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))) (pexp_loc_stack ()) (pexp_attributes ()))) (pvb_attributes ()) (pvb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost false))))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 10) (pos_bol 423) - (pos_cnum 427))) + ((pos_fname output.ml) (pos_lnum 10) (pos_bol 420) + (pos_cnum 424))) (loc_end - ((pos_fname output.ml) (pos_lnum 12) (pos_bol 553) - (pos_cnum 622))) + ((pos_fname output.ml) (pos_lnum 12) (pos_bol 549) + (pos_cnum 618))) (loc_ghost true))))))) (pmod_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 9) (pos_bol 414) (pos_cnum 416))) + ((pos_fname output.ml) (pos_lnum 9) (pos_bol 411) (pos_cnum 413))) (loc_end - ((pos_fname output.ml) (pos_lnum 13) (pos_bol 623) (pos_cnum 628))) + ((pos_fname output.ml) (pos_lnum 13) (pos_bol 619) (pos_cnum 624))) (loc_ghost false))) (pmod_attributes ()))) (pmb_attributes ()) (pmb_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 8) (pos_bol 395) (pos_cnum 395))) + ((pos_fname output.ml) (pos_lnum 8) (pos_bol 392) (pos_cnum 392))) (loc_end - ((pos_fname output.ml) (pos_lnum 13) (pos_bol 623) (pos_cnum 628))) + ((pos_fname output.ml) (pos_lnum 13) (pos_bol 619) (pos_cnum 624))) (loc_ghost false)))))) (pstr_loc ((loc_start - ((pos_fname output.ml) (pos_lnum 8) (pos_bol 395) (pos_cnum 395))) + ((pos_fname output.ml) (pos_lnum 8) (pos_bol 392) (pos_cnum 392))) (loc_end - ((pos_fname output.ml) (pos_lnum 13) (pos_bol 623) (pos_cnum 628))) + ((pos_fname output.ml) (pos_lnum 13) (pos_bol 619) (pos_cnum 624))) (loc_ghost false))))) diff --git a/ppx/test/react.t b/ppx/test/react.t index 53833efd7..eb7c3f080 100644 --- a/ppx/test/react.t +++ b/ppx/test/react.t @@ -35,8 +35,8 @@ Demonstrate how to use the React JSX PPX // Generated by Melange 'use strict'; - var Belt__Belt_List = require("melange.belt/belt_List.js"); - var JsxRuntime = require("react/jsx-runtime"); + const Belt__Belt_List = require("melange.belt/belt_List.js"); + const JsxRuntime = require("react/jsx-runtime"); function X$App(Props) { return Belt__Belt_List.toArray(Belt__Belt_List.map({ @@ -52,7 +52,7 @@ Demonstrate how to use the React JSX PPX }))); } - var App = { + const App = { make: X$App }; diff --git a/reason-react-ppx.opam b/reason-react-ppx.opam index c958e855d..ca0563a7f 100644 --- a/reason-react-ppx.opam +++ b/reason-react-ppx.opam @@ -18,7 +18,7 @@ depends: [ "ocaml" "reason" {>= "3.10.0"} "ppxlib" {>= "0.28.0"} - "merlin" {= "4.13.1-501" & with-test} + "merlin" {with-test} "ocamlformat" {= "0.24.0" & with-dev-setup} "odoc" {with-doc} ] diff --git a/reason-react.opam b/reason-react.opam index 97f9d41ad..3894550a4 100644 --- a/reason-react.opam +++ b/reason-react.opam @@ -22,7 +22,7 @@ depends: [ "melange" {>= "3.0.0"} "reason-react-ppx" {= version} "reason" {>= "3.10.0"} - "ocaml-lsp-server" {with-test} + "ocaml-lsp-server" {with-dev-setup} "opam-check-npm-deps" {= "1.0.0" & with-dev-setup} "ocamlformat" {= "0.24.0" & with-dev-setup} "odoc" {with-doc} diff --git a/test/blackbox-tests/useCallback.t b/test/blackbox-tests/useCallback.t index 6580e25a0..58749b525 100644 --- a/test/blackbox-tests/useCallback.t +++ b/test/blackbox-tests/useCallback.t @@ -21,9 +21,9 @@ // Generated by Melange 'use strict'; - var React = require("react"); + const React = require("react"); - var cb = React.useCallback((function (a, b) { + const cb = React.useCallback((function (a, b) { return a + b | 0; }), []); @@ -42,9 +42,9 @@ Using an Uncurried function: // Generated by Melange 'use strict'; - var React = require("react"); + const React = require("react"); - var cb = React.useCallback((function (a, b) { + const cb = React.useCallback((function (a, b) { return a + b | 0; }), []);