use new types to have stricter type checking (prior to adding maybe_context)

1 files changed, 92 insertions, 71 deletions

diff --git a/perl_checker.src/parser_helper.mli b/perl_checker.src/parser_helper.mli
index 82bd947..7d8f7a3 100644
--- a/perl_checker.src/parser_helper.mli
+++ b/perl_checker.src/parser_helper.mli
@@ -1,19 +1,36 @@
 val bpos : int * int
 val raw_pos2pos : 'a * 'b -> string * 'a * 'b
+val raw_pos_range :
+  'a Types.any_spaces_pos -> 'b Types.any_spaces_pos -> int * int
 val pos_range :
-  'a * ('b * (int * int)) -> 'c * ('d * (int * int)) -> string * int * int
-val sp_pos_range :
-  'a * ('b * (int * int)) -> 'c * ('d * (int * int)) -> 'b * (int * int)
-val get_pos : 'a * ('b * ('c * 'd)) -> string * 'c * 'd
+  'a Types.any_spaces_pos -> 'b Types.any_spaces_pos -> string * int * int
+val get_pos : 'a Types.any_spaces_pos -> string * int * int
+val get_pos_start : 'a Types.any_spaces_pos -> int
+val get_pos_end : 'a Types.any_spaces_pos -> int
 val var_dollar_ : Types.pos -> Types.fromparser
 val var_STDOUT : Types.fromparser
+val new_any : 'a -> Types.spaces -> int * int -> 'a Types.any_spaces_pos
+val new_esp :
+  'a ->
+  'b Types.any_spaces_pos ->
+  'c Types.any_spaces_pos -> 'a Types.any_spaces_pos
+val new_pesp :
+  Types.priority ->
+  'a ->
+  'b Types.any_spaces_pos ->
+  'c Types.any_spaces_pos -> 'a Types.prio_anyexpr Types.any_spaces_pos
+val default_esp : 'a -> 'a Types.any_spaces_pos
+val default_pesp :
+  Types.priority -> 'a -> 'a Types.prio_anyexpr Types.any_spaces_pos
 val split_name_or_fq_name : string -> string option * string
 val is_var_dollar_ : Types.fromparser -> bool
 val is_var_number_match : Types.fromparser -> bool
 val non_scalar_context : Types.context -> bool
 val is_scalar_context : Types.context -> bool
 val is_not_a_scalar : Types.fromparser -> bool
+val is_not_a_scalar_or_array : Types.fromparser -> bool
 val is_a_scalar : Types.fromparser -> bool
+val is_a_string : Types.fromparser -> bool
 val is_parenthesized : Types.fromparser -> bool
 val un_parenthesize : Types.fromparser -> Types.fromparser
 val un_parenthesize_full : Types.fromparser -> Types.fromparser
@@ -25,8 +42,8 @@ val string_of_Ident : Types.fromparser -> string
 val context2s : Types.context -> string
 val variable2s : Types.context * string -> string
 val is_same_fromparser : Types.fromparser -> Types.fromparser -> bool
-val from_scalar : Types.fromparser * 'a -> Types.fromparser
-val from_array : Types.fromparser * 'a -> Types.fromparser
+val from_scalar : Types.fromparser Types.any_spaces_pos -> Types.fromparser
+val from_array : Types.fromparser Types.any_spaces_pos -> Types.fromparser
 val msg_with_rawpos : int * int -> string -> string
 val die_with_rawpos : int * int -> string -> 'a
 val warn : int * int -> string -> unit
@@ -41,74 +58,75 @@ val warn_space : int -> unit
 val prio_less : Types.priority * Types.priority -> bool
 val prio_lo :
   Types.priority ->
-  (Types.priority * Types.fromparser) * ('a * (int * int)) ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
   Types.fromparser
 val prio_lo_after :
   Types.priority ->
-  (Types.priority * Types.fromparser) * ('a * (int * int)) ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
   Types.fromparser
 val prio_lo_concat :
-  (Types.priority * Types.fromparser) * ('a * (int * int)) ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
   Types.fromparser
-val sp_0 : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_0_or_cr : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_1 : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_n : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_p : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_cr : 'a * (Types.spaces * (int * 'b)) -> unit
-val sp_same :
-  'a * (Types.spaces * (int * 'b)) ->
-  'c * (Types.spaces * (int * 'd)) -> unit
-val check_word_alone : Types.fromparser * 'a -> Types.fromparser
+val sp_0 : 'a Types.any_spaces_pos -> unit
+val sp_0_or_cr : 'a Types.any_spaces_pos -> unit
+val sp_1 : 'a Types.any_spaces_pos -> unit
+val sp_n : 'a Types.any_spaces_pos -> unit
+val sp_p : 'a Types.any_spaces_pos -> unit
+val sp_cr : 'a Types.any_spaces_pos -> unit
+val sp_same : 'a Types.any_spaces_pos -> 'b Types.any_spaces_pos -> unit
+val check_word_alone : Types.fromparser -> Types.fromparser
 val check_parenthesized_first_argexpr :
   string ->
-  ('a * Types.fromparser list) * (Types.spaces * (int * 'b)) -> unit
+  Types.fromparser list Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_parenthesized_first_argexpr_with_Ident :
   Types.fromparser ->
-  (Types.priority * Types.fromparser list) * (Types.spaces * (int * 'a)) ->
-  unit
+  Types.fromparser list Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_hash_subscript :
-  ('a * Types.fromparser) * ('b * (int * int)) -> unit
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_arrow_needed :
-  ('a * Types.fromparser) * 'b -> 'c * ('d * (int * int)) -> unit
-val check_scalar_subscripted : Types.fromparser * 'a -> unit
-val check_negatable_expr : ('a * Types.fromparser) * 'b -> unit
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
+  'a Types.any_spaces_pos -> unit
+val check_scalar_subscripted : Types.fromparser Types.any_spaces_pos -> unit
+val check_negatable_expr :
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_ternary_paras :
   Types.fromparser * Types.fromparser * Types.fromparser ->
   Types.fromparser list
 val check_unneeded_var_dollar_ :
-  ('a * Types.fromparser) * ('b * (int * int)) -> unit
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_unneeded_var_dollar_not :
-  ('a * Types.fromparser) * ('b * (int * int)) -> unit
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_unneeded_var_dollar_s :
-  ('a * Types.fromparser) * ('b * (int * int)) -> unit
-val check_MULT_is_x : string * 'a -> unit
-val check_my : string * 'a -> unit
-val check_foreach : string * ('a * (int * int)) -> unit
-val check_for : string * ('a * (int * int)) -> unit
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
+val check_MULT_is_x : string Types.any_spaces_pos -> unit
+val check_my : string Types.any_spaces_pos -> unit
+val check_foreach : string Types.any_spaces_pos -> unit
+val check_for : string Types.any_spaces_pos -> unit
 val check_for_foreach :
-  string * ('a * (int * int)) -> ('b * Types.fromparser) * 'c -> unit
+  string Types.any_spaces_pos ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos -> unit
 val check_block_sub :
-  Types.fromparser list * (Types.spaces * (int * int)) ->
-  'a * (Types.spaces * (int * 'b)) -> unit
+  Types.fromparser list Types.any_spaces_pos ->
+  'a Types.any_spaces_pos -> unit
 val check_block_ref :
-  Types.fromparser list * (Types.spaces * (int * int)) ->
-  'a * (Types.spaces * (int * 'b)) -> unit
-val check_my_our_paren : ((bool * 'a) * 'b) * 'c -> unit
+  Types.fromparser list Types.any_spaces_pos ->
+  'a Types.any_spaces_pos -> unit
+val check_my_our_paren : ((bool * 'a) * 'b) Types.any_spaces_pos -> unit
 val check_simple_pattern : Types.fromparser list -> unit
-val only_one : Types.fromparser list * ('a * (int * int)) -> Types.fromparser
+val only_one : Types.fromparser list Types.any_spaces_pos -> Types.fromparser
 val only_one_array_ref :
-  Types.fromparser list * ('a * (int * int)) -> Types.fromparser
+  Types.fromparser list Types.any_spaces_pos -> Types.fromparser
 val only_one_in_List :
-  ('a * Types.fromparser) * ('b * (int * int)) -> Types.fromparser
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
+  Types.fromparser
 val is_only_one_in_List : Types.fromparser list -> bool
 val maybe_to_Raw_string : Types.fromparser -> Types.fromparser
 val to_List : Types.fromparser list -> Types.fromparser
 val deref_arraylen : Types.fromparser -> Types.fromparser
 val deref_raw : Types.context -> Types.fromparser -> Types.fromparser
 val to_Ident :
-  (string option * string) * ('a * (int * int)) -> Types.fromparser
-val to_Raw_string : string * ('a * (int * int)) -> Types.fromparser
+  (string option * string) Types.any_spaces_pos -> Types.fromparser
+val to_Raw_string : string Types.any_spaces_pos -> Types.fromparser
 val to_Method_call :
   Types.fromparser * Types.fromparser * Types.fromparser list ->
   Types.fromparser
@@ -116,51 +134,54 @@ val to_Deref_with :
   Types.context * Types.context * Types.fromparser * Types.fromparser ->
   Types.fromparser
 val to_Local :
-  ('a * Types.fromparser) * ('b * (int * int)) -> Types.fromparser
-val op : 'a -> 'b -> 'c * 'd -> 'a * ((unit * 'd) * 'b)
-val op_p :
-  'a ->
-  'b ->
-  'c * (Types.spaces * (int * 'd)) ->
-  'a * ((unit * (Types.spaces * (int * 'd))) * 'b)
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos ->
+  Types.fromparser
 val sub_declaration :
   Types.fromparser * string -> Types.fromparser list -> Types.fromparser
 val anonymous_sub :
-  Types.fromparser list * ('a * (int * int)) -> Types.fromparser
+  Types.fromparser list Types.any_spaces_pos -> Types.fromparser
 val cook_call_op :
-  string * Types.fromparser list * (int * int) -> Types.fromparser
-val call_op_ :
-  ('a * (('b * (Types.spaces * (int * 'c))) * string)) *
-  ('d * (Types.spaces * (int * 'e))) * Types.fromparser list ->
-  'f * (int * int) -> ('a * Types.fromparser) * ('f * (int * int))
+  string -> Types.fromparser list -> int * int -> Types.fromparser
 val to_Call_op :
-  string * Types.fromparser list ->
-  'a * (int * int) -> Types.fromparser * ('a * (int * int))
+  string ->
+  Types.fromparser list ->
+  'a Types.any_spaces_pos ->
+  'b Types.any_spaces_pos -> Types.fromparser Types.any_spaces_pos
 val to_Call_op_ :
-  'a * string * Types.fromparser list ->
-  'b * (int * int) -> ('a * Types.fromparser) * ('b * (int * int))
+  Types.priority ->
+  string ->
+  Types.fromparser list ->
+  'a Types.any_spaces_pos ->
+  'b Types.any_spaces_pos ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos
 val followed_by_comma :
-  ('a * Types.fromparser list) * 'b -> bool * 'c -> Types.fromparser list
+  Types.fromparser list Types.prio_anyexpr Types.any_spaces_pos ->
+  bool Types.any_spaces_pos -> Types.fromparser list
 val pot_strings : (string, string list) Hashtbl.t
 val pot_strings_and_file : (string, string) Hashtbl.t
 val po_comments : string list ref
-val po_comment : string * 'a -> unit
+val po_comment : string Types.any_spaces_pos -> unit
 val check_format_a_la_printf : string -> int -> unit
 val generate_pot : string -> unit
 val call_func :
   bool -> Types.fromparser * Types.fromparser list -> Types.fromparser
 val call : Types.fromparser * Types.fromparser list -> Types.fromparser
 val call_one_scalar_para :
-  string * ('a * (int * int)) ->
-  Types.fromparser list -> Types.priority * Types.fromparser
+  string Types.any_spaces_pos ->
+  Types.fromparser list ->
+  'a Types.any_spaces_pos ->
+  'b Types.any_spaces_pos ->
+  Types.fromparser Types.prio_anyexpr Types.any_spaces_pos
 val call_op_if_infix :
   Types.fromparser ->
   Types.fromparser ->
-  'a * (int * int) -> Types.fromparser * ('a * (int * int))
+  'a Types.any_spaces_pos ->
+  'b Types.any_spaces_pos -> Types.fromparser Types.any_spaces_pos
 val call_op_unless_infix :
   Types.fromparser ->
   Types.fromparser ->
-  'a * (int * int) -> Types.fromparser * ('a * (int * int))
+  'a Types.any_spaces_pos ->
+  'b Types.any_spaces_pos -> Types.fromparser Types.any_spaces_pos
 val current_lexbuf : Lexing.lexbuf option ref
 val list2tokens : ((int * int) * 'a) list -> Lexing.lexbuf -> 'a
 val parse_tokens :
@@ -172,14 +193,14 @@ val parse_interpolated :
 val to_String :
   ((Lexing.lexbuf -> 'a) -> Lexing.lexbuf -> Types.fromparser list) ->
   bool ->
-  (string * ((int * int) * 'a) list) list * ('b * (int * int)) ->
+  (string * ((int * int) * 'a) list) list Types.any_spaces_pos ->
   Types.fromparser
 val from_PATTERN :
   ((Lexing.lexbuf -> 'a) -> Lexing.lexbuf -> Types.fromparser list) ->
-  ((string * ((int * int) * 'a) list) list * string) * ('b * (int * int)) ->
+  ((string * ((int * int) * 'a) list) list * string) Types.any_spaces_pos ->
   Types.fromparser list
 val from_PATTERN_SUBST :
   ((Lexing.lexbuf -> 'a) -> Lexing.lexbuf -> Types.fromparser list) ->
   ((string * ((int * int) * 'a) list) list *
-   (string * ((int * int) * 'a) list) list * string) *
-  ('b * (int * int)) -> Types.fromparser list
+   (string * ((int * int) * 'a) list) list * string)
+  Types.any_spaces_pos -> Types.fromparser list