Rename ast.ml -> flow_ast.ml

Summary: Rename `ast.ml` to `flow_ast.ml` so not to conflict with other `ast.ml` files

Reviewed By: panagosg7

Differential Revision: D9444051

fbshipit-source-id: 5fa6da0a76d9e4b1c2b970b9d3888351518802a1

Makefile

@@ -368,7 +368,7 @@ flow.odocl: $(shell find . -name "*.ml" -o -name "*.mli")
 	done
 	# For some reason these two AST files cause ocamldoc to get stuck
 	cat deps \
-		| grep -v "src/parser/ast.ml" \
+		| grep -v "src/parser/flow_ast.ml" \
 		| sed "s/\.ml$$//" > $@
 	rm -f deps last_deps temp_deps
 

src/commands/astCommand.ml

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 (***********************************************************************)
 (* flow ast command *)
 (***********************************************************************)

src/commands/lspCommand.ml

@@ -97,7 +97,7 @@ type open_file_info = {
   (* o_open_doc is guaranteed to be up-to-date with respect to the editor *)
   o_open_doc: Lsp.TextDocumentItem.t;
   (* o_ast, if present, is guaranteed to be up-to-date. It gets computed lazily. *)
-  o_ast: (Loc.t, Loc.t) Ast.program option;
+  o_ast: (Loc.t, Loc.t) Flow_ast.program option;
   (* o_live_diagnostics, if present, is guaranteed to be up-to-date, and to only contain
    * parse errors, and to be a better source of truth about the parse errors
    * in this file than what the flow server has told us. It also gets computed lazily. *)
@@ -853,7 +853,7 @@ let error_to_lsp
  * or it's an unopened file in which case we'll retrieve parse results but
  * won't store them. *)
 let parse_and_cache flowconfig_name (state: state) (uri: string)
-  : state * (Loc.t, Loc.t) Ast.program * PublishDiagnostics.diagnostic list option =
+  : state * (Loc.t, Loc.t) Flow_ast.program * PublishDiagnostics.diagnostic list option =
   (* part of parsing is producing parse errors, if so desired *)
   let liveSyntaxErrors = let open Initialize in match state with
     | Connected cenv -> cenv.c_ienv.i_initialize_params.initializationOptions.liveSyntaxErrors

src/common/docblock.ml

@@ -14,7 +14,7 @@ type jsx_pragma =
    * when interpreting JSX syntax. Otherwise, the usual rules of JSX are
    * followed: children are varargs after a props argument.
    *)
-  | Jsx_pragma of (string * (Loc.t, Loc.t) Ast.Expression.t)
+  | Jsx_pragma of (string * (Loc.t, Loc.t) Flow_ast.Expression.t)
 
   (**
    * Alternate mode for interpreting JSX syntax. The element name is treated

src/common/flow_lsp_conversions.ml

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 let flow_completion_to_lsp
     (item: ServerProt.Response.complete_autocomplete_result)
   : Lsp.Completion.completionItem =

src/common/options.ml

@@ -32,7 +32,7 @@ type jsx_mode =
    * when interpreting JSX syntax. Otherwise, the usual rules of JSX are
    * followed: children are varargs after a props argument.
    *)
-  | Jsx_pragma of (string * (Loc.t, Loc.t) Ast.Expression.t)
+  | Jsx_pragma of (string * (Loc.t, Loc.t) Flow_ast.Expression.t)
 
   (**
    * Alternate mode for interpreting JSX syntax. The element name is treated

src/common/reason.ml

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 (* This module defines a general notion of trace, which is used in modules
    Type_inference_js and Flow_js to record how the typechecker reasons about
    code, systematically collecting, simplifying, and solving constraints. This

src/common/reason.mli

@@ -184,7 +184,7 @@ val json_of_loc_props: ?strip_root:Path.t option -> Loc.t -> (string * Hh_json.j
 
 val locationless_reason: reason_desc -> reason
 
-val func_reason: (Loc.t, Loc.t) Ast.Function.t -> Loc.t -> reason
+val func_reason: (Loc.t, Loc.t) Flow_ast.Function.t -> Loc.t -> reason
 
 val is_internal_name: string -> bool
 val internal_name: string -> string
@@ -243,7 +243,7 @@ val do_patch: string list -> (int * int * string) list -> string
 
 module ReasonMap : MyMap.S with type key = reason
 
-val mk_expression_reason: (Loc.t, Loc.t) Ast.Expression.t -> reason
+val mk_expression_reason: (Loc.t, Loc.t) Flow_ast.Expression.t -> reason
 
 val unknown_elem_empty_array_desc: reason_desc
 val inferred_union_elem_array_desc: reason_desc

src/common/ty/ty_serializer.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Core_result
 open Ty
-module T = Ast.Type
+module T = Flow_ast.Type
 
 let mapM f ts = all (List.map f ts)
 

src/common/ty/ty_serializer.mli

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-val type_ : Ty.t -> ((Loc.t, Loc.t) Ast.Type.t, string) Core_result.t
+val type_ : Ty.t -> ((Loc.t, Loc.t) Flow_ast.Type.t, string) Core_result.t

src/parser/ast_utils.ml

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-open Ast
+open Flow_ast
 
 type binding = Loc.t * string
 type ident = Loc.t * string
@@ -42,14 +42,14 @@ let rec bindings_of_pattern =
       failwith "expression pattern"
 
 let bindings_of_variable_declarations =
-  let open Ast.Statement.VariableDeclaration in
+  let open Flow_ast.Statement.VariableDeclaration in
   List.fold_left (fun acc -> function
     | _, { Declarator.id = (_, pattern); _ } ->
       bindings_of_pattern acc pattern
   ) []
 
 let partition_directives statements =
-  let open Ast.Statement in
+  let open Flow_ast.Statement in
   let rec helper directives = function
     | ((_, Expression { Expression.directive = Some _; _ }) as directive)::rest ->
       helper (directive::directives) rest

src/parser/ast_utils.mli

@@ -11,23 +11,23 @@ type source = Loc.t * string
 
 val bindings_of_pattern:
   binding list ->
-  (Loc.t, Loc.t) Ast.Pattern.t' ->
+  (Loc.t, Loc.t) Flow_ast.Pattern.t' ->
   binding list
 
 val bindings_of_variable_declarations:
-  (Loc.t, Loc.t) Ast.Statement.VariableDeclaration.Declarator.t list ->
+  (Loc.t, Loc.t) Flow_ast.Statement.VariableDeclaration.Declarator.t list ->
   binding list
 
 val partition_directives:
-  (Loc.t, Loc.t) Ast.Statement.t list ->
-  (Loc.t, Loc.t) Ast.Statement.t list * (Loc.t, Loc.t) Ast.Statement.t list
+  (Loc.t, Loc.t) Flow_ast.Statement.t list ->
+  (Loc.t, Loc.t) Flow_ast.Statement.t list * (Loc.t, Loc.t) Flow_ast.Statement.t list
 
 val negate_number_literal:
   float * string ->
   float * string
 
 val loc_of_expression:
-  ('a, 'a) Ast.Expression.t -> 'a
+  ('a, 'a) Flow_ast.Expression.t -> 'a
 
 val loc_of_statement:
-  ('a, 'a) Ast.Statement.t -> 'a
+  ('a, 'a) Flow_ast.Statement.t -> 'a

src/parser/declaration_parser.ml

@@ -5,10 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_common
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 module SSet = Set.Make(String)
 

src/parser/estree_translator.ml

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
 
 module type Config = sig
   val include_locs: bool

src/parser/expression_parser.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 open Parser_common
 

src/parser/jsx_parser.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 
 module JSX (Parse: Parser_common.PARSER) = struct

src/parser/lex_result.ml

@@ -10,7 +10,7 @@ type t = {
   lex_token: Token.t;
   lex_loc: Loc.t;
   lex_errors: (Loc.t * Parse_error.t) list;
-  lex_comments: Loc.t Ast.Comment.t list;
+  lex_comments: Loc.t Flow_ast.Comment.t list;
 }
 
 let token result = result.lex_token

src/parser/lexer.ml

@@ -290,8 +290,8 @@ let mk_comment
   (start: Loc.position) (_end: Loc.position)
   (buf: Buffer.t)
   (multiline: bool)
-: Loc.t Ast.Comment.t =
-  let open Ast.Comment in
+: Loc.t Flow_ast.Comment.t =
+  let open Flow_ast.Comment in
   let loc = { Loc.source = Lex_env.source env; start; _end } in
   let s = Buffer.contents buf in
   let c = if multiline then Block s else Line s in
@@ -383,7 +383,7 @@ type jsx_text_mode =
 
 type result =
   | Token of Lex_env.t * Token.t
-  | Comment of Lex_env.t * Loc.t Ast.Comment.t
+  | Comment of Lex_env.t * Loc.t Flow_ast.Comment.t
   | Continue of Lex_env.t
 
 let rec comment env buf lexbuf =

src/parser/object_parser.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 module SSet = Set.Make(String)
 

src/parser/parser_common.ml

@@ -6,7 +6,7 @@
  *)
 
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 
 type pattern_errors = {
@@ -131,9 +131,9 @@ let identifier_name env =
  * https://tc39.github.io/ecma262/#sec-islabelledfunction
  *)
 let rec is_labelled_function = function
-  | _, Ast.Statement.Labeled { Ast.Statement.Labeled.body; _ } ->
+  | _, Flow_ast.Statement.Labeled { Flow_ast.Statement.Labeled.body; _ } ->
     begin match body with
-    | _, Ast.Statement.FunctionDeclaration _ -> true
+    | _, Flow_ast.Statement.FunctionDeclaration _ -> true
     | _ -> is_labelled_function body
     end
   | _ ->

src/parser/parser_env.ml

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-open Ast
+open Flow_ast
 module Error = Parse_error
 module SSet = Set.Make(String)
 
@@ -813,7 +813,7 @@ module Try = struct
 
   type saved_state = {
     saved_errors          : (Loc.t * Error.t) list;
-    saved_comments        : Loc.t Ast.Comment.t list;
+    saved_comments        : Loc.t Flow_ast.Comment.t list;
     saved_last_lex_result : Lex_result.t option;
     saved_lex_mode_stack  : Lex_mode.t list;
     saved_lex_env         : Lex_env.t;

src/parser/parser_env.mli

@@ -60,7 +60,7 @@ val last_loc : env -> Loc.t option
 val last_token : env -> Token.t option
 val in_export : env -> bool
 val labels : env -> SSet.t
-val comments : env -> Loc.t Ast.Comment.t list
+val comments : env -> Loc.t Flow_ast.Comment.t list
 val in_loop : env -> bool
 val in_switch : env -> bool
 val in_formal_parameters : env -> bool
@@ -130,7 +130,7 @@ module Peek : sig
   val token : env -> Token.t
   val loc : env -> Loc.t
   val errors : env -> (Loc.t * Parse_error.t) list
-  val comments : env -> Loc.t Ast.Comment.t list
+  val comments : env -> Loc.t Flow_ast.Comment.t list
   val is_line_terminator : env -> bool
   val is_implicit_semicolon : env -> bool
   val is_identifier : env -> bool
@@ -142,7 +142,7 @@ module Peek : sig
   val ith_token : i:int -> env -> Token.t
   val ith_loc : i:int -> env -> Loc.t
   val ith_errors : i:int -> env -> (Loc.t * Parse_error.t) list
-  val ith_comments : i:int -> env -> Loc.t Ast.Comment.t list
+  val ith_comments : i:int -> env -> Loc.t Flow_ast.Comment.t list
   val ith_is_identifier : i:int -> env -> bool
   val ith_is_identifier_name : i:int -> env -> bool
   val ith_is_type_identifier : i:int -> env -> bool

src/parser/parser_flow.ml

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
 module Error = Parse_error

src/parser/pattern_cover.ml

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-open Ast
+open Flow_ast
 open Parser_common
 open Parser_env
 
@@ -38,7 +38,7 @@ module Cover
     then error_at env (fst expr, err);
 
     (match expr with
-    | loc, Ast.Expression.Identifier (_, name)
+    | loc, Flow_ast.Expression.Identifier (_, name)
       when is_restricted name ->
         strict_error_at env (loc, Error.StrictLHSAssignment)
     | _ -> ());

src/parser/pattern_parser.ml

@@ -5,10 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_common
 open Parser_env
-open Ast
+open Flow_ast
 
 module Pattern
   (Parse: Parser_common.PARSER)

src/parser/statement_parser.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
-open Ast
+open Flow_ast
 module Error = Parse_error
 module SSet = Set.Make(String)
 

src/parser/test/run_tests.ml

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 module String_utils = struct
   let spf = Printf.sprintf
 

src/parser/type_parser.ml

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
+module Ast = Flow_ast
+
 open Token
 open Parser_env
-open Ast
+open Flow_ast
 open Parser_common
 module Error = Parse_error