simplify rule_map_dispatcher#add - make its arguments non-optional

src/generators/gencommon.ml

@@ -273,9 +273,8 @@ class ['tp, 'ret] rule_dispatcher name ignore_not_found =
 	val tbl = Hashtbl.create 16
 	val mutable keys = []
 	val names = Hashtbl.create 16
-	val mutable temp = 0
 
-	method add ?(name : string option) (* name helps debugging *) ?(priority : priority = PZero) (rule : 'tp->'ret option) =
+	method add (name : string) (* name helps debugging *) (priority : priority) (rule : 'tp->'ret option) =
 		let p = match priority with
 			| PFirst -> infinity
 			| PLast -> neg_infinity
@@ -290,10 +289,6 @@ class ['tp, 'ret] rule_dispatcher name ignore_not_found =
 			keys <- List.sort (fun x y -> - (compare x y)) keys;
 			q
 		end else Hashtbl.find tbl p in
-		let name = match name with
-			| None -> temp <- temp + 1; "$_" ^ (string_of_int temp)
-			| Some s -> s
-		in
 		(if Hashtbl.mem names name then raise (DuplicateName(name)));
 		Hashtbl.add names name q;
 
@@ -681,7 +676,7 @@ let init_ctx gen =
 			follow_f (apply_params t.t_params tl t.t_type)
 		| _ -> Some t
 	in
-	gen.gfollow#add ~name:"final" ~priority:PLast follow
+	gen.gfollow#add "final" PLast follow
 
 let run_follow gen = gen.gfollow#run_f
 

src/generators/gencommon/abstractImplementationFix.ml

@@ -50,4 +50,4 @@ let configure gen =
 		| _ -> ());
 		Some md
 	in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
+	gen.gmodule_filters#add name (PCustom priority) run

src/generators/gencommon/arrayDeclSynf.ml

@@ -46,4 +46,4 @@ let configure gen native_array_cl =
 		| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/castDetect.ml

@@ -119,7 +119,7 @@ struct
 
 	let configure gen =
 		let map e = Some(default_implementation gen e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) map
 end;;
 
 (*
@@ -1175,5 +1175,5 @@ let configure gen ?(overloads_cast_to_base = false) maybe_empty_t calls_paramete
 		| _ ->
 			Some(run e)
 	in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map;
+	gen.gsyntax_filters#add name (PCustom priority) map;
 	ReturnCast.configure gen

src/generators/gencommon/classInstance.ml

@@ -62,4 +62,4 @@ let configure gen (change_expr:texpr->module_type->texpr) =
 		| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:"class_instance" ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add "class_instance" (PCustom priority) map

src/generators/gencommon/closuresToClass.ml

@@ -588,7 +588,7 @@ let configure gen ft =
 		(* (dynamic_func_call:texpr->texpr->texpr list->texpr) *)
 	in
 	let map e = Some(run e) in
-	gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gexpr_filters#add name (PCustom priority) map
 
 
 (*

src/generators/gencommon/defaultArguments.ml

@@ -166,4 +166,4 @@ let configure gen =
 		| _ -> ());
 		Some(md);
 	in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
+	gen.gmodule_filters#add name (PCustom priority) run

src/generators/gencommon/dynamicFieldAccess.ml

@@ -117,4 +117,4 @@ let configure gen (is_dynamic:texpr->texpr->Type.tfield_access->bool) (change_ex
 		| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gexpr_filters#add ~name:"dynamic_field_access" ~priority:(PCustom(priority)) map
+	gen.gexpr_filters#add "dynamic_field_access" (PCustom(priority)) map

src/generators/gencommon/dynamicOperators.ml

@@ -177,4 +177,4 @@ let configure gen ?(handle_strings = true) (should_change:texpr->bool) (equals_h
 		| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gexpr_filters#add ~name:"dyn_ops" ~priority:(PCustom priority) map
+	gen.gexpr_filters#add "dyn_ops" (PCustom priority) map

src/generators/gencommon/enumToClass.ml

@@ -237,7 +237,7 @@ struct
 				md
 		in
 		let map md = Some(run md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gmodule_filters#add name (PCustom priority) map
 end;;
 
 (* ******************************************* *)
@@ -287,7 +287,7 @@ struct
 				Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gexpr_filters#add name (PCustom priority) map
 
 end;;
 

src/generators/gencommon/enumToClass2.ml

@@ -327,7 +327,7 @@ struct
 				md
 		in
 		let map md = Some(run md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gmodule_filters#add name (PCustom priority) map
 end;;
 
 
@@ -375,7 +375,7 @@ struct
 				Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gexpr_filters#add name (PCustom priority) map
 
 end;;
 

src/generators/gencommon/expressionUnwrap.ml

@@ -683,4 +683,4 @@ let configure gen (on_expr_as_statement:texpr->texpr option) =
 			| _ -> e (* if expression doesn't have a block, we will exit *)
 	in
 	let map e = Some(traverse e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/filterClosures.ml

@@ -84,4 +84,4 @@ let configure gen (should_change:texpr->string->bool) (filter:texpr->texpr->stri
 				| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gexpr_filters#add name (PCustom priority) map

src/generators/gencommon/fixOverrides.ml

@@ -250,4 +250,4 @@ let configure ?explicit_fn_name ~get_vmtype gen =
 	gen.gafter_mod_filters_ended <- delay :: gen.gafter_mod_filters_ended;
 	let run = run ~explicit_fn_name ~get_vmtype gen in
 	let map md = Some(run md) in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gmodule_filters#add name (PCustom priority) map

src/generators/gencommon/hardNullableSynf.ml

@@ -73,7 +73,7 @@ let follow_addon gen t =
 		| _ -> None
 
 let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
-	gen.gfollow#add ~name:(name ^ "_follow") (follow_addon gen);
+	gen.gfollow#add (name ^ "_follow") PZero (follow_addon gen);
 
 	let is_null_t = is_null_t gen in
 	let is_string t = match gen.greal_type t with
@@ -278,4 +278,4 @@ let configure gen unwrap_null wrap_val null_to_dynamic has_value opeq_handler =
 			| e -> e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/initFunction.ml

@@ -231,4 +231,4 @@ let configure gen =
 		| TClassDecl cl -> (if not cl.cl_extern then handle_class cl); None
 		| _ -> None in
 
-	gen.gmodule_filters#add ~name:"init_funcs" ~priority:(PCustom priority) mod_filter
+	gen.gmodule_filters#add "init_funcs" (PCustom priority) mod_filter

src/generators/gencommon/intDivisionSynf.ml

@@ -70,4 +70,4 @@ let configure gen =
 	in
 
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/interfaceMetas.ml

@@ -49,4 +49,4 @@ let configure gen =
 		| _ -> ()
 	in
 	let map md = run md; Some(md) in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gmodule_filters#add name (PCustom priority) map

src/generators/gencommon/interfaceProps.ml

@@ -55,4 +55,4 @@ let configure gen =
 			()
 	in
 	let map md = Some(run md; md) in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gmodule_filters#add name (PCustom priority) map

src/generators/gencommon/interfaceVarsDeleteModf.ml

@@ -81,4 +81,4 @@ let configure gen =
 		| _ -> ()
 	in
 	let map md = Some(run md; md) in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gmodule_filters#add name (PCustom priority) map

src/generators/gencommon/normalize.ml

@@ -77,7 +77,7 @@ let configure gen ~metas =
 			map_expr_type (fun e -> run e) filter_param (fun v -> v.v_type <- filter_param v.v_type; v) e
 	in
 	let map e = Some (run e) in
-	gen.gexpr_filters#add ~name:name ~priority:(PCustom priority) map;
+	gen.gexpr_filters#add name (PCustom priority) map;
 
 	let run md =
 		match md with
@@ -93,4 +93,4 @@ let configure gen ~metas =
 			()
 	in
 	let map md = Some (run md; md) in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gmodule_filters#add name (PCustom priority) map

src/generators/gencommon/objectDeclMap.ml

@@ -35,4 +35,4 @@ let configure gen map_fn =
 			Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/overloadingConstructor.ml

@@ -421,4 +421,4 @@ let configure ~(empty_ctor_type : t) ~(empty_ctor_expr : texpr) gen =
 			());
 		None
 	in
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) module_filter
+	gen.gmodule_filters#add name (PCustom priority) module_filter

src/generators/gencommon/reflectionCFs.ml

@@ -1660,7 +1660,7 @@ struct
 					()
 		in
 		let map md = Some(run md; md) in
-		gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gmodule_filters#add name (PCustom priority) map
 end;;
 
 
@@ -1682,4 +1682,4 @@ let configure ?slow_invoke ctx baseinterface =
 		| _ -> None)
 	in
 
-	gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) run
+	gen.gmodule_filters#add name (PCustom priority) run

src/generators/gencommon/switchBreakSynf.ml

@@ -112,4 +112,4 @@ let configure gen (change_loop:texpr->int->add_to_block_api->texpr) (change_brea
 		| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/switchToIf.ml

@@ -126,4 +126,4 @@ let configure gen (should_convert:texpr->bool) =
 			| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/tArrayTransform.ml

@@ -102,4 +102,4 @@ let configure gen (should_change:texpr->Ast.binop option->bool) (get_fun:string)
 			| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gexpr_filters#add ~name:"dyn_tarray" ~priority:(PCustom priority) map
+	gen.gexpr_filters#add "dyn_tarray" (PCustom priority) map

src/generators/gencommon/tryCatchWrapper.ml

@@ -116,4 +116,4 @@ let configure gen (should_wrap:t->bool) (wrap_throw:texpr->texpr->texpr) (unwrap
 				| _ -> Type.map_expr run e
 	in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:"try_catch" ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add "try_catch" (PCustom priority) map

src/generators/gencommon/typeParams.ml

@@ -786,7 +786,7 @@ struct
 
 		let configure gen mapping_func =
 			let map e = Some(mapping_func e) in
-			gen.gmodule_filters#add ~name:name ~priority:(PCustom priority) map
+			gen.gmodule_filters#add name (PCustom priority) map
 
 	end;;
 
@@ -830,7 +830,7 @@ struct
 		gen.ghas_tparam_cast_handler <- true;
 		let traverse = default_implementation gen dyn_tparam_cast ifaces in
 		let map e = Some(traverse e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map;
+		gen.gsyntax_filters#add name (PCustom priority) map;
 		RealTypeParamsModf.configure gen (RealTypeParamsModf.default_implementation gen ifaces base_generic)
 
 end;;

src/generators/gencommon/unnecessaryCastsRemoval.ml

@@ -59,4 +59,4 @@ let configure gen =
 		| _ -> e (* if expression doesn't have a block, we will exit *)
 	in
 	let map e = Some(traverse e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencommon/unreachableCodeEliminationSynf.ml

@@ -213,4 +213,4 @@ let traverse gen java_mode =
 let configure gen java_mode =
 	let run = traverse gen java_mode in
 	let map e = Some(run e) in
-	gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+	gen.gsyntax_filters#add name (PCustom priority) map

src/generators/gencs.ml

@@ -306,7 +306,7 @@ struct
 				| _ -> Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) map
 end;;
 
 (* ******************************************* *)
@@ -491,7 +491,7 @@ struct
 				| _ -> Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) map
 end;;
 
 let add_cast_handler gen =
@@ -744,7 +744,7 @@ let configure gen =
 		| _ -> true
 	in
 
-	gen.gfollow#add ~name:"follow_basic" (fun t -> match t with
+	gen.gfollow#add "follow_basic" PZero (fun t -> match t with
 			| TAbstract ({ a_path = ([], "Bool") },[])
 			| TAbstract ({ a_path = ([], "Void") },[])
 			| TAbstract ({ a_path = ([],"Float") },[])

src/generators/genjava.ml

@@ -264,7 +264,7 @@ struct
 				| _ -> Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) map
 
 end;;
 
@@ -677,7 +677,7 @@ struct
 				| _ -> Type.map_expr run e
 		in
 		let map e = Some(run e) in
-		gen.gsyntax_filters#add ~name:name ~priority:(PCustom priority) map
+		gen.gsyntax_filters#add name (PCustom priority) map
 
 end;;
 
@@ -884,7 +884,7 @@ let configure gen =
 
 	let write_field w name = write w (change_field name) in
 
-	gen.gfollow#add ~name:"follow_basic" (fun t -> match t with
+	gen.gfollow#add "follow_basic" PZero (fun t -> match t with
 			| TAbstract ({ a_path = ([], "Bool") },[])
 			| TAbstract ({ a_path = ([], "Void") },[])
 			| TAbstract ({ a_path = ([],"Float") },[])