From a7b5f59516d50aa1ad20c63e16e1d61ed5ce67be Mon Sep 17 00:00:00 2001 From: James Wu Date: Fri, 22 Apr 2022 15:43:53 -0700 Subject: [PATCH] Add SetModule and fd_module defs Summary: This diff adds SetModule as a new AST def in the AAST. It does not implement parsing for it in the FFP, so nothing in the CST lowers to it just yet. But it allows us to represent setting module membership at the start of a file. After this diff, we will add code in namespace_elaborate.rs to move namespaces to toplevel entities just like file attributes. This diff just adds the aast node and makes it compile. Reviewed By: oulgen Differential Revision: D35372038 fbshipit-source-id: 35d49da003c1b30eec90355231d0c2889586969b --- hphp/hack/src/annotated_ast/aast.ml | 4 + hphp/hack/src/decl/decl.ml | 1 + hphp/hack/src/decl/decl_nast.ml | 2 + hphp/hack/src/hackc/compile/closure_convert.rs | 6 ++ hphp/hack/src/hackc/compile/rewrite_program.rs | 1 + hphp/hack/src/hh_single_decl.ml | 1 + hphp/hack/src/naming/naming.ml | 8 +- hphp/hack/src/naming/nast.ml | 4 +- .../src/oxidized/aast_visitor/node_impl_gen.rs | 12 ++- .../src/oxidized/aast_visitor/node_mut_impl_gen.rs | 12 ++- hphp/hack/src/oxidized/gen/aast.rs | 6 +- hphp/hack/src/oxidized/impl_gen/aast_impl_gen.rs | 29 ++++++- hphp/hack/src/oxidized/manual/aast_impl.rs | 1 + hphp/hack/src/oxidized_by_ref/gen/aast.rs | 10 ++- hphp/hack/src/parser/lowerer/lowerer.rs | 6 ++ hphp/hack/src/rupro/hackrs/naming/naming.rs | 1 + .../src/rupro/hackrs/typing/ast/typing_class.rs | 1 + .../src/rupro/hackrs/typing/ast/typing_fun_def.rs | 1 + hphp/hack/src/rupro/hackrs/typing_check_utils.rs | 1 + hphp/hack/src/typing/nast_check_env.ml | 1 + hphp/hack/src/typing/tast_env.ml | 1 + hphp/hack/src/typing/typing_toplevel.ml | 3 + hphp/hack/src/typing/typing_type_wellformedness.ml | 4 + hphp/hack/src/typing/typing_typedef.ml | 2 + hphp/hack/src/typing/typing_variance.ml | 2 + hphp/hack/test/holes/append_keyset.php.holes.exp | 4 +- hphp/hack/test/holes/append_set.php.holes.exp | 2 +- .../holes/append_string_datetime.php.holes.exp | 2 +- .../holes/array_access_read_object.php.holes.exp | 2 +- .../holes/array_access_read_prim.php.holes.exp | 2 +- .../array_access_write_intersection.php.holes.exp | 4 +- .../holes/array_access_write_object.php.holes.exp | 2 +- .../holes/array_access_write_prim.php.holes.exp | 2 +- .../holes/array_access_write_union.php.holes.exp | 4 +- .../test/holes/array_append_object.php.holes.exp | 2 +- .../test/holes/array_append_prim.php.holes.exp | 2 +- .../test/holes/array_append_union.php.holes.exp | 4 +- .../array_const_mutation_immvector.php.holes.exp | 2 +- ...ray_const_mutation_keyedcontainer.php.holes.exp | 2 +- .../test/holes/array_get_index_dict.php.holes.exp | 2 +- .../holes/array_get_index_immvector.php.holes.exp | 2 +- .../array_get_index_keyed_container.php.holes.exp | 2 +- .../holes/array_get_index_keyset.php.holes.exp | 2 +- .../test/holes/array_get_index_map.php.holes.exp | 4 +- .../test/holes/array_get_index_mixed.php.holes.exp | 2 +- .../holes/array_get_index_nullable.php.holes.exp | 2 +- .../test/holes/array_get_index_pair.php.holes.exp | 2 +- .../holes/array_get_index_string.php.holes.exp | 2 +- .../test/holes/array_get_index_tuple.php.holes.exp | 2 +- .../holes/array_get_index_varray.php.holes.exp | 2 +- .../test/holes/array_get_index_vec.php.holes.exp | 2 +- .../holes/array_get_index_vector.php.holes.exp | 2 +- .../assign_array_append_intersection.php.holes.exp | 2 +- .../holes/assign_array_append_set.php.holes.exp | 2 +- .../holes/assign_array_append_union.php.holes.exp | 2 +- .../holes/assign_array_append_vector.php.holes.exp | 2 +- .../assign_array_get_index_dict.php.holes.exp | 2 +- .../holes/assign_array_get_index_map.php.holes.exp | 2 +- .../assign_array_get_index_string.php.holes.exp | 2 +- .../assign_array_get_index_tuple.php.holes.exp | 2 +- .../assign_array_get_index_varray.php.holes.exp | 2 +- .../holes/assign_array_get_index_vec.php.holes.exp | 2 +- .../assign_array_get_index_vector.php.holes.exp | 2 +- .../test/holes/assign_array_get_map.php.holes.exp | 2 +- .../holes/assign_array_get_string.php.holes.exp | 2 +- .../holes/assign_array_get_union.php.holes.exp | 2 +- .../holes/assign_array_get_vector.php.holes.exp | 2 +- .../hack/test/holes/assign_class_get.php.holes.exp | 2 +- hphp/hack/test/holes/assign_list.php.holes.exp | 8 +- hphp/hack/test/holes/assign_obj_get.php.holes.exp | 4 +- hphp/hack/test/holes/call_collection.php.holes.exp | 8 +- hphp/hack/test/holes/call_dead_code.php.holes.exp | 6 +- hphp/hack/test/holes/call_dict.php.holes.exp | 8 +- hphp/hack/test/holes/call_generic.php.holes.exp | 6 +- hphp/hack/test/holes/call_imm_set.php.holes.exp | 8 +- hphp/hack/test/holes/call_imm_vector.php.holes.exp | 8 +- hphp/hack/test/holes/call_inout.php.holes.exp | 4 +- hphp/hack/test/holes/call_iterable.php.holes.exp | 8 +- .../holes/call_keyed_traversable.php.holes.exp | 8 +- hphp/hack/test/holes/call_keyset.php.holes.exp | 8 +- hphp/hack/test/holes/call_pair.php.holes.exp | 8 +- hphp/hack/test/holes/call_prim.php.holes.exp | 6 +- hphp/hack/test/holes/call_refinement.php.holes.exp | 8 +- hphp/hack/test/holes/call_set.php.holes.exp | 8 +- .../hack/test/holes/call_traversable.php.holes.exp | 8 +- hphp/hack/test/holes/call_tuple.php.holes.exp | 8 +- hphp/hack/test/holes/call_unpack.php.holes.exp | 12 +-- hphp/hack/test/holes/call_variadic.php.holes.exp | 4 +- hphp/hack/test/holes/call_varray.php.holes.exp | 8 +- .../test/holes/call_varray_or_darray.php.holes.exp | 8 +- hphp/hack/test/holes/call_vec.php.holes.exp | 8 +- hphp/hack/test/holes/call_vector.php.holes.exp | 8 +- .../compound_assign_bitwise_and.php.holes.exp | 2 +- .../test/holes/compound_assign_div.php.holes.exp | 2 +- .../test/holes/compound_assign_plus.php.holes.exp | 2 +- .../holes/compound_assign_rshift.php.holes.exp | 2 +- .../test/holes/const_mutation_map.php.holes.exp | 4 +- .../holes/const_mutation_nothing.php.holes.exp | 6 +- .../test/holes/const_mutation_vector.php.holes.exp | 4 +- .../test/holes/echo_non_arraykey.php.holes.exp | 2 +- hphp/hack/test/holes/expected_class.php.holes.exp | 2 +- .../expected_class_intersection.php.holes.exp | 2 +- ...cted_class_intersection_classname.php.holes.exp | 4 +- .../test/holes/expected_class_union.php.holes.exp | 2 +- .../expected_class_union_classname.php.holes.exp | 4 +- hphp/hack/test/holes/expr_dependent.php.holes.exp | 8 +- .../foreach_async_non_traversable.php.holes.exp | 2 +- .../foreach_async_union_int_dynamic.php.holes.exp | 2 +- .../holes/foreach_kv_non_traversable.php.holes.exp | 2 +- .../foreach_kv_union_int_dynamic.php.holes.exp | 2 +- .../holes/foreach_non_traversable.php.holes.exp | 2 +- .../holes/foreach_union_int_dynamic.php.holes.exp | 2 +- hphp/hack/test/holes/imprecise_cast.php.holes.exp | 6 +- hphp/hack/test/holes/keyset_lit.php.holes.exp | 4 +- .../holes/keyvalue_collection_lit.php.holes.exp | 2 +- .../holes/member_not_found_method.php.holes.exp | 4 +- .../holes/member_not_found_property.php.holes.exp | 6 +- ...n_object_member_read_intersection.php.holes.exp | 2 +- .../non_object_member_read_method.php.holes.exp | 2 +- .../non_object_member_read_property.php.holes.exp | 2 +- .../non_object_member_read_union.php.holes.exp | 2 +- .../holes/null_member_read_method.php.holes.exp | 6 +- .../holes/null_member_read_property.php.holes.exp | 6 +- hphp/hack/test/holes/pair_lit.php.holes.exp | 2 +- hphp/hack/test/holes/return_async.php.holes.exp | 2 +- .../test/holes/return_awaitable_void.php.holes.exp | 6 +- hphp/hack/test/holes/return_literal.php.holes.exp | 2 +- .../test/holes/return_refinement.php.holes.exp | 2 +- hphp/hack/test/holes/return_sync.php.holes.exp | 2 +- hphp/hack/test/holes/string_interp.php.holes.exp | 2 +- .../holes/unsafe_cast_flow_typing.php.holes.exp | 4 +- .../test/holes/value_collection_lit.php.holes.exp | 2 +- .../test/holes/xhp_simple_attribute.php.holes.exp | 4 +- .../test/holes/xhp_spread_attribute.php.holes.exp | 6 +- .../test_class_level_where_clauses.php.exp | 10 +-- hphp/hack/test/nast/coeffects/anon.php.exp | 44 +++++----- hphp/hack/test/nast/coeffects/ctx_alias.php.exp | 5 +- hphp/hack/test/nast/coeffects/ctx_const.php.exp | 2 +- hphp/hack/test/nast/coeffects/ctx_const2.php.exp | 3 +- .../test/nast/coeffects/ctx_const_abstract.php.exp | 2 +- .../nast/coeffects/ctx_const_both_bounds.php.exp | 4 +- .../test/nast/coeffects/ctx_const_fail.php.exp | 2 +- .../nast/coeffects/ctx_const_lower_bound.php.exp | 4 +- .../nast/coeffects/ctx_const_naespacing.php.exp | 6 +- .../nast/coeffects/ctx_const_upper_bound.php.exp | 4 +- hphp/hack/test/nast/coeffects/poly_ctx.php.exp | 36 ++++---- hphp/hack/test/nast/coeffects/poly_var.php.exp | 24 +++--- hphp/hack/test/nast/coeffects_poly_var.php.exp | 2 +- hphp/hack/test/nast/expression_tree.php.exp | 2 +- hphp/hack/test/nast/expression_tree_assign.php.exp | 2 +- hphp/hack/test/nast/expression_tree_for.php.exp | 2 +- .../nast/expression_tree_function_order.php.exp | 2 +- .../hack/test/nast/expression_tree_invalid.php.exp | 2 +- hphp/hack/test/nast/expression_tree_loop.php.exp | 2 +- hphp/hack/test/nast/expression_tree_pipe.php.exp | 88 ++++++++++---------- hphp/hack/test/nast/expression_tree_splice.php.exp | 82 +++++++++--------- hphp/hack/test/nast/expression_tree_xhp.php.exp | 48 +++++------ ...ile_attributes_from_multiple_namespaces.php.exp | 6 +- .../nast/file_attributes_in_namespaces.php.exp | 6 +- ...es_in_namespaces_with_namespaced_values.php.exp | 9 +- hphp/hack/test/nast/fun_decl.php.exp | 18 ++-- hphp/hack/test/nast/fun_empty.php.exp | 18 ++-- .../test/nast/function_pointers/class_meth.php.exp | 4 +- .../function_pointers/function_pointer.php.exp | 30 +++---- hphp/hack/test/nast/hh_show.php.exp | 74 ++++++++--------- .../nast/higher_kinded_type_constraints1.php.exp | 14 ++-- .../nast/higher_kinded_type_constraints2.php.exp | 5 +- hphp/hack/test/nast/multifile.php.exp | 4 +- .../test/nast/numeric_literals_underscores.php.exp | 2 +- hphp/hack/test/nast/top_level.php.exp | 74 ++++++++--------- .../typeconsts/multiple-bounds_as-only.php.exp | 2 +- hphp/hack/test/tast/add_vector.php.exp | 10 +-- hphp/hack/test/tast/arith_plus.php.exp | 20 ++--- hphp/hack/test/tast/array_order.php.exp | 28 +++---- hphp/hack/test/tast/async_lambda.php.exp | 64 +++++++-------- hphp/hack/test/tast/awaitall.php.exp | 46 +++++------ hphp/hack/test/tast/call_args.php.exp | 34 ++++---- hphp/hack/test/tast/class_const.php.exp | 2 +- hphp/hack/test/tast/class_get.php.exp | 2 +- .../test_class_level_where_clauses.php.exp | 10 +-- hphp/hack/test/tast/coeffects.php.exp | 34 ++++---- hphp/hack/test/tast/concurrent_error.php.exp | 30 +++---- .../hack/test/tast/construct_unknown_class.php.exp | 20 ++--- hphp/hack/test/tast/contravariant_solve.php.exp | 10 +-- hphp/hack/test/tast/control_flow/do.php.exp | 24 +++--- .../test/tast/control_flow/do_throw_while.php.exp | 22 ++--- hphp/hack/test/tast/control_flow/dos.php.exp | 24 +++--- hphp/hack/test/tast/control_flow/loop_cond.php.exp | 8 +- hphp/hack/test/tast/control_flow/while.php.exp | 24 +++--- .../test/tast/control_flow/while_throw.php.exp | 22 ++--- hphp/hack/test/tast/dict_attribute.php.exp | 40 +++++---- hphp/hack/test/tast/dynamic_member_access.php.exp | 36 ++++---- hphp/hack/test/tast/eq_op.php.exp | 18 ++-- hphp/hack/test/tast/fake_member.php.exp | 2 +- ...ile_attributes_from_multiple_namespaces.php.exp | 6 +- .../tast/file_attributes_in_namespaces.php.exp | 6 +- ...es_in_namespaces_with_namespaced_values.php.exp | 9 +- hphp/hack/test/tast/finally.php.exp | 28 +++---- hphp/hack/test/tast/fun_meth_variadic.php.exp | 6 +- hphp/hack/test/tast/global_inference/array.php.exp | 24 +++--- .../test/tast/global_inference/call_chain.php.exp | 56 ++++++------- .../tast/global_inference/call_chain_evil.php.exp | 76 ++++++++--------- .../tast/global_inference/call_chain_evil2.php.exp | 76 ++++++++--------- .../global_inference/call_chain_evil_evil.php.exp | 8 +- .../global_inference/call_chain_evil_evil1.php.exp | 6 +- .../call_chain_evil_evil1_static.php.exp | 6 +- .../tast/global_inference/fun_composed.php.exp | 78 +++++++++--------- .../global_inference/fun_composed_small.php.exp | 56 ++++++------- .../test/tast/global_inference/id_composed.php.exp | 38 ++++----- hphp/hack/test/tast/global_inference/map.php.exp | 18 ++-- hphp/hack/test/tast/global_inference/mymap.php.exp | 4 +- .../tast/global_inference/one_two_three.php.exp | 6 +- .../params/type_hint_inferred_parameters.php.exp | 38 ++++----- ...pe_hint_inferred_parameters_constructor.php.exp | 4 +- .../params/type_hint_parameter_call.php.exp | 38 ++++----- .../params/type_hint_parameter_call_method.php.exp | 4 +- .../params/type_hint_parameter_indirect.php.exp | 96 +++++++++++----------- .../params/type_hint_parameter_method.php.exp | 2 +- .../type_hint_parameter_survive_assignment.php.exp | 38 ++++----- .../tast/global_inference/partial_annot.php.exp | 4 +- .../global_inference/partial_annot_where.php.exp | 4 +- .../global_inference/properties/inherit.php.exp | 4 +- .../type_hint_inferred_property_assignment.php.exp | 2 +- ...type_hint_inferred_property_constructor.php.exp | 6 +- .../type_hint_inferred_property_getter.php.exp | 6 +- ...type_hint_inferred_property_initializer.php.exp | 2 +- .../type_hint_inferred_property_setter.php.exp | 4 +- .../reinfer_types/call_chain_evil.php.exp | 76 ++++++++--------- .../reinfer_types/return_type_awaitable.php.exp | 4 +- .../reinfer_types/unsafe_type_fixme.php.exp | 12 +-- .../return/type_hint_inferred_awaitable.php.exp | 2 +- .../return/type_hint_inferred_function.php.exp | 2 +- .../return/type_hint_inferred_method.php.exp | 2 +- .../type_hint_inferred_anon_function.php.exp | 2 +- .../type_hint_typeparameter_custom.php.exp | 4 +- .../type_hint_typeparameter_method.php.exp | 2 +- .../type_hint_typeparameter_subtyping.php.exp | 4 +- .../type_hint_typeparameter_variance.php.exp | 4 +- hphp/hack/test/tast/initializer.php.exp | 6 +- hphp/hack/test/tast/invalid_fun_pointer.php.exp | 2 +- hphp/hack/test/tast/lambda1.php.exp | 2 +- hphp/hack/test/tast/lambda_contextual.php.exp | 4 +- hphp/hack/test/tast/lambda_efun.php.exp | 2 +- hphp/hack/test/tast/lambda_return_type.php.exp | 4 +- hphp/hack/test/tast/mixed_mixed.php.exp | 4 +- hphp/hack/test/tast/multiple_type.php.exp | 6 +- hphp/hack/test/tast/null_check.php.exp | 2 +- hphp/hack/test/tast/null_coalesce.php.exp | 2 +- .../test/tast/null_coalesce_assignment.php.exp | 2 +- hphp/hack/test/tast/parent_construct.php.exp | 4 +- hphp/hack/test/tast/parent_method.php.exp | 4 +- hphp/hack/test/tast/pseudofunctions.php.exp | 4 +- .../re_prefixed_string/re_prefixed_string.php.exp | 10 +-- hphp/hack/test/tast/reactive.php.exp | 2 +- .../test/tast/reified_generic_attributes.php.exp | 14 ++-- .../test/tast/reified_generic_shadowing.php.exp | 6 +- .../test/tast/reified_generic_shadowing2.php.exp | 4 +- .../test/tast/reified_generic_shadowing3.php.exp | 2 +- hphp/hack/test/tast/reify_mix_with_erased.php.exp | 4 +- hphp/hack/test/tast/sdt/nonnull_and_mixed.php.exp | 2 +- hphp/hack/test/tast/sdt/sdt.php.exp | 10 +-- .../test/tast/shapes_special_functions.php.exp | 5 +- .../singleton_unresolved_function_call.php.exp | 2 +- hphp/hack/test/tast/switch_fallthrough.php.exp | 2 +- hphp/hack/test/tast/try_catch.php.exp | 8 +- hphp/hack/test/tast/typeconsts.php.exp | 2 +- hphp/hack/test/tast/typedef.php.exp | 18 ++-- hphp/hack/test/tast/unbound_func.php.exp | 2 +- hphp/hack/test/tast/unbound_global.php.exp | 2 +- hphp/hack/test/tast/unbound_name_partial.php.exp | 2 +- .../tast/unresolved_grown_after_lambda.php.exp | 2 +- hphp/hack/test/tast/using.php.exp | 4 +- hphp/hack/test/tast/wildcard_generic_depth.php.exp | 4 +- hphp/hack/test/tast/xhp.php.exp | 4 +- hphp/hack/test/tast/xhp_modifier/xhp.php.exp | 2 +- hphp/hack/test/tast/xml_child_order.php.exp | 8 +- 276 files changed, 1440 insertions(+), 1304 deletions(-) diff --git a/hphp/hack/src/annotated_ast/aast.ml b/hphp/hack/src/annotated_ast/aast.ml index 5cde7902ac5..d2e04919d6c 100644 --- a/hphp/hack/src/annotated_ast/aast.ml +++ b/hphp/hack/src/annotated_ast/aast.ml @@ -838,6 +838,7 @@ and ('ex, 'en) class_ = { c_doc_comment: doc_comment option; c_emit_id: emit_id option; c_internal: bool; + c_module: sid option; } and class_hint = hint @@ -984,6 +985,7 @@ and ('ex, 'en) typedef = { t_emit_id: emit_id option; t_is_ctx: bool; t_internal: bool; + t_module: sid option; } and ('ex, 'en) gconst = { @@ -1003,6 +1005,7 @@ and ('ex, 'en) fun_def = { fd_mode: FileInfo.mode; [@visitors.opaque] fd_fun: ('ex, 'en) fun_; fd_internal: bool; + fd_module: sid option; } and ('ex, 'en) module_def = { @@ -1024,6 +1027,7 @@ and ('ex, 'en) def = | SetNamespaceEnv of nsenv | FileAttributes of ('ex, 'en) file_attribute | Module of ('ex, 'en) module_def + | SetModule of sid and ns_kind = | NSNamespace diff --git a/hphp/hack/src/decl/decl.ml b/hphp/hack/src/decl/decl.ml index c8e4a5dddbb..f4bd75b08ee 100644 --- a/hphp/hack/src/decl/decl.ml +++ b/hphp/hack/src/decl/decl.ml @@ -41,6 +41,7 @@ let rec name_and_declare_types_program_DEPRECATED name_and_declare_types_program_DEPRECATED acc ~sh ctx prog | NamespaceUse _ -> acc | SetNamespaceEnv _ -> acc + | SetModule _ -> acc | FileAttributes _ -> acc | Fun f -> let (name, decl) = Decl_nast.fun_naming_and_decl_DEPRECATED ctx f in diff --git a/hphp/hack/src/decl/decl_nast.ml b/hphp/hack/src/decl/decl_nast.ml index a78e7bb604a..2859f7e8999 100644 --- a/hphp/hack/src/decl/decl_nast.ml +++ b/hphp/hack/src/decl/decl_nast.ml @@ -147,6 +147,8 @@ and typedef_decl (ctx : Provider_context.t) (tdef : Nast.typedef) : t_emit_id = _; t_is_ctx = td_is_ctx; t_internal = _; + (* We'll consume this in the next diff *) + t_module = _; } = tdef in diff --git a/hphp/hack/src/hackc/compile/closure_convert.rs b/hphp/hack/src/hackc/compile/closure_convert.rs index 4bfed783842..0bf160e1dcf 100644 --- a/hphp/hack/src/hackc/compile/closure_convert.rs +++ b/hphp/hack/src/hackc/compile/closure_convert.rs @@ -603,6 +603,8 @@ fn make_closure( emit_id: Some(EmitId::Anonymous), // TODO(T116039119): Populate value with presence of internal attribute internal: false, + // TODO: closures should have the visibility of the module they are defined in + module: None, }; // TODO(hrust): can we reconstruct fd here from the scratch? @@ -1546,6 +1548,8 @@ impl<'a: 'b, 'b, 'arena: 'a + 'b> ClosureVisitor<'a, 'b, 'arena> { fun: f, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + // TODO: meth_caller should have the visibility of the module it is defined in + module: None, }; self.state_mut() .named_hoisted_functions @@ -1660,6 +1664,7 @@ fn prepare_defs(defs: &mut [Def]) -> usize { Def::FileAttributes(_) | Def::Fun(_) | Def::Module(_) + | Def::SetModule(_) | Def::NamespaceUse(_) | Def::SetNamespaceEnv(_) | Def::Stmt(_) => {} @@ -1703,6 +1708,7 @@ pub fn convert_toplevel_prog<'arena, 'decl>( | Def::FileAttributes(_) | Def::Fun(_) | Def::Module(_) + | Def::SetModule(_) | Def::Namespace(_) | Def::NamespaceUse(_) | Def::Stmt(_) diff --git a/hphp/hack/src/hackc/compile/rewrite_program.rs b/hphp/hack/src/hackc/compile/rewrite_program.rs index 4f90505af4e..1ea3ac657a7 100644 --- a/hphp/hack/src/hackc/compile/rewrite_program.rs +++ b/hphp/hack/src/hackc/compile/rewrite_program.rs @@ -186,6 +186,7 @@ fn extract_debugger_main( fun: f, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, }; let mut new_defs = vec![Def::mk_fun(fd)]; new_defs.append(&mut defs); diff --git a/hphp/hack/src/hh_single_decl.ml b/hphp/hack/src/hh_single_decl.ml index 55d014f6931..78c9c802b5b 100644 --- a/hphp/hack/src/hh_single_decl.ml +++ b/hphp/hack/src/hh_single_decl.ml @@ -74,6 +74,7 @@ let rec shallow_declare_ast ctx decls prog = match def with | Namespace (_, prog) -> shallow_declare_ast ctx decls prog | NamespaceUse _ -> decls + | SetModule _ -> decls | SetNamespaceEnv _ -> decls | FileAttributes _ -> decls | Fun f -> diff --git a/hphp/hack/src/naming/naming.ml b/hphp/hack/src/naming/naming.ml index f407e375ae0..6e45078c98c 100644 --- a/hphp/hack/src/naming/naming.ml +++ b/hphp/hack/src/naming/naming.ml @@ -949,6 +949,7 @@ let rec class_ ctx c = N.c_xhp_attrs = []; N.c_emit_id = c.Aast.c_emit_id; N.c_internal = c.Aast.c_internal; + N.c_module = c.Aast.c_module; } and user_attributes env attrl = @@ -1511,6 +1512,7 @@ and fun_def ctx fd = fd_namespace = fd.Aast.fd_namespace; fd_file_attributes = file_attributes; fd_internal = fd.Aast.fd_internal; + fd_module = fd.Aast.fd_module; } in named_fun_def @@ -2411,6 +2413,7 @@ let typedef ctx tdef = t_file_attributes = file_attributes ctx tdef.Aast.t_mode tdef.Aast.t_file_attributes; t_internal = tdef.Aast.t_internal; + t_module = tdef.Aast.t_module; } (**************************************************************************) @@ -2485,7 +2488,10 @@ let program ctx ast = top_level_env := genv; acc | Aast.Module md -> N.Module (module_ ctx md) :: acc - | Aast.FileAttributes _ -> acc + (* These are elaborated away in Namespaces.elaborate_toplevel_defs *) + | Aast.SetModule _ + | Aast.FileAttributes _ -> + acc in let on_program aast = let nast = List.fold_left ~f:aux ~init:[] aast in diff --git a/hphp/hack/src/naming/nast.ml b/hphp/hack/src/naming/nast.ml index ce88a2cebdb..1cb478b1551 100644 --- a/hphp/hack/src/naming/nast.ml +++ b/hphp/hack/src/naming/nast.ml @@ -224,7 +224,8 @@ let get_defs (ast : program) = FileInfo.pos_full (to_id md.md_name) :: modules ) | Namespace (_, defs) -> get_defs defs acc | NamespaceUse _ - | SetNamespaceEnv _ -> + | SetNamespaceEnv _ + | SetModule _ -> acc (* toplevel statements are ignored *) | FileAttributes _ @@ -1186,6 +1187,7 @@ module Visitor_DEPRECATED = struct | NamespaceUse _ | SetNamespaceEnv _ | FileAttributes _ + | SetModule _ | Module _ -> acc diff --git a/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs b/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs index 9b01893b8dc..38489de62c9 100644 --- a/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs +++ b/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs @@ -3,7 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the "hack" directory of this source tree. // -// @generated SignedSource<<77f7759085df234bb3527d8ba99a445f>> +// @generated SignedSource<<4900bce8f6165b3356b34f5e0754157b>> // // To regenerate this file, run: // hphp/hack/src/oxidized_regen.sh @@ -468,7 +468,8 @@ impl Node

for Class_ { self.enum_.accept(c, v)?; self.doc_comment.accept(c, v)?; self.emit_id.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl Node

for ClassishKind { @@ -585,6 +586,7 @@ impl Node

for Def { Def::SetNamespaceEnv(a0) => a0.accept(c, v), Def::FileAttributes(a0) => a0.accept(c, v), Def::Module(a0) => a0.accept(c, v), + Def::SetModule(a0) => a0.accept(c, v), } } } @@ -1150,7 +1152,8 @@ impl Node

for FunDef { self.file_attributes.accept(c, v)?; self.mode.accept(c, v)?; self.fun.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl Node

for FunKind { @@ -2013,7 +2016,8 @@ impl Node

for Typedef { self.span.accept(c, v)?; self.emit_id.accept(c, v)?; self.is_ctx.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl Node

for TypedefVisibility { diff --git a/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs b/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs index d0016a34e74..8af14dccbee 100644 --- a/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs +++ b/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs @@ -3,7 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the "hack" directory of this source tree. // -// @generated SignedSource<<3f367ad45094fa0eb0cca0b832762345>> +// @generated SignedSource<<28cd663dd0473eae872922b7e1a1e8e1>> // // To regenerate this file, run: // hphp/hack/src/oxidized_regen.sh @@ -468,7 +468,8 @@ impl NodeMut

for Class_ { self.enum_.accept(c, v)?; self.doc_comment.accept(c, v)?; self.emit_id.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl NodeMut

for ClassishKind { @@ -585,6 +586,7 @@ impl NodeMut

for Def { Def::SetNamespaceEnv(a0) => a0.accept(c, v), Def::FileAttributes(a0) => a0.accept(c, v), Def::Module(a0) => a0.accept(c, v), + Def::SetModule(a0) => a0.accept(c, v), } } } @@ -1150,7 +1152,8 @@ impl NodeMut

for FunDef { self.file_attributes.accept(c, v)?; self.mode.accept(c, v)?; self.fun.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl NodeMut

for FunKind { @@ -2013,7 +2016,8 @@ impl NodeMut

for Typedef { self.span.accept(c, v)?; self.emit_id.accept(c, v)?; self.is_ctx.accept(c, v)?; - self.internal.accept(c, v) + self.internal.accept(c, v)?; + self.module.accept(c, v) } } impl NodeMut

for TypedefVisibility { diff --git a/hphp/hack/src/oxidized/gen/aast.rs b/hphp/hack/src/oxidized/gen/aast.rs index ac25263b9a0..5cb8a359952 100644 --- a/hphp/hack/src/oxidized/gen/aast.rs +++ b/hphp/hack/src/oxidized/gen/aast.rs @@ -3,7 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the "hack" directory of this source tree. // -// @generated SignedSource<> +// @generated SignedSource<> // // To regenerate this file, run: // hphp/hack/src/oxidized_regen.sh @@ -1342,6 +1342,7 @@ pub struct Class_ { pub doc_comment: Option, pub emit_id: Option, pub internal: bool, + pub module: Option, } pub type ClassHint = Hint; @@ -1716,6 +1717,7 @@ pub struct Typedef { pub emit_id: Option, pub is_ctx: bool, pub internal: bool, + pub module: Option, } #[derive( @@ -1765,6 +1767,7 @@ pub struct FunDef { pub mode: file_info::Mode, pub fun: Fun_, pub internal: bool, + pub module: Option, } #[derive( @@ -1816,6 +1819,7 @@ pub enum Def { SetNamespaceEnv(Box), FileAttributes(Box>), Module(Box>), + SetModule(Box), } #[derive( diff --git a/hphp/hack/src/oxidized/impl_gen/aast_impl_gen.rs b/hphp/hack/src/oxidized/impl_gen/aast_impl_gen.rs index 18f4d51f527..3b6edb761ee 100644 --- a/hphp/hack/src/oxidized/impl_gen/aast_impl_gen.rs +++ b/hphp/hack/src/oxidized/impl_gen/aast_impl_gen.rs @@ -3,7 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the "hack" directory of this source tree. // -// @generated SignedSource<<37563f32b317103d84f046d9d5cef8f8>> +// @generated SignedSource<> // // To regenerate this file, run: // hphp/hack/src/oxidized_regen.sh @@ -3005,6 +3005,9 @@ impl Def { pub fn mk_module(p0: ModuleDef) -> Self { Def::Module(Box::new(p0)) } + pub fn mk_set_module(p0: Sid) -> Self { + Def::SetModule(Box::new(p0)) + } pub fn is_fun(&self) -> bool { match self { Def::Fun(..) => true, @@ -3065,6 +3068,12 @@ impl Def { _ => false, } } + pub fn is_set_module(&self) -> bool { + match self { + Def::SetModule(..) => true, + _ => false, + } + } pub fn as_fun(&self) -> Option<&FunDef> { match self { Def::Fun(p0) => Some(&p0), @@ -3125,6 +3134,12 @@ impl Def { _ => None, } } + pub fn as_set_module(&self) -> Option<&Sid> { + match self { + Def::SetModule(p0) => Some(&p0), + _ => None, + } + } pub fn as_fun_mut(&mut self) -> Option<&mut FunDef> { match self { Def::Fun(p0) => Some(p0.as_mut()), @@ -3185,6 +3200,12 @@ impl Def { _ => None, } } + pub fn as_set_module_mut(&mut self) -> Option<&mut Sid> { + match self { + Def::SetModule(p0) => Some(p0.as_mut()), + _ => None, + } + } pub fn as_fun_into(self) -> Option> { match self { Def::Fun(p0) => Some(*p0), @@ -3245,6 +3266,12 @@ impl Def { _ => None, } } + pub fn as_set_module_into(self) -> Option { + match self { + Def::SetModule(p0) => Some(*p0), + _ => None, + } + } } impl NsKind { pub fn mk_nsnamespace() -> Self { diff --git a/hphp/hack/src/oxidized/manual/aast_impl.rs b/hphp/hack/src/oxidized/manual/aast_impl.rs index 8a7040a3694..53185ce773e 100644 --- a/hphp/hack/src/oxidized/manual/aast_impl.rs +++ b/hphp/hack/src/oxidized/manual/aast_impl.rs @@ -87,6 +87,7 @@ impl<'a, Ex, En> Iterator for DefsIterator<'a, Ex, En> { Def::Namespace(defs) => self.stack.push(defs.1.iter()), Def::Stmt(_) | Def::Module(_) + | Def::SetModule(_) | Def::NamespaceUse(_) | Def::SetNamespaceEnv(_) | Def::FileAttributes(_) => {} diff --git a/hphp/hack/src/oxidized_by_ref/gen/aast.rs b/hphp/hack/src/oxidized_by_ref/gen/aast.rs index 9daea200334..ff3a2a4b84f 100644 --- a/hphp/hack/src/oxidized_by_ref/gen/aast.rs +++ b/hphp/hack/src/oxidized_by_ref/gen/aast.rs @@ -3,7 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the "hack" directory of this source tree. // -// @generated SignedSource<> +// @generated SignedSource<> // // To regenerate this file, run: // hphp/hack/src/oxidized_regen.sh @@ -1701,6 +1701,8 @@ pub struct Class_<'a, Ex, En> { pub doc_comment: Option<&'a DocComment<'a>>, pub emit_id: Option, pub internal: bool, + #[serde(deserialize_with = "arena_deserializer::arena", borrow)] + pub module: Option>, } impl<'a, Ex: TrivialDrop, En: TrivialDrop> TrivialDrop for Class_<'a, Ex, En> {} arena_deserializer::impl_deserialize_in_arena!(Class_<'arena, Ex, En>); @@ -2168,6 +2170,8 @@ pub struct Typedef<'a, Ex, En> { pub emit_id: Option, pub is_ctx: bool, pub internal: bool, + #[serde(deserialize_with = "arena_deserializer::arena", borrow)] + pub module: Option>, } impl<'a, Ex: TrivialDrop, En: TrivialDrop> TrivialDrop for Typedef<'a, Ex, En> {} arena_deserializer::impl_deserialize_in_arena!(Typedef<'arena, Ex, En>); @@ -2236,6 +2240,8 @@ pub struct FunDef<'a, Ex, En> { #[serde(deserialize_with = "arena_deserializer::arena", borrow)] pub fun: &'a Fun_<'a, Ex, En>, pub internal: bool, + #[serde(deserialize_with = "arena_deserializer::arena", borrow)] + pub module: Option>, } impl<'a, Ex: TrivialDrop, En: TrivialDrop> TrivialDrop for FunDef<'a, Ex, En> {} arena_deserializer::impl_deserialize_in_arena!(FunDef<'arena, Ex, En>); @@ -2312,6 +2318,8 @@ pub enum Def<'a, Ex, En> { FileAttributes(&'a FileAttribute<'a, Ex, En>), #[serde(deserialize_with = "arena_deserializer::arena", borrow)] Module(&'a ModuleDef<'a, Ex, En>), + #[serde(deserialize_with = "arena_deserializer::arena", borrow)] + SetModule(&'a Sid<'a>), } impl<'a, Ex: TrivialDrop, En: TrivialDrop> TrivialDrop for Def<'a, Ex, En> {} arena_deserializer::impl_deserialize_in_arena!(Def<'arena, Ex, En>); diff --git a/hphp/hack/src/parser/lowerer/lowerer.rs b/hphp/hack/src/parser/lowerer/lowerer.rs index 511e8e752f1..74443afa060 100644 --- a/hphp/hack/src/parser/lowerer/lowerer.rs +++ b/hphp/hack/src/parser/lowerer/lowerer.rs @@ -5009,6 +5009,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { mode: env.file_mode(), fun, internal: hdr.internal, + module: None, })]) } ClassishDeclaration(c) if contains_class_body(c) => { @@ -5077,6 +5078,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { doc_comment: doc_comment_opt, emit_id: None, internal: kinds.has(modifier::INTERNAL), + module: None, }; match &c.body.children { ClassishBody(c1) => { @@ -5147,6 +5149,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { is_ctx: false, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, })]) } ContextAliasDeclaration(c) => { @@ -5203,6 +5206,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { is_ctx: true, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, })]) } EnumDeclaration(c) => { @@ -5271,6 +5275,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { emit_id: None, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, })]) } @@ -5344,6 +5349,7 @@ fn p_def<'a>(node: S<'a>, env: &mut Env<'a>) -> Result> { xhp_attrs: vec![], emit_id: None, internal: kinds.has(modifier::INTERNAL), + module: None, }; for n in c.elements.syntax_node_to_list_skip_separator() { diff --git a/hphp/hack/src/rupro/hackrs/naming/naming.rs b/hphp/hack/src/rupro/hackrs/naming/naming.rs index 2d4f7c456d8..fd70be19171 100644 --- a/hphp/hack/src/rupro/hackrs/naming/naming.rs +++ b/hphp/hack/src/rupro/hackrs/naming/naming.rs @@ -113,6 +113,7 @@ pub fn program(p: &mut aast::Program<(), ()>) { SetNamespaceEnv(_) => {} FileAttributes(_) => {} Module(_) => {} + SetModule(_) => {} } } } diff --git a/hphp/hack/src/rupro/hackrs/typing/ast/typing_class.rs b/hphp/hack/src/rupro/hackrs/typing/ast/typing_class.rs index 5a4f9127fb3..bd10e9db6b3 100644 --- a/hphp/hack/src/rupro/hackrs/typing/ast/typing_class.rs +++ b/hphp/hack/src/rupro/hackrs/typing/ast/typing_class.rs @@ -67,6 +67,7 @@ impl TC for oxidized::aast::Class_<(), ()> { emit_id: self.emit_id.clone(), // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, }; Ok(res) } diff --git a/hphp/hack/src/rupro/hackrs/typing/ast/typing_fun_def.rs b/hphp/hack/src/rupro/hackrs/typing/ast/typing_fun_def.rs index a97d524763b..46efa9c02d1 100644 --- a/hphp/hack/src/rupro/hackrs/typing/ast/typing_fun_def.rs +++ b/hphp/hack/src/rupro/hackrs/typing/ast/typing_fun_def.rs @@ -36,6 +36,7 @@ fn infer_func_body( fun, // TODO(T116039119): Populate value with presence of internal attribute internal: false, + module: None, }; Ok(res) } diff --git a/hphp/hack/src/rupro/hackrs/typing_check_utils.rs b/hphp/hack/src/rupro/hackrs/typing_check_utils.rs index 4981d23fe76..1a994f18abd 100644 --- a/hphp/hack/src/rupro/hackrs/typing_check_utils.rs +++ b/hphp/hack/src/rupro/hackrs/typing_check_utils.rs @@ -44,6 +44,7 @@ impl TypingCheckUtils { | Def::Module(_) | Def::NamespaceUse(_) | Def::SetNamespaceEnv(_) + | Def::SetModule(_) | Def::FileAttributes(_) => unreachable!("Program::defs won't emit these"), } } diff --git a/hphp/hack/src/typing/nast_check_env.ml b/hphp/hack/src/typing/nast_check_env.ml index bdc5033fdf0..ec29b3ebbf9 100644 --- a/hphp/hack/src/typing/nast_check_env.ml +++ b/hphp/hack/src/typing/nast_check_env.ml @@ -80,6 +80,7 @@ let def_env ctx x = | Fun f -> fun_def_env empty_env f | Class c -> class_env empty_env c | Typedef t -> typedef_env empty_env t + | SetModule _ | Constant _ | Stmt _ | Namespace _ diff --git a/hphp/hack/src/typing/tast_env.ml b/hphp/hack/src/typing/tast_env.ml index 2308af8a8f9..0d4386bfa3a 100644 --- a/hphp/hack/src/typing/tast_env.ml +++ b/hphp/hack/src/typing/tast_env.ml @@ -306,6 +306,7 @@ let def_env ctx d = | Namespace _ | NamespaceUse _ | SetNamespaceEnv _ + | SetModule _ | FileAttributes _ (* TODO(T108206307) *) | Module _ -> diff --git a/hphp/hack/src/typing/typing_toplevel.ml b/hphp/hack/src/typing/typing_toplevel.ml index a592e8eef4e..bab64c609c4 100644 --- a/hphp/hack/src/typing/typing_toplevel.ml +++ b/hphp/hack/src/typing/typing_toplevel.ml @@ -291,6 +291,7 @@ let fun_def ctx fd : Aast.fd_file_attributes = file_attrs; Aast.fd_namespace = fd.fd_namespace; Aast.fd_internal = fd.fd_internal; + Aast.fd_module = fd.fd_module; } in let (_env, global_inference_env) = Env.extract_global_inference_env env in @@ -2048,6 +2049,7 @@ let class_def_ env c tc = Aast.c_xhp_attrs = []; Aast.c_emit_id = c.c_emit_id; Aast.c_internal = c.c_internal; + Aast.c_module = c.c_module; }, global_inference_envs ) @@ -2197,6 +2199,7 @@ let nast_to_tast_gienv ~(do_tast_checks : bool) ctx nast : | Namespace _ | NamespaceUse _ | SetNamespaceEnv _ + | SetModule _ | FileAttributes _ -> failwith "Invalid nodes in NAST. These nodes should be removed during naming." diff --git a/hphp/hack/src/typing/typing_type_wellformedness.ml b/hphp/hack/src/typing/typing_type_wellformedness.ml index b41fe8981c3..09f1c1029e3 100644 --- a/hphp/hack/src/typing/typing_type_wellformedness.ml +++ b/hphp/hack/src/typing/typing_type_wellformedness.ml @@ -311,6 +311,7 @@ let class_ tenv c = c_doc_comment = _; c_emit_id = _; c_internal = _; + c_module = _; } = c in @@ -374,6 +375,7 @@ let typedef tenv t = t_is_ctx = _; t_file_attributes = _; t_internal = _; + t_module = _; } = t in @@ -524,6 +526,7 @@ let _toplevel_def tenv = function fd_file_attributes = _; fd_fun; fd_internal = _; + fd_module = _; } = f in @@ -537,6 +540,7 @@ let _toplevel_def tenv = function | NamespaceUse _ | SetNamespaceEnv _ | FileAttributes _ + | SetModule _ (* TODO(T108206307) *) | Module _ -> [] diff --git a/hphp/hack/src/typing/typing_typedef.ml b/hphp/hack/src/typing/typing_typedef.ml index 0414e945a5d..360ec85f0de 100644 --- a/hphp/hack/src/typing/typing_typedef.ml +++ b/hphp/hack/src/typing/typing_typedef.ml @@ -53,6 +53,7 @@ let typedef_def ctx typedef = t_is_ctx = _; t_file_attributes = _; t_internal = _; + t_module = _; } = typedef in @@ -119,4 +120,5 @@ let typedef_def ctx typedef = Aast.t_is_ctx = typedef.t_is_ctx; Aast.t_file_attributes = file_attributes; Aast.t_internal = typedef.t_internal; + Aast.t_module = typedef.t_module; } diff --git a/hphp/hack/src/typing/typing_variance.ml b/hphp/hack/src/typing/typing_variance.ml index cc9129d41a5..1c1e74fd4a5 100644 --- a/hphp/hack/src/typing/typing_variance.ml +++ b/hphp/hack/src/typing/typing_variance.ml @@ -956,6 +956,7 @@ let class_def : Typing_env_types.env -> Nast.class_ -> unit = c_namespace = _; c_user_attributes = _; c_file_attributes = _; + c_module = _; c_enum = _; c_doc_comment = _; c_emit_id = _; @@ -999,6 +1000,7 @@ let typedef : Typing_env_types.env -> Nast.typedef -> unit = t_is_ctx = _; t_file_attributes = _; t_internal = _; + t_module = _; } = typedef in diff --git a/hphp/hack/test/holes/append_keyset.php.holes.exp b/hphp/hack/test/holes/append_keyset.php.holes.exp index ada963f28db..bdc69adc225 100644 --- a/hphp/hack/test/holes/append_keyset.php.holes.exp +++ b/hphp/hack/test/holes/append_keyset.php.holes.exp @@ -28,7 +28,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -60,4 +60,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/append_set.php.holes.exp b/hphp/hack/test/holes/append_set.php.holes.exp index 22a211e093f..c1c7ff28159 100644 --- a/hphp/hack/test/holes/append_set.php.holes.exp +++ b/hphp/hack/test/holes/append_set.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/append_string_datetime.php.holes.exp b/hphp/hack/test/holes/append_string_datetime.php.holes.exp index d9ddde72c1f..4a57668de37 100644 --- a/hphp/hack/test/holes/append_string_datetime.php.holes.exp +++ b/hphp/hack/test/holes/append_string_datetime.php.holes.exp @@ -31,4 +31,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_read_object.php.holes.exp b/hphp/hack/test/holes/array_access_read_object.php.holes.exp index 79545ba7f3c..eb6ee96bfc7 100644 --- a/hphp/hack/test/holes/array_access_read_object.php.holes.exp +++ b/hphp/hack/test/holes/array_access_read_object.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_read_prim.php.holes.exp b/hphp/hack/test/holes/array_access_read_prim.php.holes.exp index 2c511102ce1..90b57dbe040 100644 --- a/hphp/hack/test/holes/array_access_read_prim.php.holes.exp +++ b/hphp/hack/test/holes/array_access_read_prim.php.holes.exp @@ -23,4 +23,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_write_intersection.php.holes.exp b/hphp/hack/test/holes/array_access_write_intersection.php.holes.exp index ebba5aab2c7..6f2b983fccb 100644 --- a/hphp/hack/test/holes/array_access_write_intersection.php.holes.exp +++ b/hphp/hack/test/holes/array_access_write_intersection.php.holes.exp @@ -27,7 +27,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -58,4 +58,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_write_object.php.holes.exp b/hphp/hack/test/holes/array_access_write_object.php.holes.exp index 7a106bb0811..d0df9bfc715 100644 --- a/hphp/hack/test/holes/array_access_write_object.php.holes.exp +++ b/hphp/hack/test/holes/array_access_write_object.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_write_prim.php.holes.exp b/hphp/hack/test/holes/array_access_write_prim.php.holes.exp index 2d43000dd37..4f22b00a72f 100644 --- a/hphp/hack/test/holes/array_access_write_prim.php.holes.exp +++ b/hphp/hack/test/holes/array_access_write_prim.php.holes.exp @@ -28,4 +28,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_access_write_union.php.holes.exp b/hphp/hack/test/holes/array_access_write_union.php.holes.exp index 6fc2d3fa1bb..4dced18151b 100644 --- a/hphp/hack/test/holes/array_access_write_union.php.holes.exp +++ b/hphp/hack/test/holes/array_access_write_union.php.holes.exp @@ -32,7 +32,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -68,4 +68,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_append_object.php.holes.exp b/hphp/hack/test/holes/array_append_object.php.holes.exp index 6ef20a1fd3a..c0f45b871d8 100644 --- a/hphp/hack/test/holes/array_append_object.php.holes.exp +++ b/hphp/hack/test/holes/array_append_object.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_append_prim.php.holes.exp b/hphp/hack/test/holes/array_append_prim.php.holes.exp index d5292ac1058..8fa12175947 100644 --- a/hphp/hack/test/holes/array_append_prim.php.holes.exp +++ b/hphp/hack/test/holes/array_append_prim.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_append_union.php.holes.exp b/hphp/hack/test/holes/array_append_union.php.holes.exp index f048a91c4e2..2c1b62bd157 100644 --- a/hphp/hack/test/holes/array_append_union.php.holes.exp +++ b/hphp/hack/test/holes/array_append_union.php.holes.exp @@ -31,7 +31,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -68,4 +68,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_const_mutation_immvector.php.holes.exp b/hphp/hack/test/holes/array_const_mutation_immvector.php.holes.exp index b5c7fa369d3..2448db4686e 100644 --- a/hphp/hack/test/holes/array_const_mutation_immvector.php.holes.exp +++ b/hphp/hack/test/holes/array_const_mutation_immvector.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_const_mutation_keyedcontainer.php.holes.exp b/hphp/hack/test/holes/array_const_mutation_keyedcontainer.php.holes.exp index 96ebff1e46a..46c580882ea 100644 --- a/hphp/hack/test/holes/array_const_mutation_keyedcontainer.php.holes.exp +++ b/hphp/hack/test/holes/array_const_mutation_keyedcontainer.php.holes.exp @@ -32,4 +32,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_dict.php.holes.exp b/hphp/hack/test/holes/array_get_index_dict.php.holes.exp index 4fc2f719df0..88d2d8b9633 100644 --- a/hphp/hack/test/holes/array_get_index_dict.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_dict.php.holes.exp @@ -31,4 +31,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_immvector.php.holes.exp b/hphp/hack/test/holes/array_get_index_immvector.php.holes.exp index 7aad1973c28..ec657bed163 100644 --- a/hphp/hack/test/holes/array_get_index_immvector.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_immvector.php.holes.exp @@ -30,4 +30,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_keyed_container.php.holes.exp b/hphp/hack/test/holes/array_get_index_keyed_container.php.holes.exp index e8e529cc42e..31b3ff84d7a 100644 --- a/hphp/hack/test/holes/array_get_index_keyed_container.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_keyed_container.php.holes.exp @@ -32,4 +32,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_keyset.php.holes.exp b/hphp/hack/test/holes/array_get_index_keyset.php.holes.exp index d90b25aae79..da65d49e455 100644 --- a/hphp/hack/test/holes/array_get_index_keyset.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_keyset.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_map.php.holes.exp b/hphp/hack/test/holes/array_get_index_map.php.holes.exp index 80b1533d5e6..20f75062ca6 100644 --- a/hphp/hack/test/holes/array_get_index_map.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_map.php.holes.exp @@ -30,7 +30,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -64,4 +64,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_mixed.php.holes.exp b/hphp/hack/test/holes/array_get_index_mixed.php.holes.exp index 1f32c547315..3a180dab317 100644 --- a/hphp/hack/test/holes/array_get_index_mixed.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_mixed.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_nullable.php.holes.exp b/hphp/hack/test/holes/array_get_index_nullable.php.holes.exp index abb85ec9729..3c41655056f 100644 --- a/hphp/hack/test/holes/array_get_index_nullable.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_nullable.php.holes.exp @@ -23,4 +23,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_pair.php.holes.exp b/hphp/hack/test/holes/array_get_index_pair.php.holes.exp index 90f1bbbcbd8..71a33d1f424 100644 --- a/hphp/hack/test/holes/array_get_index_pair.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_pair.php.holes.exp @@ -31,4 +31,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_string.php.holes.exp b/hphp/hack/test/holes/array_get_index_string.php.holes.exp index a9585cc58de..45baa5fd969 100644 --- a/hphp/hack/test/holes/array_get_index_string.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_string.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_tuple.php.holes.exp b/hphp/hack/test/holes/array_get_index_tuple.php.holes.exp index 546f9c0801d..3858154977f 100644 --- a/hphp/hack/test/holes/array_get_index_tuple.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_tuple.php.holes.exp @@ -30,4 +30,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_varray.php.holes.exp b/hphp/hack/test/holes/array_get_index_varray.php.holes.exp index 6d14353cd14..eaafb30ac73 100644 --- a/hphp/hack/test/holes/array_get_index_varray.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_varray.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_vec.php.holes.exp b/hphp/hack/test/holes/array_get_index_vec.php.holes.exp index 1e882d80359..119f225d190 100644 --- a/hphp/hack/test/holes/array_get_index_vec.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_vec.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/array_get_index_vector.php.holes.exp b/hphp/hack/test/holes/array_get_index_vector.php.holes.exp index eb9e7189d8b..b95cf6ad025 100644 --- a/hphp/hack/test/holes/array_get_index_vector.php.holes.exp +++ b/hphp/hack/test/holes/array_get_index_vector.php.holes.exp @@ -30,4 +30,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_append_intersection.php.holes.exp b/hphp/hack/test/holes/assign_array_append_intersection.php.holes.exp index 722976493af..8a67c1c8244 100644 --- a/hphp/hack/test/holes/assign_array_append_intersection.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_append_intersection.php.holes.exp @@ -30,4 +30,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_append_set.php.holes.exp b/hphp/hack/test/holes/assign_array_append_set.php.holes.exp index ecbed1edcd7..2d19303b556 100644 --- a/hphp/hack/test/holes/assign_array_append_set.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_append_set.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_append_union.php.holes.exp b/hphp/hack/test/holes/assign_array_append_union.php.holes.exp index 038b4164a85..16917bc0f09 100644 --- a/hphp/hack/test/holes/assign_array_append_union.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_append_union.php.holes.exp @@ -32,4 +32,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_append_vector.php.holes.exp b/hphp/hack/test/holes/assign_array_append_vector.php.holes.exp index d652653820e..ee299dea816 100644 --- a/hphp/hack/test/holes/assign_array_append_vector.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_append_vector.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_dict.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_dict.php.holes.exp index 011ae6f39e4..d0d0a03ea23 100644 --- a/hphp/hack/test/holes/assign_array_get_index_dict.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_dict.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_map.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_map.php.holes.exp index 2518efed3e9..515c6e067cd 100644 --- a/hphp/hack/test/holes/assign_array_get_index_map.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_map.php.holes.exp @@ -36,4 +36,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_string.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_string.php.holes.exp index b655127eeae..287f10e7aaa 100644 --- a/hphp/hack/test/holes/assign_array_get_index_string.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_string.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_tuple.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_tuple.php.holes.exp index cb7b6b31386..9b50236975d 100644 --- a/hphp/hack/test/holes/assign_array_get_index_tuple.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_tuple.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_varray.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_varray.php.holes.exp index 3ce4fa76110..30455f40489 100644 --- a/hphp/hack/test/holes/assign_array_get_index_varray.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_varray.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_vec.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_vec.php.holes.exp index 09461d885d0..b96a50eb260 100644 --- a/hphp/hack/test/holes/assign_array_get_index_vec.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_vec.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_index_vector.php.holes.exp b/hphp/hack/test/holes/assign_array_get_index_vector.php.holes.exp index 17970c55c9d..a8dea8b81cb 100644 --- a/hphp/hack/test/holes/assign_array_get_index_vector.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_index_vector.php.holes.exp @@ -33,4 +33,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_map.php.holes.exp b/hphp/hack/test/holes/assign_array_get_map.php.holes.exp index 25eefe5fe8d..52d21cde9a8 100644 --- a/hphp/hack/test/holes/assign_array_get_map.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_map.php.holes.exp @@ -28,4 +28,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_string.php.holes.exp b/hphp/hack/test/holes/assign_array_get_string.php.holes.exp index 4191395aded..60614fd8da0 100644 --- a/hphp/hack/test/holes/assign_array_get_string.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_string.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_union.php.holes.exp b/hphp/hack/test/holes/assign_array_get_union.php.holes.exp index db82a1cd7bb..136c3f4c1b0 100644 --- a/hphp/hack/test/holes/assign_array_get_union.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_union.php.holes.exp @@ -32,4 +32,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_array_get_vector.php.holes.exp b/hphp/hack/test/holes/assign_array_get_vector.php.holes.exp index 0aa005ecce3..99a449d19c8 100644 --- a/hphp/hack/test/holes/assign_array_get_vector.php.holes.exp +++ b/hphp/hack/test/holes/assign_array_get_vector.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_class_get.php.holes.exp b/hphp/hack/test/holes/assign_class_get.php.holes.exp index fd88ffa62e8..fddbc0f0c10 100644 --- a/hphp/hack/test/holes/assign_class_get.php.holes.exp +++ b/hphp/hack/test/holes/assign_class_get.php.holes.exp @@ -194,4 +194,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_list.php.holes.exp b/hphp/hack/test/holes/assign_list.php.holes.exp index 8b95dcccffd..67be55cbca7 100644 --- a/hphp/hack/test/holes/assign_list.php.holes.exp +++ b/hphp/hack/test/holes/assign_list.php.holes.exp @@ -22,7 +22,7 @@ Errors: f_body = { fb_ast = [([4:3-25], (Return (Some (((int, int, int)), [4:10-24], (Tuple [((int), [4:16-17], (Int "1")); ((int), [4:19-20], (Int "1")); ((int), [4:22-23], (Int "1"))])))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -43,7 +43,7 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([8:3-22], (Return (Some (((int, int)), [8:10-21], (Tuple [((int), [8:16-17], (Int "1")); ((int), [8:19-20], (Int "1"))])))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -75,7 +75,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -112,4 +112,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/assign_obj_get.php.holes.exp b/hphp/hack/test/holes/assign_obj_get.php.holes.exp index b64a7478083..93e3e58f3d6 100644 --- a/hphp/hack/test/holes/assign_obj_get.php.holes.exp +++ b/hphp/hack/test/holes/assign_obj_get.php.holes.exp @@ -17,7 +17,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -47,4 +47,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_collection.php.holes.exp b/hphp/hack/test/holes/call_collection.php.holes.exp index eb16eb4e54d..d308d05cad5 100644 --- a/hphp/hack/test/holes/call_collection.php.holes.exp +++ b/hphp/hack/test/holes/call_collection.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -94,7 +94,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -154,4 +154,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_dead_code.php.holes.exp b/hphp/hack/test/holes/call_dead_code.php.holes.exp index c812c1dbd20..97923372aa9 100644 --- a/hphp/hack/test/holes/call_dead_code.php.holes.exp +++ b/hphp/hack/test/holes/call_dead_code.php.holes.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -50,7 +50,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -86,4 +86,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_dict.php.holes.exp b/hphp/hack/test/holes/call_dict.php.holes.exp index c5452044e1b..e1a130cd415 100644 --- a/hphp/hack/test/holes/call_dict.php.holes.exp +++ b/hphp/hack/test/holes/call_dict.php.holes.exp @@ -27,7 +27,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -48,7 +48,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -106,7 +106,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -200,4 +200,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_generic.php.holes.exp b/hphp/hack/test/holes/call_generic.php.holes.exp index 789ec0cb7b7..9484f1fe262 100644 --- a/hphp/hack/test/holes/call_generic.php.holes.exp +++ b/hphp/hack/test/holes/call_generic.php.holes.exp @@ -24,7 +24,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -58,7 +58,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -97,4 +97,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_imm_set.php.holes.exp b/hphp/hack/test/holes/call_imm_set.php.holes.exp index bf320359935..4919bebcf68 100644 --- a/hphp/hack/test/holes/call_imm_set.php.holes.exp +++ b/hphp/hack/test/holes/call_imm_set.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -87,7 +87,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -147,4 +147,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_imm_vector.php.holes.exp b/hphp/hack/test/holes/call_imm_vector.php.holes.exp index a052af4cc5c..ef955f71591 100644 --- a/hphp/hack/test/holes/call_imm_vector.php.holes.exp +++ b/hphp/hack/test/holes/call_imm_vector.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -87,7 +87,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -147,4 +147,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_inout.php.holes.exp b/hphp/hack/test/holes/call_inout.php.holes.exp index 488a2532e8b..f2a7e1226cd 100644 --- a/hphp/hack/test/holes/call_inout.php.holes.exp +++ b/hphp/hack/test/holes/call_inout.php.holes.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,4 +46,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_iterable.php.holes.exp b/hphp/hack/test/holes/call_iterable.php.holes.exp index 52e82efa621..5cb2c209927 100644 --- a/hphp/hack/test/holes/call_iterable.php.holes.exp +++ b/hphp/hack/test/holes/call_iterable.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -91,7 +91,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -151,4 +151,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_keyed_traversable.php.holes.exp b/hphp/hack/test/holes/call_keyed_traversable.php.holes.exp index f7563f6562b..d978455c960 100644 --- a/hphp/hack/test/holes/call_keyed_traversable.php.holes.exp +++ b/hphp/hack/test/holes/call_keyed_traversable.php.holes.exp @@ -27,7 +27,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -48,7 +48,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -130,7 +130,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -228,4 +228,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_keyset.php.holes.exp b/hphp/hack/test/holes/call_keyset.php.holes.exp index 75447512895..c7807c94830 100644 --- a/hphp/hack/test/holes/call_keyset.php.holes.exp +++ b/hphp/hack/test/holes/call_keyset.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -87,7 +87,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -147,4 +147,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_pair.php.holes.exp b/hphp/hack/test/holes/call_pair.php.holes.exp index 035b5591629..72d54df9983 100644 --- a/hphp/hack/test/holes/call_pair.php.holes.exp +++ b/hphp/hack/test/holes/call_pair.php.holes.exp @@ -27,7 +27,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -48,7 +48,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -106,7 +106,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -200,4 +200,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_prim.php.holes.exp b/hphp/hack/test/holes/call_prim.php.holes.exp index 878bbf511b2..99a881eefb5 100644 --- a/hphp/hack/test/holes/call_prim.php.holes.exp +++ b/hphp/hack/test/holes/call_prim.php.holes.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -55,7 +55,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -100,4 +100,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_refinement.php.holes.exp b/hphp/hack/test/holes/call_refinement.php.holes.exp index fe5f5a7d8aa..63de5bee6a9 100644 --- a/hphp/hack/test/holes/call_refinement.php.holes.exp +++ b/hphp/hack/test/holes/call_refinement.php.holes.exp @@ -23,7 +23,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([3:3-16], (Return (Some ((bool), [3:10-15], False))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -37,7 +37,7 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([6:3-19], (Return (Some ((vec), [6:10-18], (ValCollection (Vec, None, []))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -70,7 +70,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -108,4 +108,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_set.php.holes.exp b/hphp/hack/test/holes/call_set.php.holes.exp index 58dbb046e8e..6e5ba3dfa89 100644 --- a/hphp/hack/test/holes/call_set.php.holes.exp +++ b/hphp/hack/test/holes/call_set.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -86,7 +86,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -142,4 +142,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_traversable.php.holes.exp b/hphp/hack/test/holes/call_traversable.php.holes.exp index 12bea04929d..6f6fdac8326 100644 --- a/hphp/hack/test/holes/call_traversable.php.holes.exp +++ b/hphp/hack/test/holes/call_traversable.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -96,7 +96,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -156,4 +156,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_tuple.php.holes.exp b/hphp/hack/test/holes/call_tuple.php.holes.exp index 360750bd310..fb95c7aa8d2 100644 --- a/hphp/hack/test/holes/call_tuple.php.holes.exp +++ b/hphp/hack/test/holes/call_tuple.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -103,7 +103,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -193,4 +193,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_unpack.php.holes.exp b/hphp/hack/test/holes/call_unpack.php.holes.exp index 2c7ef7a346a..62142f85b80 100644 --- a/hphp/hack/test/holes/call_unpack.php.holes.exp +++ b/hphp/hack/test/holes/call_unpack.php.holes.exp @@ -21,7 +21,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -49,7 +49,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -77,7 +77,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -110,7 +110,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -146,7 +146,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -344,4 +344,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_variadic.php.holes.exp b/hphp/hack/test/holes/call_variadic.php.holes.exp index bf9d95978da..9b4f3b6886a 100644 --- a/hphp/hack/test/holes/call_variadic.php.holes.exp +++ b/hphp/hack/test/holes/call_variadic.php.holes.exp @@ -21,7 +21,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -81,4 +81,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_varray.php.holes.exp b/hphp/hack/test/holes/call_varray.php.holes.exp index 7eed544425e..813ed7e9bb6 100644 --- a/hphp/hack/test/holes/call_varray.php.holes.exp +++ b/hphp/hack/test/holes/call_varray.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -87,7 +87,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -145,4 +145,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_varray_or_darray.php.holes.exp b/hphp/hack/test/holes/call_varray_or_darray.php.holes.exp index a60ce91376c..5d1590af6e1 100644 --- a/hphp/hack/test/holes/call_varray_or_darray.php.holes.exp +++ b/hphp/hack/test/holes/call_varray_or_darray.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -99,7 +99,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -154,4 +154,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_vec.php.holes.exp b/hphp/hack/test/holes/call_vec.php.holes.exp index 1af6233e394..3dd340e95d9 100644 --- a/hphp/hack/test/holes/call_vec.php.holes.exp +++ b/hphp/hack/test/holes/call_vec.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -86,7 +86,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -142,4 +142,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/call_vector.php.holes.exp b/hphp/hack/test/holes/call_vector.php.holes.exp index e2f028bea9c..50cd745d612 100644 --- a/hphp/hack/test/holes/call_vector.php.holes.exp +++ b/hphp/hack/test/holes/call_vector.php.holes.exp @@ -26,7 +26,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,7 +46,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -87,7 +87,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -147,4 +147,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/compound_assign_bitwise_and.php.holes.exp b/hphp/hack/test/holes/compound_assign_bitwise_and.php.holes.exp index beafeb1513a..a80973d939f 100644 --- a/hphp/hack/test/holes/compound_assign_bitwise_and.php.holes.exp +++ b/hphp/hack/test/holes/compound_assign_bitwise_and.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/compound_assign_div.php.holes.exp b/hphp/hack/test/holes/compound_assign_div.php.holes.exp index 078549cddb9..f52cf3c09f3 100644 --- a/hphp/hack/test/holes/compound_assign_div.php.holes.exp +++ b/hphp/hack/test/holes/compound_assign_div.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/compound_assign_plus.php.holes.exp b/hphp/hack/test/holes/compound_assign_plus.php.holes.exp index abeca106b2f..c4b97298d65 100644 --- a/hphp/hack/test/holes/compound_assign_plus.php.holes.exp +++ b/hphp/hack/test/holes/compound_assign_plus.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/compound_assign_rshift.php.holes.exp b/hphp/hack/test/holes/compound_assign_rshift.php.holes.exp index 9936d5ef509..d67709d7c4f 100644 --- a/hphp/hack/test/holes/compound_assign_rshift.php.holes.exp +++ b/hphp/hack/test/holes/compound_assign_rshift.php.holes.exp @@ -27,4 +27,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/const_mutation_map.php.holes.exp b/hphp/hack/test/holes/const_mutation_map.php.holes.exp index f5047eb49d6..c7ebdafd435 100644 --- a/hphp/hack/test/holes/const_mutation_map.php.holes.exp +++ b/hphp/hack/test/holes/const_mutation_map.php.holes.exp @@ -31,7 +31,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -65,4 +65,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/const_mutation_nothing.php.holes.exp b/hphp/hack/test/holes/const_mutation_nothing.php.holes.exp index 95888956a60..734c7264108 100644 --- a/hphp/hack/test/holes/const_mutation_nothing.php.holes.exp +++ b/hphp/hack/test/holes/const_mutation_nothing.php.holes.exp @@ -31,7 +31,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -66,7 +66,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -100,4 +100,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/const_mutation_vector.php.holes.exp b/hphp/hack/test/holes/const_mutation_vector.php.holes.exp index dd6330785fc..5f3e691484f 100644 --- a/hphp/hack/test/holes/const_mutation_vector.php.holes.exp +++ b/hphp/hack/test/holes/const_mutation_vector.php.holes.exp @@ -29,7 +29,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -62,4 +62,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/echo_non_arraykey.php.holes.exp b/hphp/hack/test/holes/echo_non_arraykey.php.holes.exp index 349945791c1..5130f365aa0 100644 --- a/hphp/hack/test/holes/echo_non_arraykey.php.holes.exp +++ b/hphp/hack/test/holes/echo_non_arraykey.php.holes.exp @@ -34,4 +34,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expected_class.php.holes.exp b/hphp/hack/test/holes/expected_class.php.holes.exp index f1bdcd67d45..ee7eaec60d4 100644 --- a/hphp/hack/test/holes/expected_class.php.holes.exp +++ b/hphp/hack/test/holes/expected_class.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expected_class_intersection.php.holes.exp b/hphp/hack/test/holes/expected_class_intersection.php.holes.exp index 984d0a68506..9c13684cad4 100644 --- a/hphp/hack/test/holes/expected_class_intersection.php.holes.exp +++ b/hphp/hack/test/holes/expected_class_intersection.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expected_class_intersection_classname.php.holes.exp b/hphp/hack/test/holes/expected_class_intersection_classname.php.holes.exp index 3b3263b69aa..e8b090bd254 100644 --- a/hphp/hack/test/holes/expected_class_intersection_classname.php.holes.exp +++ b/hphp/hack/test/holes/expected_class_intersection_classname.php.holes.exp @@ -13,7 +13,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -46,4 +46,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expected_class_union.php.holes.exp b/hphp/hack/test/holes/expected_class_union.php.holes.exp index 97a5845670f..adc394749fe 100644 --- a/hphp/hack/test/holes/expected_class_union.php.holes.exp +++ b/hphp/hack/test/holes/expected_class_union.php.holes.exp @@ -31,4 +31,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expected_class_union_classname.php.holes.exp b/hphp/hack/test/holes/expected_class_union_classname.php.holes.exp index a2433326f98..98ff34ba413 100644 --- a/hphp/hack/test/holes/expected_class_union_classname.php.holes.exp +++ b/hphp/hack/test/holes/expected_class_union_classname.php.holes.exp @@ -13,7 +13,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -52,4 +52,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/expr_dependent.php.holes.exp b/hphp/hack/test/holes/expr_dependent.php.holes.exp index f2f70be10bb..8c02242b401 100644 --- a/hphp/hack/test/holes/expr_dependent.php.holes.exp +++ b/hphp/hack/test/holes/expr_dependent.php.holes.exp @@ -38,7 +38,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -75,7 +75,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -143,7 +143,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -194,4 +194,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_async_non_traversable.php.holes.exp b/hphp/hack/test/holes/foreach_async_non_traversable.php.holes.exp index 834d2345bf2..5169fd3ba14 100644 --- a/hphp/hack/test/holes/foreach_async_non_traversable.php.holes.exp +++ b/hphp/hack/test/holes/foreach_async_non_traversable.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_async_union_int_dynamic.php.holes.exp b/hphp/hack/test/holes/foreach_async_union_int_dynamic.php.holes.exp index d027b25ce43..1c70edb0dde 100644 --- a/hphp/hack/test/holes/foreach_async_union_int_dynamic.php.holes.exp +++ b/hphp/hack/test/holes/foreach_async_union_int_dynamic.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_kv_non_traversable.php.holes.exp b/hphp/hack/test/holes/foreach_kv_non_traversable.php.holes.exp index dd217c2bc25..59b6409eb1e 100644 --- a/hphp/hack/test/holes/foreach_kv_non_traversable.php.holes.exp +++ b/hphp/hack/test/holes/foreach_kv_non_traversable.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_kv_union_int_dynamic.php.holes.exp b/hphp/hack/test/holes/foreach_kv_union_int_dynamic.php.holes.exp index ef7bb004d8e..f09d85aad7a 100644 --- a/hphp/hack/test/holes/foreach_kv_union_int_dynamic.php.holes.exp +++ b/hphp/hack/test/holes/foreach_kv_union_int_dynamic.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_non_traversable.php.holes.exp b/hphp/hack/test/holes/foreach_non_traversable.php.holes.exp index 0d544d2a632..4b937a99c01 100644 --- a/hphp/hack/test/holes/foreach_non_traversable.php.holes.exp +++ b/hphp/hack/test/holes/foreach_non_traversable.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/foreach_union_int_dynamic.php.holes.exp b/hphp/hack/test/holes/foreach_union_int_dynamic.php.holes.exp index 66e2808ba2f..aa594223446 100644 --- a/hphp/hack/test/holes/foreach_union_int_dynamic.php.holes.exp +++ b/hphp/hack/test/holes/foreach_union_int_dynamic.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/imprecise_cast.php.holes.exp b/hphp/hack/test/holes/imprecise_cast.php.holes.exp index 37b0981027a..e90269a22da 100644 --- a/hphp/hack/test/holes/imprecise_cast.php.holes.exp +++ b/hphp/hack/test/holes/imprecise_cast.php.holes.exp @@ -11,7 +11,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [5:1-27]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -49,4 +49,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/keyset_lit.php.holes.exp b/hphp/hack/test/holes/keyset_lit.php.holes.exp index 87339c99acb..229f1d5a459 100644 --- a/hphp/hack/test/holes/keyset_lit.php.holes.exp +++ b/hphp/hack/test/holes/keyset_lit.php.holes.exp @@ -20,7 +20,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -50,4 +50,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/keyvalue_collection_lit.php.holes.exp b/hphp/hack/test/holes/keyvalue_collection_lit.php.holes.exp index af8daf06a2d..1d740b79256 100644 --- a/hphp/hack/test/holes/keyvalue_collection_lit.php.holes.exp +++ b/hphp/hack/test/holes/keyvalue_collection_lit.php.holes.exp @@ -22,4 +22,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/member_not_found_method.php.holes.exp b/hphp/hack/test/holes/member_not_found_method.php.holes.exp index c2dd0a7c9d5..89b9fb0f5b7 100644 --- a/hphp/hack/test/holes/member_not_found_method.php.holes.exp +++ b/hphp/hack/test/holes/member_not_found_method.php.holes.exp @@ -10,7 +10,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -42,4 +42,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/member_not_found_property.php.holes.exp b/hphp/hack/test/holes/member_not_found_property.php.holes.exp index dbb9a2edec7..d3e1940243d 100644 --- a/hphp/hack/test/holes/member_not_found_property.php.holes.exp +++ b/hphp/hack/test/holes/member_not_found_property.php.holes.exp @@ -15,7 +15,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -44,7 +44,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -74,4 +74,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/non_object_member_read_intersection.php.holes.exp b/hphp/hack/test/holes/non_object_member_read_intersection.php.holes.exp index a0186410fe2..987672cb326 100644 --- a/hphp/hack/test/holes/non_object_member_read_intersection.php.holes.exp +++ b/hphp/hack/test/holes/non_object_member_read_intersection.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/non_object_member_read_method.php.holes.exp b/hphp/hack/test/holes/non_object_member_read_method.php.holes.exp index 44cb6fd3c91..c5024a1281e 100644 --- a/hphp/hack/test/holes/non_object_member_read_method.php.holes.exp +++ b/hphp/hack/test/holes/non_object_member_read_method.php.holes.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/non_object_member_read_property.php.holes.exp b/hphp/hack/test/holes/non_object_member_read_property.php.holes.exp index bca8e9fe9f2..8431c85ac30 100644 --- a/hphp/hack/test/holes/non_object_member_read_property.php.holes.exp +++ b/hphp/hack/test/holes/non_object_member_read_property.php.holes.exp @@ -26,4 +26,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/non_object_member_read_union.php.holes.exp b/hphp/hack/test/holes/non_object_member_read_union.php.holes.exp index 52382e02ac2..6b3086e99dc 100644 --- a/hphp/hack/test/holes/non_object_member_read_union.php.holes.exp +++ b/hphp/hack/test/holes/non_object_member_read_union.php.holes.exp @@ -30,4 +30,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/null_member_read_method.php.holes.exp b/hphp/hack/test/holes/null_member_read_method.php.holes.exp index cb250ea8232..0a47de93a3d 100644 --- a/hphp/hack/test/holes/null_member_read_method.php.holes.exp +++ b/hphp/hack/test/holes/null_member_read_method.php.holes.exp @@ -29,7 +29,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -62,7 +62,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -94,4 +94,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/null_member_read_property.php.holes.exp b/hphp/hack/test/holes/null_member_read_property.php.holes.exp index 4c3c036bc99..3e2f2ea841f 100644 --- a/hphp/hack/test/holes/null_member_read_property.php.holes.exp +++ b/hphp/hack/test/holes/null_member_read_property.php.holes.exp @@ -26,7 +26,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -56,7 +56,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -85,4 +85,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/pair_lit.php.holes.exp b/hphp/hack/test/holes/pair_lit.php.holes.exp index 82d31598f31..c52662e5e34 100644 --- a/hphp/hack/test/holes/pair_lit.php.holes.exp +++ b/hphp/hack/test/holes/pair_lit.php.holes.exp @@ -19,4 +19,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/return_async.php.holes.exp b/hphp/hack/test/holes/return_async.php.holes.exp index d2f232020e5..f97bb75e11f 100644 --- a/hphp/hack/test/holes/return_async.php.holes.exp +++ b/hphp/hack/test/holes/return_async.php.holes.exp @@ -12,4 +12,4 @@ f_body = { fb_ast = [([5:3-14], (Return (Some ((string), [5:10-13], (Hole (((string), [5:10-13], (String "3")), (string), (int), Typing))))))] }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/return_awaitable_void.php.holes.exp b/hphp/hack/test/holes/return_awaitable_void.php.holes.exp index b221e1b57ba..3b5976b9f02 100644 --- a/hphp/hack/test/holes/return_awaitable_void.php.holes.exp +++ b/hphp/hack/test/holes/return_awaitable_void.php.holes.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -31,7 +31,7 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -69,4 +69,4 @@ }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/return_literal.php.holes.exp b/hphp/hack/test/holes/return_literal.php.holes.exp index cdd6b94c4f3..81671cc6706 100644 --- a/hphp/hack/test/holes/return_literal.php.holes.exp +++ b/hphp/hack/test/holes/return_literal.php.holes.exp @@ -11,4 +11,4 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([5:3-16], (Return (Some ((bool), [5:10-15], (Hole (((bool), [5:10-15], False), (bool), (int), Typing))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/return_refinement.php.holes.exp b/hphp/hack/test/holes/return_refinement.php.holes.exp index a6d25b554ab..e317854d87a 100644 --- a/hphp/hack/test/holes/return_refinement.php.holes.exp +++ b/hphp/hack/test/holes/return_refinement.php.holes.exp @@ -19,4 +19,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/return_sync.php.holes.exp b/hphp/hack/test/holes/return_sync.php.holes.exp index 57582c3a8e8..4c537f04d74 100644 --- a/hphp/hack/test/holes/return_sync.php.holes.exp +++ b/hphp/hack/test/holes/return_sync.php.holes.exp @@ -20,4 +20,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/string_interp.php.holes.exp b/hphp/hack/test/holes/string_interp.php.holes.exp index ed6c2baa48f..b196a841dc1 100644 --- a/hphp/hack/test/holes/string_interp.php.holes.exp +++ b/hphp/hack/test/holes/string_interp.php.holes.exp @@ -22,4 +22,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/unsafe_cast_flow_typing.php.holes.exp b/hphp/hack/test/holes/unsafe_cast_flow_typing.php.holes.exp index d67c1d7b3a7..92cc9403178 100644 --- a/hphp/hack/test/holes/unsafe_cast_flow_typing.php.holes.exp +++ b/hphp/hack/test/holes/unsafe_cast_flow_typing.php.holes.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-15], (Return (Some ((bool), [4:10-14], True))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -44,4 +44,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/value_collection_lit.php.holes.exp b/hphp/hack/test/holes/value_collection_lit.php.holes.exp index 0f494d2284b..9258bcc7339 100644 --- a/hphp/hack/test/holes/value_collection_lit.php.holes.exp +++ b/hphp/hack/test/holes/value_collection_lit.php.holes.exp @@ -12,4 +12,4 @@ f_body = { fb_ast = [([5:4-32], (Return (Some ((keyset), [5:11-31], (ValCollection (Keyset, None, [((string), [5:20-25], (String "bad")); ((int), [5:28-29], (Int "1"))]))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/xhp_simple_attribute.php.holes.exp b/hphp/hack/test/holes/xhp_simple_attribute.php.holes.exp index 57259b213bb..4bad6edbdb3 100644 --- a/hphp/hack/test/holes/xhp_simple_attribute.php.holes.exp +++ b/hphp/hack/test/holes/xhp_simple_attribute.php.holes.exp @@ -90,7 +90,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "XhpSimple"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -126,4 +126,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/holes/xhp_spread_attribute.php.holes.exp b/hphp/hack/test/holes/xhp_spread_attribute.php.holes.exp index 743d6af2598..7e07b65fdb7 100644 --- a/hphp/hack/test/holes/xhp_spread_attribute.php.holes.exp +++ b/hphp/hack/test/holes/xhp_spread_attribute.php.holes.exp @@ -97,7 +97,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "XhpSpread"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [14:3-23:4]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = true; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -199,7 +199,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "XhpSpread"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -233,4 +233,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/nast/class_level_where_clauses/test_class_level_where_clauses.php.exp b/hphp/hack/test/nast/class_level_where_clauses/test_class_level_where_clauses.php.exp index 36f73d9d3a3..d3ad5085889 100644 --- a/hphp/hack/test/nast/class_level_where_clauses/test_class_level_where_clauses.php.exp +++ b/hphp/hack/test/nast/class_level_where_clauses/test_class_level_where_clauses.php.exp @@ -15,7 +15,7 @@ c_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")); - c_emit_id = None; c_internal = false }); + c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [14:1-50]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -31,7 +31,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [16:1-66]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -52,7 +52,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [18:1-37]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -67,7 +67,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [20:1-43]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -82,5 +82,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/anon.php.exp b/hphp/hack/test/nast/coeffects/anon.php.exp index caea4ead9ea..85c0a4d9c56 100644 --- a/hphp/hack/test/nast/coeffects/anon.php.exp +++ b/hphp/hack/test/nast/coeffects/anon.php.exp @@ -1,13 +1,13 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [2:1-8:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([2:33-37], (Hprim Tvoid)))); - f_name = ([2:10-29], "\\anons_with_ctx_list"); f_tparams = []; + { f_span = [2:1-8:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([2:33-37], (Hprim Tvoid)))); + f_name = ([2:10-29], "\\anons_with_ctx_list"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -17,13 +17,13 @@ (Binop ((Eq None), ((), [3:3-15], (Lvar ([3:3-15], $anon_no_use))), ((), [3:18-62], (Efun ( - { f_span = [3:18-62]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; f_ret = ((), (Some ([3:38-41], (Hprim Tint)))); - f_name = ([3:18-62], ";anonymous"); f_tparams = []; + { f_span = [3:18-62]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; f_ret = ((), (Some ([3:38-41], (Hprim Tint)))); + f_name = ([3:18-62], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = (Some ([3:28-36], [([3:29-35], (Happly (([3:29-35], "\\HH\\Contexts\\output"), [])))])); f_unsafe_ctxs = (Some ([3:28-36], [([3:29-35], (Happly (([3:29-35], "\\HH\\Contexts\\Unsafe\\output"), [])))])); - f_body = { fb_ast = [([3:51-60], (Return (Some ((), [3:58-59], (Int "0")))))] }; - f_fun_kind = FSync; f_user_attributes = []; + f_body = { fb_ast = [([3:51-60], (Return (Some ((), [3:58-59], (Int "0")))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))) ))))); @@ -34,13 +34,13 @@ (Binop ((Eq None), ((), [6:3-15], (Lvar ([6:3-15], $anon_no_ret))), ((), [6:18-63], (Efun ( - { f_span = [6:18-63]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; f_ret = ((), None); - f_name = ([6:18-63], ";anonymous"); f_tparams = []; + { f_span = [6:18-63]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; f_ret = ((), None); + f_name = ([6:18-63], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = (Some ([6:28-37], [([6:29-36], (Happly (([6:29-36], "\\HH\\Contexts\\non_det"), [])))])); f_unsafe_ctxs = (Some ([6:28-37], [([6:29-36], (Happly (([6:29-36], "\\HH\\Contexts\\Unsafe\\non_det"), [])))])); - f_body = { fb_ast = [([6:51-61], (Return (Some ((), [6:58-60], (Lvar ([6:58-60], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; + f_body = { fb_ast = [([6:51-61], (Return (Some ((), [6:58-60], (Lvar ([6:58-60], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([6:43-47], $ret)]))) ))))); @@ -50,19 +50,19 @@ (Binop ((Eq None), ((), [7:3-8], (Lvar ([7:3-8], $anon))), ((), [7:11-56], (Efun ( - { f_span = [7:11-56]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; f_ret = ((), (Some ([7:27-30], (Hprim Tint)))); - f_name = ([7:11-56], ";anonymous"); f_tparams = []; + { f_span = [7:11-56]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; f_ret = ((), (Some ([7:27-30], (Hprim Tint)))); + f_name = ([7:11-56], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = (Some ([7:21-25], [([7:22-24], (Happly (([7:22-24], "\\HH\\Contexts\\rx"), [])))])); f_unsafe_ctxs = (Some ([7:21-25], [([7:22-24], (Happly (([7:22-24], "\\HH\\Contexts\\Unsafe\\rx"), [])))])); - f_body = { fb_ast = [([7:44-54], (Return (Some ((), [7:51-53], (Lvar ([7:51-53], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; + f_body = { fb_ast = [([7:44-54], (Return (Some ((), [7:51-53], (Lvar ([7:51-53], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([7:36-40], $ret)]))) ))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_alias.php.exp b/hphp/hack/test/nast/coeffects/ctx_alias.php.exp index d95467fdc4f..a618690841d 100644 --- a/hphp/hack/test/nast/coeffects/ctx_alias.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_alias.php.exp @@ -15,7 +15,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [4:1-29]; t_emit_id = None; t_is_ctx = true; t_internal = false }); + t_span = [4:1-29]; t_emit_id = None; t_is_ctx = true; t_internal = false; + t_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -38,5 +39,5 @@ f_unsafe_ctxs = (Some ([6:16-20], [([6:17-19], (Happly (([6:17-19], "\\X"), [])))])); f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const.php.exp b/hphp/hack/test/nast/coeffects/ctx_const.php.exp index 73f5c2d2ca8..de3bb3bae54 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const.php.exp @@ -19,5 +19,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const2.php.exp b/hphp/hack/test/nast/coeffects/ctx_const2.php.exp index 3c09b5cc926..8630e20ba77 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const2.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const2.php.exp @@ -30,5 +30,6 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_abstract.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_abstract.php.exp index 7063e772c8d..494b14097b5 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_abstract.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_abstract.php.exp @@ -36,5 +36,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_both_bounds.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_both_bounds.php.exp index 5bc918cb0e2..2f9b84b604e 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_both_bounds.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_both_bounds.php.exp @@ -20,7 +20,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [7:1-9:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = Cinterface; @@ -43,5 +43,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_fail.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_fail.php.exp index 3894b4f16f6..0e436b624e3 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_fail.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_fail.php.exp @@ -16,5 +16,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_lower_bound.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_lower_bound.php.exp index 02efdc05218..d627fbc4fe4 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_lower_bound.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_lower_bound.php.exp @@ -18,7 +18,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [7:1-9:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -37,5 +37,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_naespacing.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_naespacing.php.exp index 44c5c1cb70a..5a3c46e2b7e 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_naespacing.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_naespacing.php.exp @@ -15,7 +15,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [4:1-27]; t_emit_id = None; t_is_ctx = true; t_internal = false }); + t_span = [4:1-27]; t_emit_id = None; t_is_ctx = true; t_internal = false; + t_module = None }); (Class { c_span = [6:1-9:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Abstract); @@ -50,5 +51,6 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/ctx_const_upper_bound.php.exp b/hphp/hack/test/nast/coeffects/ctx_const_upper_bound.php.exp index 0e80a7adc84..dc46026ea8a 100644 --- a/hphp/hack/test/nast/coeffects/ctx_const_upper_bound.php.exp +++ b/hphp/hack/test/nast/coeffects/ctx_const_upper_bound.php.exp @@ -18,7 +18,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [7:1-9:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -37,5 +37,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/poly_ctx.php.exp b/hphp/hack/test/nast/coeffects/poly_ctx.php.exp index 2466186dfd7..ca7cbb62987 100644 --- a/hphp/hack/test/nast/coeffects/poly_ctx.php.exp +++ b/hphp/hack/test/nast/coeffects/poly_ctx.php.exp @@ -1,12 +1,12 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-6:28]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([6:21-25], (Hprim Tvoid)))); + { f_span = [3:1-6:28]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([6:21-25], (Hprim Tvoid)))); f_name = ([3:10-14], "\\poly"); f_tparams = [{ tp_variance = Invariant; tp_name = ([4:19-20], "T/[ctx $f]"); tp_parameters = []; tp_constraints = []; tp_reified = Erased; tp_user_attributes = [] }; @@ -18,12 +18,12 @@ ((), (Some ([4:3-28], (Hfun - { hf_is_readonly = None; hf_param_tys = [([4:14-17], (Hprim Tint))]; - hf_param_info = [(Some { hfparam_kind = Pnormal; hfparam_readonlyness = None })]; - hf_variadic_ty = None; hf_ctxs = (Some ([4:18-21], [([4:19-20], (Hfun_context "$f"))])); + { hf_is_readonly = None; hf_param_tys = [([4:14-17], (Hprim Tint))]; + hf_param_info = [(Some { hfparam_kind = Pnormal; hfparam_readonlyness = None })]; + hf_variadic_ty = None; hf_ctxs = (Some ([4:18-21], [([4:19-20], (Hfun_context "$f"))])); hf_return_ty = ([4:23-27], (Hprim Tvoid)); hf_is_readonly_return = None })))); - param_is_variadic = false; param_pos = [4:29-31]; param_name = "$f"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + param_is_variadic = false; param_pos = [4:29-31]; param_name = "$f"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; { param_annotation = (); param_type_hint = @@ -32,18 +32,18 @@ (Hoption ([5:4-32], (Hfun - { hf_is_readonly = None; hf_param_tys = [([5:15-21], (Hprim Tstring))]; - hf_param_info = [(Some { hfparam_kind = Pnormal; hfparam_readonlyness = None })]; - hf_variadic_ty = None; hf_ctxs = (Some ([5:22-25], [([5:23-24], (Hfun_context "$nf"))])); - hf_return_ty = ([5:27-31], (Hprim Tbool)); + { hf_is_readonly = None; hf_param_tys = [([5:15-21], (Hprim Tstring))]; + hf_param_info = [(Some { hfparam_kind = Pnormal; hfparam_readonlyness = None })]; + hf_variadic_ty = None; hf_ctxs = (Some ([5:22-25], [([5:23-24], (Hfun_context "$nf"))])); + hf_return_ty = ([5:27-31], (Hprim Tbool)); hf_is_readonly_return = None })))))); - param_is_variadic = false; param_pos = [5:33-36]; param_name = "$nf"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + param_is_variadic = false; param_pos = [5:33-36]; param_name = "$nf"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = (Some ([6:2-19], [([6:3-9], (Hfun_context "$f")); ([6:11-18], (Hfun_context "$nf"))])); - f_unsafe_ctxs = (Some ([6:2-19], [([6:3-9], (Hfun_context "$f")); ([6:11-18], (Hfun_context "$nf"))])); - f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; + f_unsafe_ctxs = (Some ([6:2-19], [([6:3-9], (Hfun_context "$f")); ([6:11-18], (Hfun_context "$nf"))])); + f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects/poly_var.php.exp b/hphp/hack/test/nast/coeffects/poly_var.php.exp index b17b53c43ce..e38260cb11e 100644 --- a/hphp/hack/test/nast/coeffects/poly_var.php.exp +++ b/hphp/hack/test/nast/coeffects/poly_var.php.exp @@ -1,28 +1,28 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:18]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([5:11-15], (Hprim Tvoid)))); + { f_span = [3:1-5:18]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([5:11-15], (Hprim Tvoid)))); f_name = ([3:10-14], "\\poly"); f_tparams = - [{ tp_variance = Invariant; tp_name = ([4:5-7], "T/$f"); tp_parameters = []; - tp_constraints = [(Constraint_as, ([4:3-4], (Happly (([4:3-4], "\\C"), []))))]; + [{ tp_variance = Invariant; tp_name = ([4:5-7], "T/$f"); tp_parameters = []; + tp_constraints = [(Constraint_as, ([4:3-4], (Happly (([4:3-4], "\\C"), []))))]; tp_reified = Erased; tp_user_attributes = [] }; { tp_variance = Invariant; tp_name = ([5:3-8], "T/[$f::C]"); tp_parameters = []; tp_constraints = []; tp_reified = Erased; tp_user_attributes = [] }]; f_where_constraints = [(([5:3-8], (Habstr ("T/[$f::C]", []))), Constraint_eq, ([5:3-8], (Haccess (([4:5-7], (Habstr ("T/$f", []))), [([5:7-8], "C")]))))]; f_params = - [{ param_annotation = (); param_type_hint = ((), (Some ([4:5-7], (Habstr ("T/$f", []))))); - param_is_variadic = false; param_pos = [4:5-7]; param_name = "$f"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (); param_type_hint = ((), (Some ([4:5-7], (Habstr ("T/$f", []))))); + param_is_variadic = false; param_pos = [4:5-7]; param_name = "$f"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = (Some ([5:2-9], [([5:3-8], (Haccess (([5:3-5], (Hvar "$f")), [([5:7-8], "C")])))])); - f_unsafe_ctxs = (Some ([5:2-9], [([5:3-8], (Haccess (([5:3-5], (Hvar "$f")), [([5:7-8], "C")])))])); - f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; + f_unsafe_ctxs = (Some ([5:2-9], [([5:3-8], (Haccess (([5:3-5], (Hvar "$f")), [([5:7-8], "C")])))])); + f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/coeffects_poly_var.php.exp b/hphp/hack/test/nast/coeffects_poly_var.php.exp index dbdb267497d..157113425a7 100644 --- a/hphp/hack/test/nast/coeffects_poly_var.php.exp +++ b/hphp/hack/test/nast/coeffects_poly_var.php.exp @@ -59,5 +59,5 @@ [8:46-59], (Haccess (([8:46-54], (Hvar "$nremain")), [([8:56-59], "Co4")])))])); f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree.php.exp b/hphp/hack/test/nast/expression_tree.php.exp index 90b03da44c6..d71a07ccf96 100644 --- a/hphp/hack/test/nast/expression_tree.php.exp +++ b/hphp/hack/test/nast/expression_tree.php.exp @@ -213,5 +213,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_assign.php.exp b/hphp/hack/test/nast/expression_tree_assign.php.exp index 7d2ddcf5486..d89f25cd9f9 100644 --- a/hphp/hack/test/nast/expression_tree_assign.php.exp +++ b/hphp/hack/test/nast/expression_tree_assign.php.exp @@ -183,5 +183,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_for.php.exp b/hphp/hack/test/nast/expression_tree_for.php.exp index b2697accaf2..13a3563414d 100644 --- a/hphp/hack/test/nast/expression_tree_for.php.exp +++ b/hphp/hack/test/nast/expression_tree_for.php.exp @@ -397,5 +397,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_function_order.php.exp b/hphp/hack/test/nast/expression_tree_function_order.php.exp index 1a109177c95..65783ff4efc 100644 --- a/hphp/hack/test/nast/expression_tree_function_order.php.exp +++ b/hphp/hack/test/nast/expression_tree_function_order.php.exp @@ -334,5 +334,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_invalid.php.exp b/hphp/hack/test/nast/expression_tree_invalid.php.exp index cab17686eb3..70659c6eb9a 100644 --- a/hphp/hack/test/nast/expression_tree_invalid.php.exp +++ b/hphp/hack/test/nast/expression_tree_invalid.php.exp @@ -141,5 +141,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_loop.php.exp b/hphp/hack/test/nast/expression_tree_loop.php.exp index 7dc07c18903..873206b0cd3 100644 --- a/hphp/hack/test/nast/expression_tree_loop.php.exp +++ b/hphp/hack/test/nast/expression_tree_loop.php.exp @@ -248,5 +248,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_pipe.php.exp b/hphp/hack/test/nast/expression_tree_pipe.php.exp index afb808cbf78..b87da01a825 100644 --- a/hphp/hack/test/nast/expression_tree_pipe.php.exp +++ b/hphp/hack/test/nast/expression_tree_pipe.php.exp @@ -1,13 +1,13 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([3:18-22], (Hprim Tvoid)))); - f_name = ([3:10-14], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([3:18-22], (Hprim Tvoid)))); + f_name = ([3:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -35,13 +35,13 @@ (Call ( ((), [4:19-38], (Efun ( - { f_span = [4:19-38]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:19-38], ";anonymous"); - f_tparams = []; f_where_constraints = []; + { f_span = [4:19-38]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:19-38], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; - f_body = { fb_ast = [([4:19-38], (Return (Some ((), [4:19-38], (ET_Splice ((), [4:22-36], (Lvar ([4:22-36], $0splice0))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; + f_body = { fb_ast = [([4:19-38], (Return (Some ((), [4:19-38], (ET_Splice ((), [4:22-36], (Lvar ([4:22-36], $0splice0))))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([4:8-18], $0splice0)]))), [], [], None))); @@ -50,16 +50,16 @@ (Call ( ((), [4:19-38], (Lfun ( - { f_span = [4:19-38]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:19-38], ";anonymous"); + { f_span = [4:19-38]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:19-38], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), None); - param_is_variadic = false; param_pos = [4:22-24]; - param_name = "$0dollardollar"; - param_expr = None; param_readonly = None; - param_callconv = Pnormal; param_user_attributes = []; + [{ param_annotation = (); param_type_hint = ((), None); + param_is_variadic = false; param_pos = [4:22-24]; + param_name = "$0dollardollar"; + param_expr = None; param_readonly = None; + param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -68,7 +68,7 @@ [([4:19-38], (Return (Some ((), [4:8-18], - (Call (((), [4:8-18], (Class_const (((), [4:8-18], (CI ([4:8-18], "\\ExampleDsl"))), ([4:8-18], "makeTree")))), + (Call (((), [4:8-18], (Class_const (((), [4:8-18], (CI ([4:8-18], "\\ExampleDsl"))), ([4:8-18], "makeTree")))), [], [(Pnormal, ((), [4:19-38], @@ -88,27 +88,27 @@ (Pnormal, ((), [4:19-38], (Lfun ( - { f_span = [4:19-38]; - f_readonly_this = None; - f_annotation = (); - f_readonly_ret = None; - f_ret = ((), None); - f_name = ([4:19-38], ";anonymous"); - f_tparams = []; + { f_span = [4:19-38]; + f_readonly_this = None; + f_annotation = (); + f_readonly_ret = None; + f_ret = ((), None); + f_name = ([4:19-38], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); - param_type_hint = ((), (Some ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))))); - param_is_variadic = false; - param_pos = [4:8-18]; - param_name = "$0v"; - param_expr = None; - param_readonly = None; - param_callconv = Pnormal; - param_user_attributes = []; + [{ param_annotation = (); + param_type_hint = ((), (Some ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))))); + param_is_variadic = false; + param_pos = [4:8-18]; + param_name = "$0v"; + param_expr = None; + param_readonly = None; + param_callconv = Pnormal; + param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -119,7 +119,7 @@ ( Call ( ((), [4:19-38], - (Obj_get (((), [4:19-38], (Lvar ([4:19-38], $0v))), ((), [4:19-38], (Id ([4:19-38], "splice"))), OG_nullthrows, Is_method))), + (Obj_get (((), [4:19-38], (Lvar ([4:19-38], $0v))), ((), [4:19-38], (Id ([4:19-38], "splice"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [4:19-38], @@ -133,16 +133,16 @@ Pnormal, ((), [4:22-36], (Lvar ([4:22-36], $0splice0))))], None)))))) ] }; - f_fun_kind = FSync; - f_user_attributes = []; - f_external = false; + f_fun_kind = FSync; + f_user_attributes = []; + f_external = false; f_doc_comment = None }, [([4:22-36], $0splice0)])))) ], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([4:22-36], $0splice0)]))), [], [(Pnormal, ((), [4:22-24], (Dollardollar ([4:22-24], $$))))], None))); @@ -150,7 +150,7 @@ ))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_splice.php.exp b/hphp/hack/test/nast/expression_tree_splice.php.exp index 977f6f577f4..2dc9d50fd9e 100644 --- a/hphp/hack/test/nast/expression_tree_splice.php.exp +++ b/hphp/hack/test/nast/expression_tree_splice.php.exp @@ -1,13 +1,13 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([3:18-22], (Hprim Tvoid)))); - f_name = ([3:10-14], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([3:18-22], (Hprim Tvoid)))); + f_name = ([3:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -28,10 +28,10 @@ (Call ( ((), [4:14-32], (Efun ( - { f_span = [4:14-32]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:14-32], ";anonymous"); - f_tparams = []; f_where_constraints = []; + { f_span = [4:14-32]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:14-32], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -58,7 +58,7 @@ [], [(Pnormal, ((), [4:23-32], (ET_Splice ((), [4:25-31], (Lvar ([4:25-31], $0splice0))))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([4:3-13], $0splice0)]))), [], [], None))); @@ -67,17 +67,17 @@ (Call ( ((), [4:14-32], (Lfun ( - { f_span = [4:14-32]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:14-32], ";anonymous"); - f_tparams = []; f_where_constraints = []; + { f_span = [4:14-32]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:14-32], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:14-32], (Return (Some ((), [4:3-13], - (Call (((), [4:3-13], (Class_const (((), [4:3-13], (CI ([4:3-13], "\\ExampleDsl"))), ([4:3-13], "makeTree")))), + (Call (((), [4:3-13], (Class_const (((), [4:3-13], (CI ([4:3-13], "\\ExampleDsl"))), ([4:3-13], "makeTree")))), [], [(Pnormal, ((), [4:14-32], @@ -97,27 +97,27 @@ (Pnormal, ((), [4:14-32], (Lfun ( - { f_span = [4:14-32]; - f_readonly_this = None; - f_annotation = (); - f_readonly_ret = None; - f_ret = ((), None); - f_name = ([4:14-32], ";anonymous"); - f_tparams = []; + { f_span = [4:14-32]; + f_readonly_this = None; + f_annotation = (); + f_readonly_ret = None; + f_ret = ((), None); + f_name = ([4:14-32], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); - param_type_hint = ((), (Some ([4:3-13], (Happly (([4:3-13], "\\ExampleDsl"), []))))); - param_is_variadic = false; - param_pos = [4:3-13]; - param_name = "$0v"; - param_expr = None; - param_readonly = None; - param_callconv = Pnormal; - param_user_attributes = []; + [{ param_annotation = (); + param_type_hint = ((), (Some ([4:3-13], (Happly (([4:3-13], "\\ExampleDsl"), []))))); + param_is_variadic = false; + param_pos = [4:3-13]; + param_name = "$0v"; + param_expr = None; + param_readonly = None; + param_callconv = Pnormal; + param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -156,7 +156,7 @@ ((), [4:14-15], (Call ( ((), [4:14-15], - (Obj_get (((), [4:14-15], (Lvar ([4:14-15], $0v))), ((), [4:14-15], (Id ([4:14-15], "visitInt"))), OG_nullthrows, Is_method))), + (Obj_get (((), [4:14-15], (Lvar ([4:14-15], $0v))), ((), [4:14-15], (Id ([4:14-15], "visitInt"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [4:14-15], @@ -172,7 +172,7 @@ ((), [4:18-20], (Call ( ((), [4:18-20], - (Obj_get (((), [4:18-20], (Lvar ([4:18-20], $0v))), ((), [4:18-20], (Id ([4:18-20], "visitInt"))), OG_nullthrows, Is_method))), + (Obj_get (((), [4:18-20], (Lvar ([4:18-20], $0v))), ((), [4:18-20], (Id ([4:18-20], "visitInt"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [4:18-20], @@ -188,7 +188,7 @@ ((), [4:23-32], (Call ( ((), [4:23-32], - (Obj_get (((), [4:23-32], (Lvar ([4:23-32], $0v))), ((), [4:23-32], (Id ([4:23-32], "splice"))), OG_nullthrows, Is_method))), + (Obj_get (((), [4:23-32], (Lvar ([4:23-32], $0v))), ((), [4:23-32], (Id ([4:23-32], "splice"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [4:23-32], @@ -203,23 +203,23 @@ None)))))) ] }; - f_fun_kind = FSync; - f_user_attributes = []; - f_external = false; + f_fun_kind = FSync; + f_user_attributes = []; + f_external = false; f_doc_comment = None }, [([4:25-31], $0splice0)])))) ], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([4:25-31], $0splice0)]))), [], [], None))); et_dollardollar_pos = None })))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/expression_tree_xhp.php.exp b/hphp/hack/test/nast/expression_tree_xhp.php.exp index 954ff2bacb5..cc07d39e065 100644 --- a/hphp/hack/test/nast/expression_tree_xhp.php.exp +++ b/hphp/hack/test/nast/expression_tree_xhp.php.exp @@ -1,13 +1,13 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([3:17-21], (Hprim Tvoid)))); - f_name = ([3:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([3:17-21], (Hprim Tvoid)))); + f_name = ([3:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -17,17 +17,17 @@ (Binop ((Eq None), ((), [4:3-5], (Lvar ([4:3-5], $x))), ((), [4:8-59], (ExpressionTree - { et_hint = ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))); + { et_hint = ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))); et_splices = []; et_function_pointers = []; et_virtualized_expr = ((), [4:19-58], (Call ( ((), [4:19-58], (Efun ( - { f_span = [4:19-58]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:19-58], ";anonymous"); - f_tparams = []; f_where_constraints = []; + { f_span = [4:19-58]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:19-58], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -36,7 +36,7 @@ (Some ((), [4:19-58], (Xml (([4:20-27], "\\:foo:bar"), [(Xhp_simple - { xs_name = ([4:28-29], "x"); + { xs_name = ([4:28-29], "x"); xs_type = (); xs_expr = ((), [4:30-33], @@ -50,13 +50,13 @@ )))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))), [], [], None))); et_runtime_expr = ((), [4:8-18], - (Call (((), [4:8-18], (Class_const (((), [4:8-18], (CI ([4:8-18], "\\ExampleDsl"))), ([4:8-18], "makeTree")))), + (Call (((), [4:8-18], (Class_const (((), [4:8-18], (CI ([4:8-18], "\\ExampleDsl"))), ([4:8-18], "makeTree")))), [], [(Pnormal, ((), [4:19-58], @@ -75,16 +75,16 @@ (Pnormal, ((), [4:19-58], (Lfun ( - { f_span = [4:19-58]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([4:19-58], ";anonymous"); + { f_span = [4:19-58]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([4:19-58], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), (Some ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))))); - param_is_variadic = false; param_pos = [4:8-18]; - param_name = "$0v"; param_expr = None; - param_readonly = None; param_callconv = Pnormal; - param_user_attributes = []; + [{ param_annotation = (); param_type_hint = ((), (Some ([4:8-18], (Happly (([4:8-18], "\\ExampleDsl"), []))))); + param_is_variadic = false; param_pos = [4:8-18]; + param_name = "$0v"; param_expr = None; + param_readonly = None; param_callconv = Pnormal; + param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -170,7 +170,7 @@ None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [])))) ], @@ -179,7 +179,7 @@ ))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/file_attributes_from_multiple_namespaces.php.exp b/hphp/hack/test/nast/file_attributes_from_multiple_namespaces.php.exp index 464e0a232eb..373dbad4ef3 100644 --- a/hphp/hack/test/nast/file_attributes_from_multiple_namespaces.php.exp +++ b/hphp/hack/test/nast/file_attributes_from_multiple_namespaces.php.exp @@ -25,7 +25,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [13:1-45]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -53,5 +54,6 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) ] diff --git a/hphp/hack/test/nast/file_attributes_in_namespaces.php.exp b/hphp/hack/test/nast/file_attributes_in_namespaces.php.exp index 2a5ec8fcd13..03013d63eea 100644 --- a/hphp/hack/test/nast/file_attributes_in_namespaces.php.exp +++ b/hphp/hack/test/nast/file_attributes_in_namespaces.php.exp @@ -19,7 +19,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [9:1-18]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -41,5 +42,6 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) ] diff --git a/hphp/hack/test/nast/file_attributes_in_namespaces_with_namespaced_values.php.exp b/hphp/hack/test/nast/file_attributes_in_namespaces_with_namespaced_values.php.exp index 3dc93439adf..b4202917b7b 100644 --- a/hphp/hack/test/nast/file_attributes_in_namespaces_with_namespaced_values.php.exp +++ b/hphp/hack/test/nast/file_attributes_in_namespaces_with_namespaced_values.php.exp @@ -51,7 +51,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [8:3-10:4]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -81,7 +82,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [16:3-25]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -106,5 +108,6 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) ] diff --git a/hphp/hack/test/nast/fun_decl.php.exp b/hphp/hack/test/nast/fun_decl.php.exp index 810ec07c82a..1d9064f6c8e 100644 --- a/hphp/hack/test/nast/fun_decl.php.exp +++ b/hphp/hack/test/nast/fun_decl.php.exp @@ -1,24 +1,24 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [12:1-28]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([12:23-27], (Hprim Tvoid)))); + { f_span = [12:1-28]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([12:23-27], (Hprim Tvoid)))); f_name = ([12:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), (Some ([12:14-17], (Hprim Tint)))); - param_is_variadic = false; param_pos = [12:18-20]; param_name = "$v"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (); param_type_hint = ((), (Some ([12:14-17], (Hprim Tint)))); + param_is_variadic = false; param_pos = [12:18-20]; param_name = "$v"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [] }; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [] }; f_fun_kind = FSync; f_user_attributes = []; f_external = true; f_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")) }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/fun_empty.php.exp b/hphp/hack/test/nast/fun_empty.php.exp index a485c680dec..6153111e771 100644 --- a/hphp/hack/test/nast/fun_empty.php.exp +++ b/hphp/hack/test/nast/fun_empty.php.exp @@ -1,24 +1,24 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [12:1-30]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([12:23-27], (Hprim Tvoid)))); + { f_span = [12:1-30]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([12:23-27], (Hprim Tvoid)))); f_name = ([12:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), (Some ([12:14-17], (Hprim Tint)))); - param_is_variadic = false; param_pos = [12:18-20]; param_name = "$v"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (); param_type_hint = ((), (Some ([12:14-17], (Hprim Tint)))); + param_is_variadic = false; param_pos = [12:18-20]; param_name = "$v"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")) }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/function_pointers/class_meth.php.exp b/hphp/hack/test/nast/function_pointers/class_meth.php.exp index f0cb8103db5..2214f5ade31 100644 --- a/hphp/hack/test/nast/function_pointers/class_meth.php.exp +++ b/hphp/hack/test/nast/function_pointers/class_meth.php.exp @@ -20,7 +20,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "Foo\\Bar"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -48,5 +48,5 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/function_pointers/function_pointer.php.exp b/hphp/hack/test/nast/function_pointers/function_pointer.php.exp index c50ef26faef..8f0ed553791 100644 --- a/hphp/hack/test/nast/function_pointers/function_pointer.php.exp +++ b/hphp/hack/test/nast/function_pointers/function_pointer.php.exp @@ -1,27 +1,27 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "Foo\\Bar"); + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "Foo\\Bar"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-24]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([5:17-21], (Hprim Tvoid)))); - f_name = ([5:10-13], "\\Foo\\Bar\\qux"); f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [5:1-24]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([5:17-21], (Hprim Tvoid)))); + f_name = ([5:10-13], "\\Foo\\Bar\\qux"); f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "Foo\\Bar"); + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "Foo\\Bar"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [7:1-14:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([7:17-21], (Hprim Tvoid)))); - f_name = ([7:10-13], "\\Foo\\Bar\\baz"); f_tparams = []; f_where_constraints = []; + { f_span = [7:1-14:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([7:17-21], (Hprim Tvoid)))); + f_name = ([7:10-13], "\\Foo\\Bar\\baz"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -29,7 +29,7 @@ ([11:3-17], (Expr ((), [11:3-16], (Binop ((Eq None), ((), [11:3-5], (Lvar ([11:3-5], $x))), ((), [11:8-16], (FunctionPointer ((FP_id ([11:8-14], "\\HH\\is_vec")), [])))))))); ([13:3-14], (Expr ((), [13:3-13], (Binop ((Eq None), ((), [13:3-5], (Lvar ([13:3-5], $x))), ((), [13:8-13], (FunctionPointer ((FP_id ([13:8-11], "\\HH\\vec")), []))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/hh_show.php.exp b/hphp/hack/test/nast/hh_show.php.exp index d35f56e3aee..ddacbd2c5c8 100644 --- a/hphp/hack/test/nast/hh_show.php.exp +++ b/hphp/hack/test/nast/hh_show.php.exp @@ -1,21 +1,21 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = [{ fa_user_attributes = [{ ua_name = ([3:8-32], "__EnableUnstableFeatures"); ua_params = [((), [3:33-51], (String "expression_trees"))] }]; fa_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-10:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), (Some ([5:18-22], (Hprim Tvoid)))); - f_name = ([5:10-14], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [5:1-10:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), (Some ([5:18-22], (Hprim Tvoid)))); + f_name = ([5:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -23,17 +23,17 @@ (Expr ((), [6:3-9:5], (ExpressionTree - { et_hint = ([6:3-13], (Happly (([6:3-13], "\\ExampleDsl"), []))); + { et_hint = ([6:3-13], (Happly (([6:3-13], "\\ExampleDsl"), []))); et_splices = []; et_function_pointers = []; et_virtualized_expr = ((), [6:14-9:4], (Call ( ((), [6:14-9:4], (Efun ( - { f_span = [6:14-9:4]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([6:14-9:4], ";anonymous"); - f_tparams = []; f_where_constraints = []; + { f_span = [6:14-9:4]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([6:14-9:4], ";anonymous"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -41,14 +41,14 @@ (Return (Some ((), [6:14-9:4], (Lfun ( - { f_span = [6:14-9:4]; - f_readonly_this = None; - f_annotation = (); - f_readonly_ret = None; - f_ret = ((), None); - f_name = ([6:14-9:4], ";anonymous"); - f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; + { f_span = [6:14-9:4]; + f_readonly_this = None; + f_annotation = (); + f_readonly_ret = None; + f_ret = ((), None); + f_name = ([6:14-9:4], ";anonymous"); + f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -68,20 +68,20 @@ (Call (((), [6:14-9:4], (Class_const (((), [6:14-9:4], (CI ([6:14-9:4], "\\ExampleDsl"))), ([6:14-9:4], "voidType")))), [], [], None)))))) ] }; - f_fun_kind = FSync; - f_user_attributes = []; - f_external = false; + f_fun_kind = FSync; + f_user_attributes = []; + f_external = false; f_doc_comment = None }, [])))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))), [], [], None))); et_runtime_expr = ((), [6:3-13], - (Call (((), [6:3-13], (Class_const (((), [6:3-13], (CI ([6:3-13], "\\ExampleDsl"))), ([6:3-13], "makeTree")))), + (Call (((), [6:3-13], (Class_const (((), [6:3-13], (CI ([6:3-13], "\\ExampleDsl"))), ([6:3-13], "makeTree")))), [], [(Pnormal, ((), [6:14-9:4], @@ -100,15 +100,15 @@ (Pnormal, ((), [6:14-9:4], (Lfun ( - { f_span = [6:14-9:4]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((), None); f_name = ([6:14-9:4], ";anonymous"); + { f_span = [6:14-9:4]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((), None); f_name = ([6:14-9:4], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), (Some ([6:3-13], (Happly (([6:3-13], "\\ExampleDsl"), []))))); - param_is_variadic = false; param_pos = [6:3-13]; - param_name = "$0v"; param_expr = None; - param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (); param_type_hint = ((), (Some ([6:3-13], (Happly (([6:3-13], "\\ExampleDsl"), []))))); + param_is_variadic = false; param_pos = [6:3-13]; + param_name = "$0v"; param_expr = None; + param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -150,7 +150,7 @@ ((), [7:5-7], (Call ( ((), [7:5-7], - (Obj_get (((), [7:5-7], (Lvar ([7:5-7], $0v))), ((), [7:5-7], (Id ([7:5-7], "visitLocal"))), OG_nullthrows, Is_method))), + (Obj_get (((), [7:5-7], (Lvar ([7:5-7], $0v))), ((), [7:5-7], (Id ([7:5-7], "visitLocal"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [7:5-7], @@ -165,7 +165,7 @@ ((), [7:10-11], (Call ( ((), [7:10-11], - (Obj_get (((), [7:10-11], (Lvar ([7:10-11], $0v))), ((), [7:10-11], (Id ([7:10-11], "visitInt"))), OG_nullthrows, Is_method))), + (Obj_get (((), [7:10-11], (Lvar ([7:10-11], $0v))), ((), [7:10-11], (Id ([7:10-11], "visitInt"))), OG_nullthrows, Is_method))), [], [(Pnormal, ((), [7:10-11], @@ -184,7 +184,7 @@ None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, [([8:13-15], $x)])))) ], @@ -192,7 +192,7 @@ et_dollardollar_pos = None })))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/higher_kinded_type_constraints1.php.exp b/hphp/hack/test/nast/higher_kinded_type_constraints1.php.exp index b27609e6e55..f00553de6fe 100644 --- a/hphp/hack/test/nast/higher_kinded_type_constraints1.php.exp +++ b/hphp/hack/test/nast/higher_kinded_type_constraints1.php.exp @@ -6,7 +6,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [10:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [10:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([11:6-8], "\\T4"); t_tparams = []; t_constraint = None; t_kind = ([11:11-16], Hmixed); t_user_attributes = []; @@ -15,7 +16,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [11:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [11:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([12:6-8], "\\T6"); t_tparams = []; t_constraint = None; t_kind = ([12:11-16], Hmixed); t_user_attributes = []; @@ -24,7 +26,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [12:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [12:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([13:6-8], "\\T7"); t_tparams = []; t_constraint = None; t_kind = ([13:11-16], Hmixed); t_user_attributes = []; @@ -33,7 +36,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [13:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [13:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Class { c_span = [15:1-22:5]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -73,5 +77,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/higher_kinded_type_constraints2.php.exp b/hphp/hack/test/nast/higher_kinded_type_constraints2.php.exp index 63364d3840f..4eeb75d7cd5 100644 --- a/hphp/hack/test/nast/higher_kinded_type_constraints2.php.exp +++ b/hphp/hack/test/nast/higher_kinded_type_constraints2.php.exp @@ -6,7 +6,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [11:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [11:1-17]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Class { c_span = [13:1-26:5]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -53,5 +54,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/multifile.php.exp b/hphp/hack/test/nast/multifile.php.exp index 01f3e6715d8..2a5354277be 100644 --- a/hphp/hack/test/nast/multifile.php.exp +++ b/hphp/hack/test/nast/multifile.php.exp @@ -10,7 +10,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] [(Fun { fd_namespace = @@ -25,5 +25,5 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/numeric_literals_underscores.php.exp b/hphp/hack/test/nast/numeric_literals_underscores.php.exp index 5f85d694386..ed0b035c65b 100644 --- a/hphp/hack/test/nast/numeric_literals_underscores.php.exp +++ b/hphp/hack/test/nast/numeric_literals_underscores.php.exp @@ -35,5 +35,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/nast/top_level.php.exp b/hphp/hack/test/nast/top_level.php.exp index 001f4090d4e..0ffe190ee4c 100644 --- a/hphp/hack/test/nast/top_level.php.exp +++ b/hphp/hack/test/nast/top_level.php.exp @@ -10,68 +10,68 @@ (Stmt ([15:1-12], (Expr ((), [15:1-11], (Call (((), [15:1-9], (Id ([15:1-9], "\\My\\Full\\func_foo"))), [], [], None)))))); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [17:1-23]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), None); f_name = ([17:10-18], "\\func_foo"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; - f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [17:1-23]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), None); f_name = ([17:10-18], "\\func_foo"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [18:1-18]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), None); f_name = ([18:10-13], "\\foo"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; - f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [18:1-18]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), None); f_name = ([18:10-13], "\\foo"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "My\\Full"); + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "My\\Full"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [22:3-25]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), None); f_name = ([22:12-20], "\\My\\Full\\func_foo"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; - f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [22:3-25]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), None); f_name = ([22:12-20], "\\My\\Full\\func_foo"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "HH\\Lib\\Vec"); + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = (Some "HH\\Lib\\Vec"); ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [26:3-28]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((), None); f_name = ([26:12-17], "\\HH\\Lib\\Vec\\range"); + { f_span = [26:3-28]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((), None); f_name = ([26:12-17], "\\HH\\Lib\\Vec\\range"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (); param_type_hint = ((), None); param_is_variadic = false; - param_pos = [26:18-20]; param_name = "$_"; param_expr = None; - param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; + [{ param_annotation = (); param_type_hint = ((), None); param_is_variadic = false; + param_pos = [26:18-20]; param_name = "$_"; param_expr = None; + param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (); param_type_hint = ((), None); param_is_variadic = false; - param_pos = [26:22-24]; param_name = "$_"; param_expr = None; - param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; + { param_annotation = (); param_type_hint = ((), None); param_is_variadic = false; + param_pos = [26:22-24]; param_name = "$_"; param_expr = None; + param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) ] diff --git a/hphp/hack/test/nast/typeconsts/multiple-bounds_as-only.php.exp b/hphp/hack/test/nast/typeconsts/multiple-bounds_as-only.php.exp index c95b101c00a..b59c008dc19 100644 --- a/hphp/hack/test/nast/typeconsts/multiple-bounds_as-only.php.exp +++ b/hphp/hack/test/nast/typeconsts/multiple-bounds_as-only.php.exp @@ -29,5 +29,5 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) ] diff --git a/hphp/hack/test/tast/add_vector.php.exp b/hphp/hack/test/tast/add_vector.php.exp index 0e663ff313d..2b20dc9840b 100644 --- a/hphp/hack/test/tast/add_vector.php.exp +++ b/hphp/hack/test/tast/add_vector.php.exp @@ -85,7 +85,7 @@ c_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")); - c_emit_id = None; c_internal = false }); + c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [28:1-11]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -98,7 +98,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [29:1-21]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -112,7 +112,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [30:1-21]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -126,7 +126,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -176,4 +176,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/arith_plus.php.exp b/hphp/hack/test/tast/arith_plus.php.exp index e4e44c02ff4..6aa72049245 100644 --- a/hphp/hack/test/tast/arith_plus.php.exp +++ b/hphp/hack/test/tast/arith_plus.php.exp @@ -1,21 +1,21 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([3:21-24], (Hprim Tint)))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([3:21-24], (Hprim Tint)))); f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), (Some ([3:12-15], (Hprim Tint)))); - param_is_variadic = false; param_pos = [3:16-18]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), (Some ([3:12-15], (Hprim Tint)))); + param_is_variadic = false; param_pos = [3:16-18]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; - f_body = { fb_ast = [([4:3-17], (Return (Some ((int), [4:10-16], (Binop (Plus, ((int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:15-16], (Int "3"))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_body = { fb_ast = [([4:3-17], (Return (Some ((int), [4:10-16], (Binop (Plus, ((int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:15-16], (Int "3"))))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/array_order.php.exp b/hphp/hack/test/tast/array_order.php.exp index b74a156937c..0058877596d 100644 --- a/hphp/hack/test/tast/array_order.php.exp +++ b/hphp/hack/test/tast/array_order.php.exp @@ -2,14 +2,14 @@ Errors: [17:10-25] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [12:1-15:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([12:18-22], (Hprim Tvoid)))); - f_name = ([12:10-14], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [12:1-15:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([12:18-22], (Hprim Tvoid)))); + f_name = ([12:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -37,18 +37,18 @@ Errors: (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")) }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [17:1-30]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((_), None); f_name = ([17:10-25], "\\my_php_function"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; - f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [17:1-30]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((_), None); f_name = ([17:10-25], "\\my_php_function"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/async_lambda.php.exp b/hphp/hack/test/tast/async_lambda.php.exp index a57cd3e5fbc..cb303c013d3 100644 --- a/hphp/hack/test/tast/async_lambda.php.exp +++ b/hphp/hack/test/tast/async_lambda.php.exp @@ -1,33 +1,33 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-70]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:38-55], (Happly (([3:38-47], "\\HH\\Awaitable"), [([3:48-54], (Hprim Tstring))]))))); + { f_span = [3:1-70]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:38-55], (Happly (([3:38-47], "\\HH\\Awaitable"), [([3:48-54], (Hprim Tstring))]))))); f_name = ([3:16-25], "\\genString"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:26-32], (Hprim Tstring)))); - param_is_variadic = false; param_pos = [3:33-35]; param_name = "$s"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:26-32], (Hprim Tstring)))); + param_is_variadic = false; param_pos = [3:33-35]; param_name = "$s"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([3:58-68], (Return (Some ((string), [3:65-67], (Lvar ([3:65-67], $s))))))] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([3:58-68], (Return (Some ((string), [3:65-67], (Lvar ([3:65-67], $s))))))] }; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-12:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([5:18-22], (Hprim Tvoid)))); - f_name = ([5:10-14], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [5:1-12:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([5:18-22], (Hprim Tvoid)))); + f_name = ([5:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -37,10 +37,10 @@ (Binop ((Eq None), (((function(): Awaitable)), [6:3-6], (Lvar ([6:3-6], $f0))), (((function(): Awaitable)), [6:9-8:4], (Lfun ( - { f_span = [6:9-8:4]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; f_ret = ((Awaitable), None); - f_name = ([6:9-8:4], ";anonymous"); f_tparams = []; - f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [6:9-8:4]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; f_ret = ((Awaitable), None); + f_name = ([6:9-8:4], ";anonymous"); f_tparams = []; + f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -51,12 +51,12 @@ ((string), [7:12-34], (Await ((Awaitable), [7:18-34], - (Call ((((function(string $s): Awaitable)), [7:18-27], (Id ([7:18-27], "\\genString"))), + (Call ((((function(string $s): Awaitable)), [7:18-27], (Id ([7:18-27], "\\genString"))), [], [(Pnormal, ((string), [7:28-33], (String "foo")))], None))))) ))))) ] }; - f_fun_kind = FAsync; f_user_attributes = []; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))) ))))); @@ -66,15 +66,15 @@ (Binop ((Eq None), (((function(string $x): Awaitable)), [9:3-6], (Lvar ([9:3-6], $f1))), (((function(string $x): Awaitable)), [9:9-11:4], (Lfun ( - { f_span = [9:9-11:4]; f_readonly_this = None; - f_annotation = (); f_readonly_ret = None; - f_ret = ((Awaitable), None); f_name = ([9:9-11:4], ";anonymous"); + { f_span = [9:9-11:4]; f_readonly_this = None; + f_annotation = (); f_readonly_ret = None; + f_ret = ((Awaitable), None); f_name = ([9:9-11:4], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [9:15-17]; - param_name = "$x"; param_expr = None; param_readonly = None; - param_callconv = Pnormal; param_user_attributes = []; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [9:15-17]; + param_name = "$x"; param_expr = None; param_readonly = None; + param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -87,17 +87,17 @@ ((string), [10:12-31], (Await ((Awaitable), [10:18-31], - (Call ((((function(string $s): Awaitable)), [10:18-27], (Id ([10:18-27], "\\genString"))), + (Call ((((function(string $s): Awaitable)), [10:18-27], (Id ([10:18-27], "\\genString"))), [], [(Pnormal, ((string), [10:28-30], (Lvar ([10:28-30], $x))))], None))))) ))))) ] }; - f_fun_kind = FAsync; f_user_attributes = []; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))) ))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/awaitall.php.exp b/hphp/hack/test/tast/awaitall.php.exp index 2c03994a758..c7906f691a9 100644 --- a/hphp/hack/test/tast/awaitall.php.exp +++ b/hphp/hack/test/tast/awaitall.php.exp @@ -1,41 +1,41 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:26-40], (Happly (([3:26-35], "\\HH\\Awaitable"), [([3:36-39], (Hprim Tint))]))))); - f_name = ([3:16-22], "\\genInt"); f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:26-40], (Happly (([3:26-35], "\\HH\\Awaitable"), [([3:36-39], (Hprim Tint))]))))); + f_name = ([3:16-22], "\\genInt"); f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [7:1-9:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([7:29-46], (Happly (([7:29-38], "\\HH\\Awaitable"), [([7:39-45], (Hprim Tstring))]))))); - f_name = ([7:16-25], "\\genString"); f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([8:3-16], (Return (Some ((string), [8:10-15], (String "foo")))))] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + { f_span = [7:1-9:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([7:29-46], (Happly (([7:29-38], "\\HH\\Awaitable"), [([7:39-45], (Hprim Tstring))]))))); + f_name = ([7:16-25], "\\genString"); f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([8:3-16], (Return (Some ((string), [8:10-15], (String "foo")))))] }; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [11:1-17:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([11:21-36], (Happly (([11:21-30], "\\HH\\Awaitable"), [([11:31-35], (Hprim Tvoid))]))))); - f_name = ([11:16-17], "\\f"); f_tparams = []; f_where_constraints = []; + { f_span = [11:1-17:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([11:21-36], (Happly (([11:21-30], "\\HH\\Awaitable"), [([11:31-35], (Hprim Tvoid))]))))); + f_name = ([11:16-17], "\\f"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -50,6 +50,6 @@ ))) ] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/call_args.php.exp b/hphp/hack/test/tast/call_args.php.exp index c274b032b95..6038a1cf9ba 100644 --- a/hphp/hack/test/tast/call_args.php.exp +++ b/hphp/hack/test/tast/call_args.php.exp @@ -1,39 +1,39 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-42]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:35-39], (Hprim Tvoid)))); + { f_span = [3:1-42]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:35-39], (Hprim Tvoid)))); f_name = ([3:10-22], "\\takes_string"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:23-29], (Hprim Tstring)))); - param_is_variadic = false; param_pos = [3:30-32]; param_name = "$s"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:23-29], (Hprim Tstring)))); + param_is_variadic = false; param_pos = [3:30-32]; param_name = "$s"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-7:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([5:15-19], (Hprim Tvoid)))); - f_name = ([5:10-11], "\\f"); f_tparams = []; f_where_constraints = []; + { f_span = [5:1-7:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([5:15-19], (Hprim Tvoid)))); + f_name = ([5:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([6:3-25], (Expr ((void), [6:3-24], (Call ((((function(string $s): void)), [6:3-15], (Id ([6:3-15], "\\takes_string"))), [], [(Pnormal, ((string), [6:16-23], (String "hello")))], None))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/class_const.php.exp b/hphp/hack/test/tast/class_const.php.exp index 1dd11c1e469..c723556be29 100644 --- a/hphp/hack/test/tast/class_const.php.exp +++ b/hphp/hack/test/tast/class_const.php.exp @@ -21,4 +21,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/class_get.php.exp b/hphp/hack/test/tast/class_get.php.exp index 19b32afccca..e8d2047836c 100644 --- a/hphp/hack/test/tast/class_get.php.exp +++ b/hphp/hack/test/tast/class_get.php.exp @@ -38,4 +38,4 @@ c_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")); - c_emit_id = None; c_internal = false }) + c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/class_level_where_clauses/test_class_level_where_clauses.php.exp b/hphp/hack/test/tast/class_level_where_clauses/test_class_level_where_clauses.php.exp index a3cea2fb568..d4316d2c537 100644 --- a/hphp/hack/test/tast/class_level_where_clauses/test_class_level_where_clauses.php.exp +++ b/hphp/hack/test/tast/class_level_where_clauses/test_class_level_where_clauses.php.exp @@ -15,7 +15,7 @@ c_doc_comment = (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")); - c_emit_id = None; c_internal = false }); + c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [14:1-50]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -31,7 +31,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [16:1-66]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -52,7 +52,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [18:1-37]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -67,7 +67,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [20:1-43]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -82,4 +82,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/coeffects.php.exp b/hphp/hack/test/tast/coeffects.php.exp index 484a22cec7c..ad95a9debb1 100644 --- a/hphp/hack/test/tast/coeffects.php.exp +++ b/hphp/hack/test/tast/coeffects.php.exp @@ -1,13 +1,13 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:25-29], (Hprim Tvoid)))); - f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:25-29], (Hprim Tvoid)))); + f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = (Some ([3:13-23], [([3:14-22], (Happly (([3:14-22], "\\HH\\Contexts\\defaults"), [])))])); f_unsafe_ctxs = (Some ([3:13-23], [([3:14-22], (Happly (([3:14-22], "\\HH\\Contexts\\Unsafe\\defaults"), [])))])); f_body = @@ -18,26 +18,26 @@ (Binop ((Eq None), (((function(mixed $i): void)), [4:3-5], (Lvar ([4:3-5], $x))), (((function(mixed $i): void)), [4:8-23], (Lfun ( - { f_span = [4:8-23]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), None); - f_name = ([4:8-23], ";anonymous"); f_tparams = []; + { f_span = [4:8-23]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), None); + f_name = ([4:8-23], ";anonymous"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [4:9-11]; - param_name = "$i"; param_expr = None; param_readonly = None; - param_callconv = Pnormal; param_user_attributes = []; + [{ param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [4:9-11]; + param_name = "$i"; param_expr = None; param_readonly = None; + param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = (Some ([4:12-16], [([4:13-15], (Happly (([4:13-15], "\\HH\\Contexts\\rx"), [])))])); - f_unsafe_ctxs = (Some ([4:12-16], [([4:13-15], (Happly (([4:13-15], "\\HH\\Contexts\\Unsafe\\rx"), [])))])); - f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; + f_unsafe_ctxs = (Some ([4:12-16], [([4:13-15], (Happly (([4:13-15], "\\HH\\Contexts\\Unsafe\\rx"), [])))])); + f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }, []))) ))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/concurrent_error.php.exp b/hphp/hack/test/tast/concurrent_error.php.exp index 24cdf9470c2..ce12dca69fa 100644 --- a/hphp/hack/test/tast/concurrent_error.php.exp +++ b/hphp/hack/test/tast/concurrent_error.php.exp @@ -10,28 +10,28 @@ Errors: [3:27-41] But got `Awaitable` [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:27-41], (Happly (([3:27-36], "\\HH\\Awaitable"), [([3:37-40], (Hprim Tint))]))))); - f_name = ([3:16-23], "\\gen_int"); f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([3:27-41], (Happly (([3:27-36], "\\HH\\Awaitable"), [([3:37-40], (Hprim Tint))]))))); + f_name = ([3:16-23], "\\gen_int"); f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [7:1-13:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([7:24-38], (Happly (([7:24-33], "\\HH\\Awaitable"), [([7:34-37], (Hprim Tint))]))))); - f_name = ([7:16-20], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [7:1-13:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([7:24-38], (Happly (([7:24-33], "\\HH\\Awaitable"), [([7:34-37], (Hprim Tint))]))))); + f_name = ([7:16-20], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -54,6 +54,6 @@ Errors: (num), (int), Typing)))))) ] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/construct_unknown_class.php.exp b/hphp/hack/test/tast/construct_unknown_class.php.exp index 6b1f0f1cd97..791c7828dde 100644 --- a/hphp/hack/test/tast/construct_unknown_class.php.exp +++ b/hphp/hack/test/tast/construct_unknown_class.php.exp @@ -3,18 +3,18 @@ Errors: [4:14-21] Unbound name: `Unknown` (an object type) [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Unknown), (Some ([3:32-39], (Happly (([3:32-39], "\\Unknown"), []))))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Unknown), (Some ([3:32-39], (Happly (([3:32-39], "\\Unknown"), []))))); f_name = ([3:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (vec); param_type_hint = ((vec), (Some ([3:15-26], (Happly (([3:15-18], "\\HH\\vec"), [([3:19-25], (Hprim Tstring))]))))); - param_is_variadic = false; param_pos = [3:27-29]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (vec); param_type_hint = ((vec), (Some ([3:15-26], (Happly (([3:15-18], "\\HH\\vec"), [([3:19-25], (Hprim Tstring))]))))); + param_is_variadic = false; param_pos = [3:27-29]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -23,11 +23,11 @@ Errors: [([4:3-45], (Return (Some ((_), [4:10-44], - (New (((_), [4:14-21], (CI ([4:14-21], "\\Unknown"))), + (New (((_), [4:14-21], (CI ([4:14-21], "\\Unknown"))), [], [((int), [4:22-23], (Int "3")); ((string), [4:25-28], (String "s")); ((vec), [4:30-36], (ValCollection (Vec, None, [((int), [4:34-35], (Int "3"))])))], (Some ((vec), [4:41-43], (Lvar ([4:41-43], $x)))), (_))))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/contravariant_solve.php.exp b/hphp/hack/test/tast/contravariant_solve.php.exp index 854e6fed287..64f7273125f 100644 --- a/hphp/hack/test/tast/contravariant_solve.php.exp +++ b/hphp/hack/test/tast/contravariant_solve.php.exp @@ -11,7 +11,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [6:1-30]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -57,7 +57,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -85,7 +85,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -123,4 +123,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/do.php.exp b/hphp/hack/test/tast/control_flow/do.php.exp index 6c31ce06b73..281fdb5a0fc 100644 --- a/hphp/hack/test/tast/control_flow/do.php.exp +++ b/hphp/hack/test/tast/control_flow/do.php.exp @@ -1,21 +1,21 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-9:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:30-34], (Hprim Tvoid)))); + { f_span = [3:1-9:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:30-34], (Hprim Tvoid)))); f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:12-16], (Hprim Tbool)))); - param_is_variadic = false; param_pos = [3:17-19]; param_name = "$b"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:12-16], (Hprim Tbool)))); + param_is_variadic = false; param_pos = [3:17-19]; param_name = "$b"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (int); param_type_hint = ((int), (Some ([3:21-24], (Hprim Tint)))); - param_is_variadic = false; param_pos = [3:25-27]; param_name = "$a"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (int); param_type_hint = ((int), (Some ([3:21-24], (Hprim Tint)))); + param_is_variadic = false; param_pos = [3:25-27]; param_name = "$a"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -28,6 +28,6 @@ ((bool), [7:12-14], (Lvar ([7:12-14], $b)))))); ([8:3-6], (Expr ((string), [8:3-5], (Lvar ([8:3-5], $a)))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/do_throw_while.php.exp b/hphp/hack/test/tast/control_flow/do_throw_while.php.exp index 89efce51a91..2bd2a0f68ab 100644 --- a/hphp/hack/test/tast/control_flow/do_throw_while.php.exp +++ b/hphp/hack/test/tast/control_flow/do_throw_while.php.exp @@ -1,18 +1,18 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-7:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:44-48], (Hprim Tvoid)))); - f_name = ([3:10-30], "\\throwFromDoWhileLoop"); f_tparams = []; + { f_span = [3:1-7:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:44-48], (Hprim Tvoid)))); + f_name = ([3:10-30], "\\throwFromDoWhileLoop"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:31-35], (Hprim Tbool)))); - param_is_variadic = false; param_pos = [3:36-41]; param_name = "$cond"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:31-35], (Hprim Tbool)))); + param_is_variadic = false; param_pos = [3:36-41]; param_name = "$cond"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -23,12 +23,12 @@ [([5:5-40], (Throw ((Exception), [5:11-39], - (New (((Exception), [5:15-24], (CI ([5:15-24], "\\Exception"))), + (New (((Exception), [5:15-24], (CI ([5:15-24], "\\Exception"))), [], [((string), [5:25-38], (String "DoWhileBody"))], None, ((function(string $message=_, int $code=_, ?Exception $previous=_): void))))))) ], ((nothing), [6:12-17], (Lvar ([6:12-17], $cond)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/dos.php.exp b/hphp/hack/test/tast/control_flow/dos.php.exp index 76be34165ea..2f4ba486045 100644 --- a/hphp/hack/test/tast/control_flow/dos.php.exp +++ b/hphp/hack/test/tast/control_flow/dos.php.exp @@ -1,21 +1,21 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-26:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([5:30-34], (Hprim Tvoid)))); + { f_span = [5:1-26:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([5:30-34], (Hprim Tvoid)))); f_name = ([5:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([5:12-16], (Hprim Tbool)))); - param_is_variadic = false; param_pos = [5:17-19]; param_name = "$b"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([5:12-16], (Hprim Tbool)))); + param_is_variadic = false; param_pos = [5:17-19]; param_name = "$b"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (int); param_type_hint = ((int), (Some ([5:21-24], (Hprim Tint)))); - param_is_variadic = false; param_pos = [5:25-27]; param_name = "$a"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (int); param_type_hint = ((int), (Some ([5:21-24], (Hprim Tint)))); + param_is_variadic = false; param_pos = [5:25-27]; param_name = "$a"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -45,6 +45,6 @@ ((bool), [25:12-14], (Lvar ([25:12-14], $b)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/loop_cond.php.exp b/hphp/hack/test/tast/control_flow/loop_cond.php.exp index 4c73dec3f1c..a8176be34a2 100644 --- a/hphp/hack/test/tast/control_flow/loop_cond.php.exp +++ b/hphp/hack/test/tast/control_flow/loop_cond.php.exp @@ -10,7 +10,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -25,7 +25,7 @@ f_body = { fb_ast = [([6:3-18], (Return (Some ((A), [6:10-17], (New (((A), [6:14-15], (CI ([6:14-15], "\\A"))), [], [], None, (_)))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -54,7 +54,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -78,4 +78,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/while.php.exp b/hphp/hack/test/tast/control_flow/while.php.exp index a245f7a88b9..a4d1474fc99 100644 --- a/hphp/hack/test/tast/control_flow/while.php.exp +++ b/hphp/hack/test/tast/control_flow/while.php.exp @@ -1,21 +1,21 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-9:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:30-34], (Hprim Tvoid)))); + { f_span = [3:1-9:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:30-34], (Hprim Tvoid)))); f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:12-16], (Hprim Tbool)))); - param_is_variadic = false; param_pos = [3:17-19]; param_name = "$b"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:12-16], (Hprim Tbool)))); + param_is_variadic = false; param_pos = [3:17-19]; param_name = "$b"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (int); param_type_hint = ((int), (Some ([3:21-24], (Hprim Tint)))); - param_is_variadic = false; param_pos = [3:25-27]; param_name = "$a"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (int); param_type_hint = ((int), (Some ([3:21-24], (Hprim Tint)))); + param_is_variadic = false; param_pos = [3:25-27]; param_name = "$a"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -29,6 +29,6 @@ ))); ([8:3-6], (Expr (((int | string)), [8:3-5], (Lvar ([8:3-5], $a)))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/control_flow/while_throw.php.exp b/hphp/hack/test/tast/control_flow/while_throw.php.exp index 371513b6c27..e6315bff2a3 100644 --- a/hphp/hack/test/tast/control_flow/while_throw.php.exp +++ b/hphp/hack/test/tast/control_flow/while_throw.php.exp @@ -1,18 +1,18 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-7:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:44-48], (Hprim Tvoid)))); - f_name = ([3:10-30], "\\throwFromDoWhileLoop"); f_tparams = []; + { f_span = [3:1-7:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:44-48], (Hprim Tvoid)))); + f_name = ([3:10-30], "\\throwFromDoWhileLoop"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:31-35], (Hprim Tbool)))); - param_is_variadic = false; param_pos = [3:36-41]; param_name = "$cond"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (bool); param_type_hint = ((bool), (Some ([3:31-35], (Hprim Tbool)))); + param_is_variadic = false; param_pos = [3:36-41]; param_name = "$cond"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -24,12 +24,12 @@ ([5:5-40], (Throw ((Exception), [5:11-39], - (New (((Exception), [5:15-24], (CI ([5:15-24], "\\Exception"))), + (New (((Exception), [5:15-24], (CI ([5:15-24], "\\Exception"))), [], [((string), [5:25-38], (String "DoWhileBody"))], None, ((function(string $message=_, int $code=_, ?Exception $previous=_): void))))))) ] ))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/dict_attribute.php.exp b/hphp/hack/test/tast/dict_attribute.php.exp index d3488978a8a..bf9ef56fcec 100644 --- a/hphp/hack/test/tast/dict_attribute.php.exp +++ b/hphp/hack/test/tast/dict_attribute.php.exp @@ -40,7 +40,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [9:1-50]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -68,7 +69,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [10:1-49]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -96,7 +98,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [11:1-53]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -124,7 +127,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [12:1-53]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -152,7 +156,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [13:1-65]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -180,7 +185,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [14:1-63]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -208,7 +214,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [15:1-54]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -236,7 +243,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [16:1-59]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -264,7 +272,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [17:1-50]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -292,7 +301,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -340,7 +350,7 @@ } ]; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Class { c_span = [22:1-30:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -415,7 +425,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [32:1-33:16]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = Cenum; c_name = ([33:6-8], "\\EE"); @@ -450,7 +461,7 @@ } ]; c_enum = (Some { e_base = ([33:10-13], (Hprim Tint)); e_constraint = None; e_includes = [] }); - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Typedef { t_annotation = (); t_name = ([36:6-8], "\\tt"); t_tparams = []; t_constraint = None; t_kind = ([36:11-14], (Hprim Tint)); @@ -480,4 +491,5 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [35:1-36:15]; t_emit_id = None; t_is_ctx = false; t_internal = false }) \ No newline at end of file + t_span = [35:1-36:15]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/dynamic_member_access.php.exp b/hphp/hack/test/tast/dynamic_member_access.php.exp index 133b529f272..f1e50023cdf 100644 --- a/hphp/hack/test/tast/dynamic_member_access.php.exp +++ b/hphp/hack/test/tast/dynamic_member_access.php.exp @@ -1,32 +1,32 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-57]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), (Some ([3:33-39], (Hprim Tstring)))); - f_name = ([3:10-29], "\\returnsTheStringFoo"); f_tparams = []; - f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; - f_body = { fb_ast = [([3:42-55], (Return (Some ((string), [3:49-54], (String "foo")))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + { f_span = [3:1-57]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), (Some ([3:33-39], (Hprim Tstring)))); + f_name = ([3:10-29], "\\returnsTheStringFoo"); f_tparams = []; + f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; + f_body = { fb_ast = [([3:42-55], (Return (Some ((string), [3:49-54], (String "foo")))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [5:1-10:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([5:28-32], (Hprim Tvoid)))); + { f_span = [5:1-10:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([5:28-32], (Hprim Tvoid)))); f_name = ([5:10-14], "\\test"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (dynamic); param_type_hint = ((dynamic), (Some ([5:15-22], Hdynamic))); - param_is_variadic = false; param_pos = [5:23-25]; param_name = "$c"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (dynamic); param_type_hint = ((dynamic), (Some ([5:15-22], Hdynamic))); + param_is_variadic = false; param_pos = [5:23-25]; param_name = "$c"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -42,6 +42,6 @@ (dynamic), [9:8-29], (Call ((((function(): string)), [9:8-27], (Id ([9:8-27], "\\returnsTheStringFoo"))), [], [], None))), OG_nullthrows, Is_prop))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/eq_op.php.exp b/hphp/hack/test/tast/eq_op.php.exp index 519fb39858d..0625f0e2e39 100644 --- a/hphp/hack/test/tast/eq_op.php.exp +++ b/hphp/hack/test/tast/eq_op.php.exp @@ -1,17 +1,17 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-12:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([3:21-24], (Hprim Tint)))); + { f_span = [3:1-12:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([3:21-24], (Hprim Tint)))); f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), (Some ([3:12-15], (Hprim Tint)))); - param_is_variadic = false; param_pos = [3:16-18]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), (Some ([3:12-15], (Hprim Tint)))); + param_is_variadic = false; param_pos = [3:16-18]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -36,6 +36,6 @@ ((int), [9:19-20], (Int "4"))))))); ([11:3-13], (Return (Some ((int), [11:10-12], (Lvar ([11:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/fake_member.php.exp b/hphp/hack/test/tast/fake_member.php.exp index c3b57319565..d9c5127620c 100644 --- a/hphp/hack/test/tast/fake_member.php.exp +++ b/hphp/hack/test/tast/fake_member.php.exp @@ -35,4 +35,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/file_attributes_from_multiple_namespaces.php.exp b/hphp/hack/test/tast/file_attributes_from_multiple_namespaces.php.exp index 958fa0f9150..48d4a33e49d 100644 --- a/hphp/hack/test/tast/file_attributes_from_multiple_namespaces.php.exp +++ b/hphp/hack/test/tast/file_attributes_from_multiple_namespaces.php.exp @@ -25,7 +25,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [13:1-45]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -53,4 +54,5 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/file_attributes_in_namespaces.php.exp b/hphp/hack/test/tast/file_attributes_in_namespaces.php.exp index 47f0531c488..af5f09d29a6 100644 --- a/hphp/hack/test/tast/file_attributes_in_namespaces.php.exp +++ b/hphp/hack/test/tast/file_attributes_in_namespaces.php.exp @@ -19,7 +19,8 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [9:1-18]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -41,4 +42,5 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/file_attributes_in_namespaces_with_namespaced_values.php.exp b/hphp/hack/test/tast/file_attributes_in_namespaces_with_namespaced_values.php.exp index aa889ed3a33..cd468de4b66 100644 --- a/hphp/hack/test/tast/file_attributes_in_namespaces_with_namespaced_values.php.exp +++ b/hphp/hack/test/tast/file_attributes_in_namespaces_with_namespaced_values.php.exp @@ -56,7 +56,8 @@ Errors: ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [8:3-10:4]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -86,7 +87,8 @@ Errors: ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }); (Class { c_span = [16:3-25]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -111,4 +113,5 @@ Errors: ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false } } ]; - c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_enum = None; c_doc_comment = None; c_emit_id = None; c_internal = false; + c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/finally.php.exp b/hphp/hack/test/tast/finally.php.exp index d10befd374b..6c7b76fb324 100644 --- a/hphp/hack/test/tast/finally.php.exp +++ b/hphp/hack/test/tast/finally.php.exp @@ -3,29 +3,29 @@ Errors: [4:45-52] The field `foo` is not defined in this shape [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [4:1-6:2]; f_readonly_this = None; f_annotation = (); + { f_span = [4:1-6:2]; f_readonly_this = None; f_annotation = (); f_readonly_ret = None; f_ret = ((Awaitable), (Some ([4:35-53], (Happly (([4:35-44], "\\HH\\Awaitable"), [([4:45-52], (Hshape { nsi_allows_unknown_fields = false; nsi_field_map = [] }))]))))); - f_name = ([4:16-31], "\\gen_empty_shape"); f_tparams = []; f_where_constraints = []; - f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([5:3-18], (Return (Some ((shape()), [5:10-17], (Shape [])))))] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + f_name = ([4:16-31], "\\gen_empty_shape"); f_tparams = []; f_where_constraints = []; + f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([5:3-18], (Return (Some ((shape()), [5:10-17], (Shape [])))))] }; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [8:1-16:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((Awaitable), (Some ([8:24-39], (Happly (([8:24-33], "\\HH\\Awaitable"), [([8:34-38], (Hprim Tvoid))]))))); - f_name = ([8:16-20], "\\test"); f_tparams = []; f_where_constraints = []; + { f_span = [8:1-16:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((Awaitable), (Some ([8:24-39], (Happly (([8:24-33], "\\HH\\Awaitable"), [([8:34-38], (Hprim Tvoid))]))))); + f_name = ([8:16-20], "\\test"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = @@ -54,6 +54,6 @@ Errors: ))) ] }; - f_fun_kind = FAsync; f_user_attributes = []; f_external = false; + f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/fun_meth_variadic.php.exp b/hphp/hack/test/tast/fun_meth_variadic.php.exp index c07b90167d3..7a464dd61ec 100644 --- a/hphp/hack/test/tast/fun_meth_variadic.php.exp +++ b/hphp/hack/test/tast/fun_meth_variadic.php.exp @@ -19,7 +19,7 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -52,7 +52,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Class { c_span = [11:1-13:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -80,4 +80,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/array.php.exp b/hphp/hack/test/tast/global_inference/array.php.exp index d2798632777..2806a03a330 100644 --- a/hphp/hack/test/tast/global_inference/array.php.exp +++ b/hphp/hack/test/tast/global_inference/array.php.exp @@ -3,22 +3,22 @@ Errors: [5:3-5] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-11:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([6:4-8], (Hprim Tvoid)))); + { f_span = [3:1-11:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([6:4-8], (Hprim Tvoid)))); f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (nothing); param_type_hint = ((nothing), None); - param_is_variadic = false; param_pos = [4:3-5]; param_name = "$a"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (nothing); param_type_hint = ((nothing), None); + param_is_variadic = false; param_pos = [4:3-5]; param_name = "$a"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (nothing); param_type_hint = ((nothing), None); - param_is_variadic = false; param_pos = [5:3-5]; param_name = "$b"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (nothing); param_type_hint = ((nothing), None); + param_is_variadic = false; param_pos = [5:3-5]; param_name = "$b"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -31,6 +31,6 @@ Errors: [(((string), [8:5-8], (String "a")), ((nothing), [8:12-14], (Lvar ([8:12-14], $a)))); (((string), [9:5-8], (String "b")), ((nothing), [9:12-14], (Lvar ([9:12-14], $b))))]))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain.php.exp b/hphp/hack/test/tast/global_inference/call_chain.php.exp index 957f1aa86a7..a733f7ecd2e 100644 --- a/hphp/hack/test/tast/global_inference/call_chain.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain.php.exp @@ -7,38 +7,38 @@ Errors: [3:13-15] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f1"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; - f_body = { fb_ast = [([4:3-17], (Return (Some ((int), [4:10-16], (Binop (Plus, ((int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:15-16], (Int "0"))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_body = { fb_ast = [([4:3-17], (Return (Some ((int), [4:10-16], (Binop (Plus, ((int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:15-16], (Int "0"))))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f2"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -47,22 +47,22 @@ Errors: [([4:3-17], (Return (Some ((int), [4:10-16], (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((int), [4:13-15], (Lvar ([4:13-15], $x))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f3"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\f3"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -71,6 +71,6 @@ Errors: [([4:3-17], (Return (Some ((int), [4:10-16], (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\f2"))), [], [(Pnormal, ((int), [4:13-15], (Lvar ([4:13-15], $x))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain_evil.php.exp b/hphp/hack/test/tast/global_inference/call_chain_evil.php.exp index eab8420d9cc..01f332f1802 100644 --- a/hphp/hack/test/tast/global_inference/call_chain_evil.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain_evil.php.exp @@ -8,37 +8,37 @@ Errors: [3:10-11] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f1"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f2"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -48,22 +48,22 @@ Errors: (Return (Some ((string), [4:10-16], (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((string), [4:13-15], (Lvar ([4:13-15], $x))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f3"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f3"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -72,7 +72,7 @@ Errors: [([4:3-21], (Return (Some ((string), [4:10-20], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f2"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f2"))), [], [(Pnormal, ((string), [4:13-19], (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f1"))), [], [(Pnormal, ((string), [4:16-18], (Lvar ([4:16-18], $x))))], None)))) @@ -80,29 +80,29 @@ Errors: None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-11], "\\f"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-11], "\\f"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-25], (Return (Some ((string), [4:10-24], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f3"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f3"))), [], [(Pnormal, ((string), [4:13-23], - (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), + (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), [], [(Pnormal, ((string), [4:16-22], (Call ((((function(string $x): string)), [4:16-18], (Id ([4:16-18], "\\f1"))), [], [(Pnormal, ((string), [4:19-21], (String "")))], None))))], @@ -111,6 +111,6 @@ Errors: None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain_evil2.php.exp b/hphp/hack/test/tast/global_inference/call_chain_evil2.php.exp index 81e934f2137..163b594b87c 100644 --- a/hphp/hack/test/tast/global_inference/call_chain_evil2.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain_evil2.php.exp @@ -8,37 +8,37 @@ Errors: [3:10-11] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f1"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f2"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -48,22 +48,22 @@ Errors: (Return (Some ((string), [4:10-16], (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((string), [4:13-15], (Lvar ([4:13-15], $x))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f3"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-12], "\\f3"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -72,7 +72,7 @@ Errors: [([4:3-21], (Return (Some ((string), [4:10-20], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((string), [4:13-19], (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), [], [(Pnormal, ((string), [4:16-18], (Lvar ([4:16-18], $x))))], None)))) @@ -80,29 +80,29 @@ Errors: None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-11], "\\f"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), None); f_name = ([3:10-11], "\\f"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-25], (Return (Some ((string), [4:10-24], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((string), [4:13-23], - (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), + (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), [], [(Pnormal, ((string), [4:16-22], (Call ((((function(string $x): string)), [4:16-18], (Id ([4:16-18], "\\f3"))), [], [(Pnormal, ((string), [4:19-21], (String "")))], None))))], @@ -111,6 +111,6 @@ Errors: None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain_evil_evil.php.exp b/hphp/hack/test/tast/global_inference/call_chain_evil_evil.php.exp index 8d93c1e1afd..12e7fd88232 100644 --- a/hphp/hack/test/tast/global_inference/call_chain_evil_evil.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain_evil_evil.php.exp @@ -32,7 +32,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\B"); c_tparams = []; c_extends = [([3:17-18], (Happly (([3:17-18], "\\A"), [])))]; @@ -68,7 +68,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\C"); c_tparams = []; c_extends = [([3:17-18], (Happly (([3:17-18], "\\B"), [])))]; @@ -110,7 +110,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Fun + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; @@ -144,4 +144,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain_evil_evil1.php.exp b/hphp/hack/test/tast/global_inference/call_chain_evil_evil1.php.exp index 0c2adb240ad..60bedb49859 100644 --- a/hphp/hack/test/tast/global_inference/call_chain_evil_evil1.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain_evil_evil1.php.exp @@ -30,7 +30,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\B"); c_tparams = []; c_extends = [([3:17-18], (Happly (([3:17-18], "\\A"), [])))]; @@ -66,7 +66,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Fun + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; @@ -108,4 +108,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/call_chain_evil_evil1_static.php.exp b/hphp/hack/test/tast/global_inference/call_chain_evil_evil1_static.php.exp index ed673fa5cbb..6cd7a4f57a7 100644 --- a/hphp/hack/test/tast/global_inference/call_chain_evil_evil1_static.php.exp +++ b/hphp/hack/test/tast/global_inference/call_chain_evil_evil1_static.php.exp @@ -30,7 +30,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\B"); c_tparams = []; c_extends = [([3:17-18], (Happly (([3:17-18], "\\A"), [])))]; @@ -66,7 +66,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Fun + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; @@ -94,4 +94,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/fun_composed.php.exp b/hphp/hack/test/tast/global_inference/fun_composed.php.exp index 6cb569f562a..72c0e9d3fc9 100644 --- a/hphp/hack/test/tast/global_inference/fun_composed.php.exp +++ b/hphp/hack/test/tast/global_inference/fun_composed.php.exp @@ -8,88 +8,88 @@ Errors: [3:10-11] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g1"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g2"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g3"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g3"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-24], (Return (Some ((int), [4:10-23], - (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\g3"))), + (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\g3"))), [], [(Pnormal, ((int), [4:13-22], - (Call ((((function(int $x): int)), [4:13-15], (Id ([4:13-15], "\\g2"))), + (Call ((((function(int $x): int)), [4:13-15], (Id ([4:13-15], "\\g2"))), [], [(Pnormal, ((int), [4:16-21], (Call ((((function(int $x): int)), [4:16-18], (Id ([4:16-18], "\\g1"))), [], [(Pnormal, ((int), [4:19-20], (Int "0")))], None))))], None)))) ], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/fun_composed_small.php.exp b/hphp/hack/test/tast/global_inference/fun_composed_small.php.exp index 30f3541087a..d3730f0e613 100644 --- a/hphp/hack/test/tast/global_inference/fun_composed_small.php.exp +++ b/hphp/hack/test/tast/global_inference/fun_composed_small.php.exp @@ -6,62 +6,62 @@ Errors: [3:10-11] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g1"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g2"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-12], "\\g2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:13-15]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-20], (Return (Some ((int), [4:10-19], - (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\g2"))), + (Call ((((function(int $x): int)), [4:10-12], (Id ([4:10-12], "\\g2"))), [], [(Pnormal, ((int), [4:13-18], (Call ((((function(int $x): int)), [4:13-15], (Id ([4:13-15], "\\g1"))), [], [(Pnormal, ((int), [4:16-17], (Int "0")))], None))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/id_composed.php.exp b/hphp/hack/test/tast/global_inference/id_composed.php.exp index 24d09586da5..67a9f696177 100644 --- a/hphp/hack/test/tast/global_inference/id_composed.php.exp +++ b/hphp/hack/test/tast/global_inference/id_composed.php.exp @@ -4,50 +4,50 @@ Errors: [3:10-11] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\g"); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\g"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:12-14]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:12-14]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); - f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([3:10-11], "\\f"); + f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-21], (Return (Some ((int), [4:10-20], - (Call ((((function(int $x): int)), [4:10-11], (Id ([4:10-11], "\\g"))), + (Call ((((function(int $x): int)), [4:10-11], (Id ([4:10-11], "\\g"))), [], [(Pnormal, ((int), [4:12-19], - (Call ((((function(int $x): int)), [4:12-13], (Id ([4:12-13], "\\g"))), + (Call ((((function(int $x): int)), [4:12-13], (Id ([4:12-13], "\\g"))), [], [(Pnormal, ((int), [4:14-18], (Call ((((function(int $x): int)), [4:14-15], (Id ([4:14-15], "\\g"))), [], [(Pnormal, ((int), [4:16-17], (Int "0")))], None))))], None)))) ], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/map.php.exp b/hphp/hack/test/tast/global_inference/map.php.exp index a5b1b801930..14b791f89bc 100644 --- a/hphp/hack/test/tast/global_inference/map.php.exp +++ b/hphp/hack/test/tast/global_inference/map.php.exp @@ -2,18 +2,18 @@ Errors: [4:10-13] Was expecting a return type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [4:1-9:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), None); f_name = ([4:10-13], "\\foo"); + { f_span = [4:1-9:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), None); f_name = ([4:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (Map); param_type_hint = ((Map), (Some ([4:14-17], (Happly (([4:14-17], "\\HH\\Map"), []))))); - param_is_variadic = false; param_pos = [4:18-20]; param_name = "$m"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (Map); param_type_hint = ((Map), (Some ([4:14-17], (Happly (([4:14-17], "\\HH\\Map"), []))))); + param_is_variadic = false; param_pos = [4:18-20]; param_name = "$m"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -25,6 +25,6 @@ Errors: (Binop ((Eq None), ((int), [6:3-12], (Array_get (((Map), [6:3-5], (Lvar ([6:3-5], $m))), (Some ((string), [6:6-11], (String "hey")))))), ((int), [6:15-17], (Int "40"))))))); ([8:3-19], (Return (Some ((int), [8:10-18], (Array_get (((Map), [8:10-12], (Lvar ([8:10-12], $m))), (Some ((string), [8:13-17], (String "ho")))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/mymap.php.exp b/hphp/hack/test/tast/global_inference/mymap.php.exp index 46065e22f2d..61a701c2bc9 100644 --- a/hphp/hack/test/tast/global_inference/mymap.php.exp +++ b/hphp/hack/test/tast/global_inference/mymap.php.exp @@ -37,7 +37,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Class + fd_internal = false; fd_module = None })[(Class { c_span = [3:1-8:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-12], "\\MyMap"); @@ -85,4 +85,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/one_two_three.php.exp b/hphp/hack/test/tast/global_inference/one_two_three.php.exp index 5c552672a08..4d04f0c2fb4 100644 --- a/hphp/hack/test/tast/global_inference/one_two_three.php.exp +++ b/hphp/hack/test/tast/global_inference/one_two_three.php.exp @@ -22,7 +22,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-12], "\\Three"); c_tparams = []; c_extends = [([3:21-24], (Happly (([3:21-24], "\\Two"), [])))]; @@ -43,7 +43,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Class + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-10], "\\Two"); c_tparams = []; c_extends = [([3:19-22], (Happly (([3:19-22], "\\One"), [])))]; @@ -64,4 +64,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters.php.exp index b1bc086ad49..d60664e61a7 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters.php.exp @@ -3,18 +3,18 @@ Errors: [10:14-16] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-8:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([3:20-23], (Hprim Tint)))); + { f_span = [3:1-8:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([3:20-23], (Hprim Tint)))); f_name = ([3:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -26,27 +26,27 @@ Errors: [([4:3-6:4], (AssertEnv (Refinement, {$x}))); ([Pos.none], Noop)]))); ([7:3-19], (Return (Some ((int), [7:10-18], (Cast (([7:11-14], (Hprim Tint)), (((mixed & not int)), [7:16-18], (Lvar ([7:16-18], $x)))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [10:1-12:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([10:20-23], (Hprim Tint)))); + { f_span = [10:1-12:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([10:20-23], (Hprim Tint)))); f_name = ([10:10-13], "\\bar"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [10:14-16]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [10:14-16]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; - f_body = { fb_ast = [([11:3-17], (Return (Some ((int), [11:10-16], (Binop (Plus, ((int), [11:10-12], (Lvar ([11:10-12], $x))), ((int), [11:15-16], (Int "4"))))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_body = { fb_ast = [([11:3-17], (Return (Some ((int), [11:10-16], (Binop (Plus, ((int), [11:10-12], (Lvar ([11:10-12], $x))), ((int), [11:15-16], (Int "4"))))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters_constructor.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters_constructor.php.exp index 3995184d760..dc372787ed5 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters_constructor.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_inferred_parameters_constructor.php.exp @@ -29,7 +29,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -49,4 +49,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call.php.exp index bfd5638a9e7..6c4a9b6286e 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call.php.exp @@ -2,43 +2,43 @@ Errors: [3:14-16] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:19-23], (Hprim Tvoid)))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:19-23], (Hprim Tvoid)))); f_name = ([3:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:5-13], (Expr ((void), [4:5-12], (Call ((((function(int $_): void)), [4:5-8], (Id ([4:5-8], "\\bar"))), [], [(Pnormal, ((int), [4:9-11], (Lvar ([4:9-11], $x))))], None)))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [7:1-30]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([7:23-27], (Hprim Tvoid)))); + { f_span = [7:1-30]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([7:23-27], (Hprim Tvoid)))); f_name = ([7:10-13], "\\bar"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), (Some ([7:14-17], (Hprim Tint)))); - param_is_variadic = false; param_pos = [7:18-20]; param_name = "$_"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), (Some ([7:14-17], (Hprim Tint)))); + param_is_variadic = false; param_pos = [7:18-20]; param_name = "$_"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call_method.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call_method.php.exp index fa9963c21ae..8334a0600dc 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call_method.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_call_method.php.exp @@ -29,7 +29,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -49,4 +49,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_indirect.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_indirect.php.exp index b79f3fee520..32b5a1ef1a8 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_indirect.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_indirect.php.exp @@ -10,45 +10,45 @@ Errors: [15:36-38] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([3:30-33], (Hprim Tint)))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([3:30-33], (Hprim Tint)))); f_name = ([3:10-23], "\\accessorentry"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (nothing); param_type_hint = ((nothing), None); - param_is_variadic = false; param_pos = [3:24-26]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (nothing); param_type_hint = ((nothing), None); + param_is_variadic = false; param_pos = [3:24-26]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-18], (Return (Some ((nothing), [4:10-17], (Obj_get (((nothing), [4:10-12], (Lvar ([4:10-12], $x))), ((nothing), [4:14-17], (Id ([4:14-17], "foo"))), OG_nullthrows, Is_prop))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [7:1-9:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((int), (Some ([7:34-37], (Hprim Tint)))); + { f_span = [7:1-9:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((int), (Some ([7:34-37], (Hprim Tint)))); f_name = ([7:10-23], "\\accessorarray"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (KeyedContainer); param_type_hint = ((KeyedContainer), None); - param_is_variadic = false; param_pos = [7:24-26]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (KeyedContainer); param_type_hint = ((KeyedContainer), None); + param_is_variadic = false; param_pos = [7:24-26]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [7:28-30]; param_name = "$i"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [7:28-30]; param_name = "$i"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -57,27 +57,27 @@ Errors: [([8:3-17], (Return (Some ((nothing), [8:10-16], (Array_get (((KeyedContainer), [8:10-12], (Lvar ([8:10-12], $x))), (Some ((mixed), [8:13-15], (Lvar ([8:13-15], $i)))))))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [11:1-13:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([11:29-33], (Hprim Tvoid)))); + { f_span = [11:1-13:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([11:29-33], (Hprim Tvoid)))); f_name = ([11:10-18], "\\mutentry"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [11:19-21]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [11:19-21]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [11:23-25]; param_name = "$w"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [11:23-25]; param_name = "$w"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -93,31 +93,31 @@ Errors: ((mixed), [12:13-15], (Lvar ([12:13-15], $w)))))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [15:1-17:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([15:42-46], (Hprim Tvoid)))); + { f_span = [15:1-17:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([15:42-46], (Hprim Tvoid)))); f_name = ([15:10-18], "\\mutarray"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (vec); param_type_hint = ((vec), (Some ([15:19-27], (Happly (([15:19-22], "\\HH\\vec"), [([15:23-26], (Hprim Tint))]))))); - param_is_variadic = false; param_pos = [15:28-30]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (vec); param_type_hint = ((vec), (Some ([15:19-27], (Happly (([15:19-22], "\\HH\\vec"), [([15:23-26], (Hprim Tint))]))))); + param_is_variadic = false; param_pos = [15:28-30]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [15:32-34]; param_name = "$i"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [15:32-34]; param_name = "$i"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None }; - { param_annotation = (mixed); param_type_hint = ((mixed), None); - param_is_variadic = false; param_pos = [15:36-38]; param_name = "$w"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + { param_annotation = (mixed); param_type_hint = ((mixed), None); + param_is_variadic = false; param_pos = [15:36-38]; param_name = "$w"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -130,6 +130,6 @@ Errors: ((mixed), [16:12-14], (Lvar ([16:12-14], $w)))))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_method.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_method.php.exp index 1bff16079f8..1d31ac83727 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_method.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_method.php.exp @@ -27,4 +27,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_survive_assignment.php.exp b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_survive_assignment.php.exp index 389a729da2f..284a1339d71 100644 --- a/hphp/hack/test/tast/global_inference/params/type_hint_parameter_survive_assignment.php.exp +++ b/hphp/hack/test/tast/global_inference/params/type_hint_parameter_survive_assignment.php.exp @@ -2,18 +2,18 @@ Errors: [3:14-16] Was expecting a type hint [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-6:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([3:19-23], (Hprim Tvoid)))); + { f_span = [3:1-6:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([3:19-23], (Hprim Tvoid)))); f_name = ([3:10-13], "\\foo"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), None); - param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), None); + param_is_variadic = false; param_pos = [3:14-16]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -22,26 +22,26 @@ Errors: [([4:5-13], (Expr ((int), [4:5-12], (Binop ((Eq None), ((int), [4:5-7], (Lvar ([4:5-7], $y))), ((int), [4:10-12], (Lvar ([4:10-12], $x)))))))); ([5:5-13], (Expr ((void), [5:5-12], (Call ((((function(int $_): void)), [5:5-8], (Id ([5:5-8], "\\bar"))), [], [(Pnormal, ((int), [5:9-11], (Lvar ([5:9-11], $y))))], None)))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [8:1-30]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((void), (Some ([8:23-27], (Hprim Tvoid)))); + { f_span = [8:1-30]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((void), (Some ([8:23-27], (Hprim Tvoid)))); f_name = ([8:10-13], "\\bar"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (int); param_type_hint = ((int), (Some ([8:14-17], (Hprim Tint)))); - param_is_variadic = false; param_pos = [8:18-20]; param_name = "$_"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (int); param_type_hint = ((int), (Some ([8:14-17], (Hprim Tint)))); + param_is_variadic = false; param_pos = [8:18-20]; param_name = "$_"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/partial_annot.php.exp b/hphp/hack/test/tast/global_inference/partial_annot.php.exp index 20089e28379..7f1d90deba5 100644 --- a/hphp/hack/test/tast/global_inference/partial_annot.php.exp +++ b/hphp/hack/test/tast/global_inference/partial_annot.php.exp @@ -30,7 +30,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Class + fd_internal = false; fd_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\A"); @@ -54,4 +54,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/partial_annot_where.php.exp b/hphp/hack/test/tast/global_inference/partial_annot_where.php.exp index 35f98b67c88..c9f1781a705 100644 --- a/hphp/hack/test/tast/global_inference/partial_annot_where.php.exp +++ b/hphp/hack/test/tast/global_inference/partial_annot_where.php.exp @@ -30,7 +30,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Class + fd_internal = false; fd_module = None })[(Class { c_span = [3:1-7:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); c_name = ([3:7-8], "\\A"); @@ -54,4 +54,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/inherit.php.exp b/hphp/hack/test/tast/global_inference/properties/inherit.php.exp index 96c91da5bfd..9445a495814 100644 --- a/hphp/hack/test/tast/global_inference/properties/inherit.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/inherit.php.exp @@ -20,7 +20,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [7:1-9:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -40,4 +40,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_assignment.php.exp b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_assignment.php.exp index 85051fdb7fd..9f21d5b813e 100644 --- a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_assignment.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_assignment.php.exp @@ -69,4 +69,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_constructor.php.exp b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_constructor.php.exp index dc977637368..d05a9e49205 100644 --- a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_constructor.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_constructor.php.exp @@ -43,7 +43,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -63,7 +63,7 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -91,4 +91,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_getter.php.exp b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_getter.php.exp index 500b2806787..f8c23b26a8d 100644 --- a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_getter.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_getter.php.exp @@ -59,7 +59,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -94,7 +94,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -114,4 +114,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_initializer.php.exp b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_initializer.php.exp index 944ada9f521..bd8165a91d0 100644 --- a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_initializer.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_initializer.php.exp @@ -25,4 +25,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_setter.php.exp b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_setter.php.exp index 5fa32bc77bd..d5615fb0b4b 100644 --- a/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_setter.php.exp +++ b/hphp/hack/test/tast/global_inference/properties/type_hint_inferred_property_setter.php.exp @@ -51,7 +51,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -74,4 +74,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/reinfer_types/call_chain_evil.php.exp b/hphp/hack/test/tast/global_inference/reinfer_types/call_chain_evil.php.exp index cce1ef63c41..090298aeb13 100644 --- a/hphp/hack/test/tast/global_inference/reinfer_types/call_chain_evil.php.exp +++ b/hphp/hack/test/tast/global_inference/reinfer_types/call_chain_evil.php.exp @@ -1,36 +1,36 @@ [(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), (Some ([3:24-31], Hdynamic))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), (Some ([3:24-31], Hdynamic))); f_name = ([3:10-12], "\\f1"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-18], Hmixed))); - param_is_variadic = false; param_pos = [3:19-21]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-18], Hmixed))); + param_is_variadic = false; param_pos = [3:19-21]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; - f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((string), [4:10-12], (Lvar ([4:10-12], $x))))))] }; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), (Some ([3:26-31], Hmixed))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), (Some ([3:26-31], Hmixed))); f_name = ([3:10-12], "\\f2"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-20], Hdynamic))); - param_is_variadic = false; param_pos = [3:21-23]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-20], Hdynamic))); + param_is_variadic = false; param_pos = [3:21-23]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -40,22 +40,22 @@ (Return (Some ((string), [4:10-16], (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f1"))), [], [(Pnormal, ((string), [4:13-15], (Lvar ([4:13-15], $x))))], None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), (Some ([3:24-29], Hmixed))); + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), (Some ([3:24-29], Hmixed))); f_name = ([3:10-12], "\\f3"); f_tparams = []; f_where_constraints = []; f_params = - [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-18], Hmixed))); - param_is_variadic = false; param_pos = [3:19-21]; param_name = "$x"; - param_expr = None; param_readonly = None; param_callconv = Pnormal; + [{ param_annotation = (string); param_type_hint = ((string), (Some ([3:13-18], Hmixed))); + param_is_variadic = false; param_pos = [3:19-21]; param_name = "$x"; + param_expr = None; param_readonly = None; param_callconv = Pnormal; param_user_attributes = []; param_visibility = None } ]; f_ctxs = None; f_unsafe_ctxs = None; @@ -64,7 +64,7 @@ [([4:3-21], (Return (Some ((string), [4:10-20], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f2"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f2"))), [], [(Pnormal, ((string), [4:13-19], (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f1"))), [], [(Pnormal, ((string), [4:16-18], (Lvar ([4:16-18], $x))))], None)))) @@ -72,29 +72,29 @@ None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Fun + fd_internal = false; fd_module = None })[(Fun { fd_namespace = - { Namespace_env.ns_ns_uses = ; ns_class_uses = ; - ns_fun_uses = ; ns_const_uses = ; ns_name = None; + { Namespace_env.ns_ns_uses = ; ns_class_uses = ; + ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; fd_file_attributes = []; fd_mode = Mstrict; fd_fun = - { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); - f_readonly_ret = None; f_ret = ((string), (Some ([3:15-22], Hdynamic))); - f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; + { f_span = [3:1-5:2]; f_readonly_this = None; f_annotation = (); + f_readonly_ret = None; f_ret = ((string), (Some ([3:15-22], Hdynamic))); + f_name = ([3:10-11], "\\f"); f_tparams = []; f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-25], (Return (Some ((string), [4:10-24], - (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f3"))), + (Call ((((function(string $x): string)), [4:10-12], (Id ([4:10-12], "\\f3"))), [], [(Pnormal, ((string), [4:13-23], - (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), + (Call ((((function(string $x): string)), [4:13-15], (Id ([4:13-15], "\\f2"))), [], [(Pnormal, ((string), [4:16-22], (Call ((((function(string $x): string)), [4:16-18], (Id ([4:16-18], "\\f1"))), [], [(Pnormal, ((string), [4:19-21], (String "")))], None))))], @@ -103,6 +103,6 @@ None)))))) ] }; - f_fun_kind = FSync; f_user_attributes = []; f_external = false; + f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/reinfer_types/return_type_awaitable.php.exp b/hphp/hack/test/tast/global_inference/reinfer_types/return_type_awaitable.php.exp index 4cb7ffab9e8..8757af81ade 100644 --- a/hphp/hack/test/tast/global_inference/reinfer_types/return_type_awaitable.php.exp +++ b/hphp/hack/test/tast/global_inference/reinfer_types/return_type_awaitable.php.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((int), [4:10-12], (Lvar ([4:10-12], $x))))))] }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Class { c_span = [7:1-11:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -45,4 +45,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/reinfer_types/unsafe_type_fixme.php.exp b/hphp/hack/test/tast/global_inference/reinfer_types/unsafe_type_fixme.php.exp index 981c304a721..e06c653fc98 100644 --- a/hphp/hack/test/tast/global_inference/reinfer_types/unsafe_type_fixme.php.exp +++ b/hphp/hack/test/tast/global_inference/reinfer_types/unsafe_type_fixme.php.exp @@ -8,7 +8,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [2:1-35]; t_emit_id = None; t_is_ctx = false; t_internal = false })[(Typedef + t_span = [2:1-35]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None })[(Typedef { t_annotation = (); t_name = ([4:6-26], "\\UNSAFE_TYPE_HH_FIXME"); t_tparams = []; t_constraint = None; t_kind = ([4:29-50], (Happly (([4:29-50], "\\UNSAFE_TYPE_HH_FIXME_"), []))); t_user_attributes = []; t_file_attributes = []; t_mode = Mstrict; @@ -17,7 +18,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [4:1-51]; t_emit_id = None; t_is_ctx = false; t_internal = false })[(Fun + t_span = [4:1-51]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None })[(Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; @@ -30,7 +32,7 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-16], (Return (Some ((string), [4:10-15], (String "foo")))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false })[(Class + fd_internal = false; fd_module = None })[(Class { c_span = [2:1-4:2]; c_annotation = (); c_mode = Mstrict; c_final = true; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Abstract); c_name = ([2:22-30], "\\HH_FIXME"); c_tparams = []; c_extends = []; @@ -48,7 +50,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false })[(Fun + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None })[(Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; @@ -61,4 +63,4 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "0")))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_awaitable.php.exp b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_awaitable.php.exp index 127a107fd69..0a041f1c8e0 100644 --- a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_awaitable.php.exp +++ b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_awaitable.php.exp @@ -13,4 +13,4 @@ Errors: f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-12], (Return (Some ((int), [4:10-11], (Int "1")))))] }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_function.php.exp b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_function.php.exp index 27629c8cb59..c56e106858c 100644 --- a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_function.php.exp +++ b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_function.php.exp @@ -20,4 +20,4 @@ Errors: f_body = { fb_ast = [([4:3-17], (Return (Some ((int), [4:10-16], (Binop (Star, ((int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:15-16], (Int "2"))))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_method.php.exp b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_method.php.exp index b9217d562fa..090f0ac0126 100644 --- a/hphp/hack/test/tast/global_inference/return/type_hint_inferred_method.php.exp +++ b/hphp/hack/test/tast/global_inference/return/type_hint_inferred_method.php.exp @@ -26,4 +26,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/type_hint_inferred_anon_function.php.exp b/hphp/hack/test/tast/global_inference/type_hint_inferred_anon_function.php.exp index 811a2a3f18d..eec4508ed93 100644 --- a/hphp/hack/test/tast/global_inference/type_hint_inferred_anon_function.php.exp +++ b/hphp/hack/test/tast/global_inference/type_hint_inferred_anon_function.php.exp @@ -40,4 +40,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_custom.php.exp b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_custom.php.exp index 5bfda43f102..82d242c20f2 100644 --- a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_custom.php.exp +++ b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_custom.php.exp @@ -45,7 +45,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -74,4 +74,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_method.php.exp b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_method.php.exp index 142ba109303..a7214148f4c 100644 --- a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_method.php.exp +++ b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_method.php.exp @@ -35,4 +35,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_subtyping.php.exp b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_subtyping.php.exp index 91f65ff5a53..9e3aa19f0d8 100644 --- a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_subtyping.php.exp +++ b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_subtyping.php.exp @@ -18,7 +18,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -38,4 +38,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_variance.php.exp b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_variance.php.exp index a3286afbbc6..4548610932b 100644 --- a/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_variance.php.exp +++ b/hphp/hack/test/tast/global_inference/typeparams/type_hint_typeparameter_variance.php.exp @@ -36,7 +36,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -56,4 +56,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/initializer.php.exp b/hphp/hack/test/tast/initializer.php.exp index 4df516f82c4..d797b9b50cb 100644 --- a/hphp/hack/test/tast/initializer.php.exp +++ b/hphp/hack/test/tast/initializer.php.exp @@ -13,7 +13,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [5:1-11]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -26,7 +26,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [7:1-13:2]; c_annotation = (); c_mode = Mstrict; c_final = true; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Abstract); @@ -57,4 +57,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/invalid_fun_pointer.php.exp b/hphp/hack/test/tast/invalid_fun_pointer.php.exp index 8b72386ac98..23cfd3525fb 100644 --- a/hphp/hack/test/tast/invalid_fun_pointer.php.exp +++ b/hphp/hack/test/tast/invalid_fun_pointer.php.exp @@ -15,4 +15,4 @@ Errors: f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-23], (Expr ((_), [4:3-22], (Fun_id ([4:7-21], "\\unbound_func")))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/lambda1.php.exp b/hphp/hack/test/tast/lambda1.php.exp index 4fef37329d7..bdcbf729675 100644 --- a/hphp/hack/test/tast/lambda1.php.exp +++ b/hphp/hack/test/tast/lambda1.php.exp @@ -67,4 +67,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/lambda_contextual.php.exp b/hphp/hack/test/tast/lambda_contextual.php.exp index 55aae286aa0..b1182087e2a 100644 --- a/hphp/hack/test/tast/lambda_contextual.php.exp +++ b/hphp/hack/test/tast/lambda_contextual.php.exp @@ -25,7 +25,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -68,4 +68,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/lambda_efun.php.exp b/hphp/hack/test/tast/lambda_efun.php.exp index 6879c37ad44..9fc266cb8dc 100644 --- a/hphp/hack/test/tast/lambda_efun.php.exp +++ b/hphp/hack/test/tast/lambda_efun.php.exp @@ -116,4 +116,4 @@ Errors: (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")) }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/lambda_return_type.php.exp b/hphp/hack/test/tast/lambda_return_type.php.exp index d18a69f6056..e308b0a7fab 100644 --- a/hphp/hack/test/tast/lambda_return_type.php.exp +++ b/hphp/hack/test/tast/lambda_return_type.php.exp @@ -34,7 +34,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -70,4 +70,4 @@ }; f_fun_kind = FAsync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/mixed_mixed.php.exp b/hphp/hack/test/tast/mixed_mixed.php.exp index bb1541f5dd2..ea6d312ff2a 100644 --- a/hphp/hack/test/tast/mixed_mixed.php.exp +++ b/hphp/hack/test/tast/mixed_mixed.php.exp @@ -17,7 +17,7 @@ f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -56,4 +56,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/multiple_type.php.exp b/hphp/hack/test/tast/multiple_type.php.exp index 7069ef3b1aa..b13d6b74a13 100644 --- a/hphp/hack/test/tast/multiple_type.php.exp +++ b/hphp/hack/test/tast/multiple_type.php.exp @@ -19,7 +19,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [10:1-14:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -41,7 +41,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -86,4 +86,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/null_check.php.exp b/hphp/hack/test/tast/null_check.php.exp index 51c0dd512c3..d7772665f37 100644 --- a/hphp/hack/test/tast/null_check.php.exp +++ b/hphp/hack/test/tast/null_check.php.exp @@ -29,4 +29,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/null_coalesce.php.exp b/hphp/hack/test/tast/null_coalesce.php.exp index acea32cd2e3..8f1e17b3ed9 100644 --- a/hphp/hack/test/tast/null_coalesce.php.exp +++ b/hphp/hack/test/tast/null_coalesce.php.exp @@ -18,4 +18,4 @@ f_body = { fb_ast = [([4:3-18], (Return (Some ((int), [4:10-17], (Binop (QuestionQuestion, ((?int), [4:10-12], (Lvar ([4:10-12], $x))), ((int), [4:16-17], (Int "0"))))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/null_coalesce_assignment.php.exp b/hphp/hack/test/tast/null_coalesce_assignment.php.exp index bf651b10a64..dde810128e4 100644 --- a/hphp/hack/test/tast/null_coalesce_assignment.php.exp +++ b/hphp/hack/test/tast/null_coalesce_assignment.php.exp @@ -22,4 +22,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/parent_construct.php.exp b/hphp/hack/test/tast/parent_construct.php.exp index 43c63d40859..e7da18bacf2 100644 --- a/hphp/hack/test/tast/parent_construct.php.exp +++ b/hphp/hack/test/tast/parent_construct.php.exp @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [6:1-10:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -63,4 +63,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/parent_method.php.exp b/hphp/hack/test/tast/parent_method.php.exp index 53829fdb59f..db07f2a0b4e 100644 --- a/hphp/hack/test/tast/parent_method.php.exp +++ b/hphp/hack/test/tast/parent_method.php.exp @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [6:1-10:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -55,4 +55,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/pseudofunctions.php.exp b/hphp/hack/test/tast/pseudofunctions.php.exp index 840fafd58f2..d558b8a47ea 100644 --- a/hphp/hack/test/tast/pseudofunctions.php.exp +++ b/hphp/hack/test/tast/pseudofunctions.php.exp @@ -29,7 +29,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -75,4 +75,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/re_prefixed_string/re_prefixed_string.php.exp b/hphp/hack/test/tast/re_prefixed_string/re_prefixed_string.php.exp index ad548f63777..5d4ebbb7e35 100644 --- a/hphp/hack/test/tast/re_prefixed_string/re_prefixed_string.php.exp +++ b/hphp/hack/test/tast/re_prefixed_string/re_prefixed_string.php.exp @@ -50,7 +50,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -84,7 +84,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -191,7 +191,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -240,7 +240,7 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -265,4 +265,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reactive.php.exp b/hphp/hack/test/tast/reactive.php.exp index 4dc9168408b..bdfea306f9c 100644 --- a/hphp/hack/test/tast/reactive.php.exp +++ b/hphp/hack/test/tast/reactive.php.exp @@ -32,4 +32,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = [{ ua_name = ([2:3-7], "__Rx"); ua_params = [] }]; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reified_generic_attributes.php.exp b/hphp/hack/test/tast/reified_generic_attributes.php.exp index e1d16566e20..eb7082d4f26 100644 --- a/hphp/hack/test/tast/reified_generic_attributes.php.exp +++ b/hphp/hack/test/tast/reified_generic_attributes.php.exp @@ -21,7 +21,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [4:1-48]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -34,7 +34,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -53,7 +53,7 @@ Errors: f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -71,7 +71,7 @@ Errors: f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -88,7 +88,7 @@ Errors: f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -105,7 +105,7 @@ Errors: f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -122,4 +122,4 @@ Errors: f_where_constraints = []; f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reified_generic_shadowing.php.exp b/hphp/hack/test/tast/reified_generic_shadowing.php.exp index 5cb40b236e0..0615846beb0 100644 --- a/hphp/hack/test/tast/reified_generic_shadowing.php.exp +++ b/hphp/hack/test/tast/reified_generic_shadowing.php.exp @@ -14,7 +14,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -29,7 +29,7 @@ Errors: f_body = { fb_ast = [([7:3-14], (Expr ((Tcat), [7:3-13], (New (((Tcat), [7:7-11], (CI ([7:7-11], "Tcat"))), [], [], None, (_))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -44,4 +44,4 @@ Errors: f_body = { fb_ast = [([11:3-14], (Expr ((Tcat), [11:3-13], (New (((Tcat), [11:7-11], (CI ([11:7-11], "\\Tcat"))), [], [], None, (_))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reified_generic_shadowing2.php.exp b/hphp/hack/test/tast/reified_generic_shadowing2.php.exp index cd0a645edd5..c8e79f2e9d0 100644 --- a/hphp/hack/test/tast/reified_generic_shadowing2.php.exp +++ b/hphp/hack/test/tast/reified_generic_shadowing2.php.exp @@ -28,7 +28,7 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [9:1-12:2]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -57,4 +57,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reified_generic_shadowing3.php.exp b/hphp/hack/test/tast/reified_generic_shadowing3.php.exp index b9b9c1f5cf4..100c2baf33f 100644 --- a/hphp/hack/test/tast/reified_generic_shadowing3.php.exp +++ b/hphp/hack/test/tast/reified_generic_shadowing3.php.exp @@ -20,4 +20,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/reify_mix_with_erased.php.exp b/hphp/hack/test/tast/reify_mix_with_erased.php.exp index 27507f1be89..201a6ebb27e 100644 --- a/hphp/hack/test/tast/reify_mix_with_erased.php.exp +++ b/hphp/hack/test/tast/reify_mix_with_erased.php.exp @@ -26,7 +26,7 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-13], (Return (Some ((Tu), [4:10-12], (Lvar ([4:10-12], $f))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -50,4 +50,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/sdt/nonnull_and_mixed.php.exp b/hphp/hack/test/tast/sdt/nonnull_and_mixed.php.exp index 7bfff0d8ca6..1f9a70841f2 100644 --- a/hphp/hack/test/tast/sdt/nonnull_and_mixed.php.exp +++ b/hphp/hack/test/tast/sdt/nonnull_and_mixed.php.exp @@ -24,4 +24,4 @@ Errors: f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = [{ ua_name = ([3:10-11], "__SupportDynamicType"); ua_params = [] }]; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/sdt/sdt.php.exp b/hphp/hack/test/tast/sdt/sdt.php.exp index 54dbf276cd4..44c2917e618 100644 --- a/hphp/hack/test/tast/sdt/sdt.php.exp +++ b/hphp/hack/test/tast/sdt/sdt.php.exp @@ -11,7 +11,7 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = [{ ua_name = ([3:7-8], "__SupportDynamicType"); ua_params = [] }]; c_file_attributes = []; c_enum = None; c_doc_comment = None; c_emit_id = None; - c_internal = false }); + c_internal = false; c_module = None }); (Class { c_span = [4:1-15]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = Cinterface; @@ -25,7 +25,7 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = [{ ua_name = ([4:11-12], "__SupportDynamicType"); ua_params = [] }]; c_file_attributes = []; c_enum = None; c_doc_comment = None; c_emit_id = None; - c_internal = false }); + c_internal = false; c_module = None }); (Class { c_span = [5:1-11]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = Ctrait; @@ -39,7 +39,7 @@ ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = [{ ua_name = ([5:7-8], "__SupportDynamicType"); ua_params = [] }]; c_file_attributes = []; c_enum = None; c_doc_comment = None; c_emit_id = None; - c_internal = false }); + c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -53,7 +53,7 @@ f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([Pos.none], Noop)] }; f_fun_kind = FSync; f_user_attributes = [{ ua_name = ([7:10-11], "__SupportDynamicType"); ua_params = [] }]; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Class { c_span = [10:1-15]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = Cenum; c_name = ([10:6-7], "\\E"); @@ -67,4 +67,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = (Some { e_base = ([10:9-12], (Hprim Tint)); e_constraint = None; e_includes = [] }); - c_doc_comment = None; c_emit_id = None; c_internal = false }) \ No newline at end of file + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/shapes_special_functions.php.exp b/hphp/hack/test/tast/shapes_special_functions.php.exp index 99b8cd670ae..282136d9507 100644 --- a/hphp/hack/test/tast/shapes_special_functions.php.exp +++ b/hphp/hack/test/tast/shapes_special_functions.php.exp @@ -15,7 +15,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [3:1-45]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [3:1-45]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -68,4 +69,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/singleton_unresolved_function_call.php.exp b/hphp/hack/test/tast/singleton_unresolved_function_call.php.exp index 0a8cef85bcd..bbc33d3635a 100644 --- a/hphp/hack/test/tast/singleton_unresolved_function_call.php.exp +++ b/hphp/hack/test/tast/singleton_unresolved_function_call.php.exp @@ -34,4 +34,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/switch_fallthrough.php.exp b/hphp/hack/test/tast/switch_fallthrough.php.exp index 8dbdf408ffe..23e82954f22 100644 --- a/hphp/hack/test/tast/switch_fallthrough.php.exp +++ b/hphp/hack/test/tast/switch_fallthrough.php.exp @@ -104,4 +104,4 @@ File "switch_fallthrough.php", line 37, characters 3-13: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/try_catch.php.exp b/hphp/hack/test/tast/try_catch.php.exp index 457e19eb945..8aa3d207760 100644 --- a/hphp/hack/test/tast/try_catch.php.exp +++ b/hphp/hack/test/tast/try_catch.php.exp @@ -14,7 +14,7 @@ (Some ([2:1-10:4], "/**\n * Copyright (c) 2014, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the \"hack\" directory of this source tree.\n *\n *\n */")) }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -43,7 +43,7 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }); + fd_internal = false; fd_module = None }); (Class { c_span = [33:1-41]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -57,7 +57,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [34:1-39]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -71,4 +71,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/typeconsts.php.exp b/hphp/hack/test/tast/typeconsts.php.exp index af7bd47b194..704a3980715 100644 --- a/hphp/hack/test/tast/typeconsts.php.exp +++ b/hphp/hack/test/tast/typeconsts.php.exp @@ -33,4 +33,4 @@ Errors: ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/typedef.php.exp b/hphp/hack/test/tast/typedef.php.exp index 39d67fe9e1e..7ac57f8f4ea 100644 --- a/hphp/hack/test/tast/typedef.php.exp +++ b/hphp/hack/test/tast/typedef.php.exp @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [4:1-46]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -39,7 +39,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [5:1-58]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = false; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -53,7 +53,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Typedef { t_annotation = (); t_name = ([8:6-8], "\\T1"); t_tparams = []; t_constraint = None; t_kind = ([8:11-14], (Hprim Tint)); @@ -64,7 +64,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [7:1-8:15]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [7:1-8:15]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([11:6-8], "\\T2"); t_tparams = []; t_constraint = None; t_kind = ([11:11-18], (Hoption ([11:12-18], (Hprim Tstring)))); @@ -74,7 +75,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [10:1-11:19]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [10:1-11:19]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([13:6-23], "\\Serialized_contra"); t_tparams = [{ tp_variance = Contravariant; tp_name = ([13:25-26], "T"); tp_parameters = []; tp_constraints = []; tp_reified = Erased; tp_user_attributes = [] }]; @@ -84,7 +86,8 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [13:1-37]; t_emit_id = None; t_is_ctx = false; t_internal = false }); + t_span = [13:1-37]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }); (Typedef { t_annotation = (); t_name = ([14:6-19], "\\Serialized_co"); t_tparams = [{ tp_variance = Covariant; tp_name = ([14:21-22], "T"); tp_parameters = []; tp_constraints = []; tp_reified = Erased; tp_user_attributes = [] }]; @@ -94,4 +97,5 @@ { Namespace_env.ns_ns_uses = ; ns_class_uses = ; ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; - t_span = [14:1-33]; t_emit_id = None; t_is_ctx = false; t_internal = false }) \ No newline at end of file + t_span = [14:1-33]; t_emit_id = None; t_is_ctx = false; t_internal = false; + t_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/unbound_func.php.exp b/hphp/hack/test/tast/unbound_func.php.exp index bd38efaa0d0..6be22ad82a4 100644 --- a/hphp/hack/test/tast/unbound_func.php.exp +++ b/hphp/hack/test/tast/unbound_func.php.exp @@ -14,4 +14,4 @@ Errors: f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-18], (Expr ((_), [4:3-17], (Call (((_), [4:3-15], (Id ([4:3-15], "\\unbound_func"))), [], [], None)))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/unbound_global.php.exp b/hphp/hack/test/tast/unbound_global.php.exp index fc7b3cd9b3c..00d60b257b9 100644 --- a/hphp/hack/test/tast/unbound_global.php.exp +++ b/hphp/hack/test/tast/unbound_global.php.exp @@ -14,4 +14,4 @@ Errors: f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-18], (Expr ((_), [4:3-17], (Id ([4:3-17], "\\unbound_global")))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/unbound_name_partial.php.exp b/hphp/hack/test/tast/unbound_name_partial.php.exp index 21a18c13d7f..795e0c8ea63 100644 --- a/hphp/hack/test/tast/unbound_name_partial.php.exp +++ b/hphp/hack/test/tast/unbound_name_partial.php.exp @@ -15,4 +15,4 @@ Errors: f_params = []; f_ctxs = None; f_unsafe_ctxs = None; f_body = { fb_ast = [([4:3-37], (Expr ((_), [4:3-36], (Method_caller (([4:15-28], "\\NoSuchClass"), ([4:30-35], "foo"))))))] }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/unresolved_grown_after_lambda.php.exp b/hphp/hack/test/tast/unresolved_grown_after_lambda.php.exp index f14c14ac417..29e5ed45831 100644 --- a/hphp/hack/test/tast/unresolved_grown_after_lambda.php.exp +++ b/hphp/hack/test/tast/unresolved_grown_after_lambda.php.exp @@ -62,4 +62,4 @@ Errors: }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) \ No newline at end of file + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/using.php.exp b/hphp/hack/test/tast/using.php.exp index ebbeb7cc671..3e2a4774a5c 100644 --- a/hphp/hack/test/tast/using.php.exp +++ b/hphp/hack/test/tast/using.php.exp @@ -20,7 +20,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -59,4 +59,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/wildcard_generic_depth.php.exp b/hphp/hack/test/tast/wildcard_generic_depth.php.exp index 3b456e9d809..ec7d7ffa2b9 100644 --- a/hphp/hack/test/tast/wildcard_generic_depth.php.exp +++ b/hphp/hack/test/tast/wildcard_generic_depth.php.exp @@ -14,7 +14,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -42,4 +42,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/xhp.php.exp b/hphp/hack/test/tast/xhp.php.exp index f79e596fdfc..cf096717a42 100644 --- a/hphp/hack/test/tast/xhp.php.exp +++ b/hphp/hack/test/tast/xhp.php.exp @@ -19,7 +19,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -55,4 +55,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/xhp_modifier/xhp.php.exp b/hphp/hack/test/tast/xhp_modifier/xhp.php.exp index dc5e6968528..6a59aa712e6 100644 --- a/hphp/hack/test/tast/xhp_modifier/xhp.php.exp +++ b/hphp/hack/test/tast/xhp_modifier/xhp.php.exp @@ -11,4 +11,4 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }) + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }) \ No newline at end of file diff --git a/hphp/hack/test/tast/xml_child_order.php.exp b/hphp/hack/test/tast/xml_child_order.php.exp index 586b4759bbf..c371e170c72 100644 --- a/hphp/hack/test/tast/xml_child_order.php.exp +++ b/hphp/hack/test/tast/xml_child_order.php.exp @@ -11,7 +11,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [4:1-52]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = true; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -25,7 +25,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Class { c_span = [5:1-52]; c_annotation = (); c_mode = Mstrict; c_final = false; c_is_xhp = true; c_has_xhp_keyword = false; c_kind = (Cclass Concrete); @@ -39,7 +39,7 @@ ns_fun_uses = ; ns_const_uses = ; ns_name = None; ns_auto_ns_map = []; ns_is_codegen = false; ns_disable_xhp_element_mangling = false }; c_user_attributes = []; c_file_attributes = []; c_enum = None; - c_doc_comment = None; c_emit_id = None; c_internal = false }); + c_doc_comment = None; c_emit_id = None; c_internal = false; c_module = None }); (Fun { fd_namespace = { Namespace_env.ns_ns_uses = ; ns_class_uses = ; @@ -61,4 +61,4 @@ }; f_fun_kind = FSync; f_user_attributes = []; f_external = false; f_doc_comment = None }; - fd_internal = false }) + fd_internal = false; fd_module = None }) \ No newline at end of file -- 2.11.4.GIT