remove "import"

src/res_core.ml

@@ -5,7 +5,6 @@ module Diagnostics = Res_diagnostics
 module CommentTable = Res_comments_table
 module ResPrinter = Res_printer
 module Scanner = Res_scanner
-module JsFfi = Res_js_ffi
 module Parser = Res_parser
 
 let mkLoc startLoc endLoc =
@@ -721,30 +720,6 @@ let parseModuleLongIdent ~lowercase p =
   (* Parser.eatBreadcrumb p; *)
   moduleIdent
 
-(* `window.location` or `Math` or `Foo.Bar` *)
-let parseIdentPath p =
-  let rec loop p acc =
-    match p.Parser.token with
-    | Uident ident | Lident ident -> (
-      Parser.next p;
-      let lident = Longident.Ldot (acc, ident) in
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        loop p lident
-      | _ -> lident)
-    | _t -> acc
-  in
-  match p.Parser.token with
-  | Lident ident | Uident ident -> (
-    Parser.next p;
-    match p.Parser.token with
-    | Dot ->
-      Parser.next p;
-      loop p (Longident.Lident ident)
-    | _ -> Longident.Lident ident)
-  | _ -> Longident.Lident "_"
-
 let verifyJsxOpeningClosingName p nameExpr =
   let closing =
     match p.Parser.token with
@@ -5336,12 +5311,6 @@ and parseStructureItemRegion p =
     parseNewlineOrSemicolonStructure p;
     let loc = mkLoc startPos p.prevEndPos in
     Some (Ast_helper.Str.primitive ~loc externalDef)
-  | Import ->
-    let importDescr = parseJsImport ~startPos ~attrs p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let structureItem = JsFfi.toParsetree importDescr in
-    Some {structureItem with pstr_loc = loc}
   | Exception ->
     let exceptionDef = parseExceptionDef ~attrs p in
     parseNewlineOrSemicolonStructure p;
@@ -5403,23 +5372,6 @@ and parseStructureItemRegion p =
     | _ -> None)
   [@@progress Parser.next, Parser.expect]
 
-and parseJsImport ~startPos ~attrs p =
-  Parser.expect Token.Import p;
-  let importSpec =
-    match p.Parser.token with
-    | Token.Lident _ | Token.At ->
-      let decl =
-        match parseJsFfiDeclaration p with
-        | Some decl -> decl
-        | None -> assert false
-      in
-      JsFfi.Default decl
-    | _ -> JsFfi.Spec (parseJsFfiDeclarations p)
-  in
-  let scope = parseJsFfiScope p in
-  let loc = mkLoc startPos p.prevEndPos in
-  JsFfi.importDescr ~attrs ~importSpec ~scope ~loc
-
 and parseJsExport ~attrs p =
   let exportStart = p.Parser.startPos in
   Parser.expect Token.Export p;
@@ -5457,49 +5409,6 @@ and parseSignJsExport ~attrs p =
     let loc = mkLoc exportStart p.prevEndPos in
     Ast_helper.Sig.value valueDesc ~loc
 
-and parseJsFfiScope p =
-  match p.Parser.token with
-  | Token.Lident "from" -> (
-    Parser.next p;
-    match p.token with
-    | String s ->
-      Parser.next p;
-      JsFfi.Module s
-    | Uident _ | Lident _ ->
-      let value = parseIdentPath p in
-      JsFfi.Scope value
-    | _ -> JsFfi.Global)
-  | _ -> JsFfi.Global
-
-and parseJsFfiDeclarations p =
-  Parser.expect Token.Lbrace p;
-  let decls =
-    parseCommaDelimitedRegion ~grammar:Grammar.JsFfiImport ~closing:Rbrace
-      ~f:parseJsFfiDeclaration p
-  in
-  Parser.expect Rbrace p;
-  decls
-
-and parseJsFfiDeclaration p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Lident _ ->
-    let ident, _ = parseLident p in
-    let alias =
-      match p.token with
-      | As ->
-        Parser.next p;
-        let ident, _ = parseLident p in
-        ident
-      | _ -> ident
-    in
-    Parser.expect Token.Colon p;
-    let typ = parseTypExpr p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (JsFfi.decl ~loc ~alias ~attrs ~name:ident ~typ)
-  | _ -> None
-
 (* include-statement ::= include module-expr *)
 and parseIncludeStatement ~attrs p =
   let startPos = p.Parser.startPos in
@@ -6113,9 +6022,6 @@ and parseSignatureItemRegion p =
     parseNewlineOrSemicolonSignature p;
     let loc = mkLoc startPos p.prevEndPos in
     Some (Ast_helper.Sig.extension ~attrs ~loc extension)
-  | Import ->
-    Parser.next p;
-    parseSignatureItemRegion p
   | _ -> (
     match attrs with
     | (({Asttypes.loc = attrLoc}, _) as attr) :: _ ->

src/res_grammar.ml

@@ -56,7 +56,6 @@ type t =
   | TypeConstraint
   | AtomicTypExpr
   | ListExpr
-  | JsFfiImport
   | Pattern
   | AttributePayload
   | TagNames
@@ -116,7 +115,6 @@ let toString = function
   | AtomicTypExpr -> "a type"
   | ListExpr -> "an ocaml list expr"
   | PackageConstraint -> "a package constraint"
-  | JsFfiImport -> "js ffi import"
   | JsxChild -> "jsx child"
   | Pattern -> "pattern"
   | ExprFor -> "a for expression"
@@ -162,8 +160,8 @@ let isJsxAttributeStart = function
   | _ -> false
 
 let isStructureItemStart = function
-  | Token.Open | Let | Typ | External | Import | Export | Exception | Include
-  | Module | AtAt | PercentPercent | At ->
+  | Token.Open | Let | Typ | External | Export | Exception | Include | Module
+  | AtAt | PercentPercent | At ->
     true
   | t when isExprStart t -> true
   | _ -> false
@@ -254,10 +252,6 @@ let isAttributeStart = function
   | Token.At -> true
   | _ -> false
 
-let isJsFfiImportStart = function
-  | Token.Lident _ | At -> true
-  | _ -> false
-
 let isJsxChildStart = isAtomicExprStart
 
 let isBlockExprStart = function
@@ -296,7 +290,6 @@ let isListElement grammar token =
   | PackageConstraint -> token = And
   | ConstructorDeclaration -> token = Bar
   | JsxAttribute -> isJsxAttributeStart token
-  | JsFfiImport -> isJsFfiImportStart token
   | AttributePayload -> token = Lparen
   | TagNames -> token = Hash
   | _ -> false
@@ -318,7 +311,6 @@ let isListTerminator grammar token =
   | TypeParams, Rparen
   | ParameterList, (EqualGreater | Lbrace)
   | JsxAttribute, (Forwardslash | GreaterThan)
-  | JsFfiImport, Rbrace
   | StringFieldDeclarations, Rbrace ->
     true
   | Attribute, token when token <> At -> true

src/res_token.ml

@@ -93,7 +93,6 @@ type t =
   | Backtick
   | BarGreater
   | Try
-  | Import
   | Export
   | DocComment of Location.t * string
   | ModuleComment of Location.t * string
@@ -205,7 +204,6 @@ let toString = function
   | Backtick -> "`"
   | BarGreater -> "|>"
   | Try -> "try"
-  | Import -> "import"
   | Export -> "export"
   | DocComment (_loc, s) -> "DocComment " ^ s
   | ModuleComment (_loc, s) -> "ModuleComment " ^ s
@@ -222,7 +220,6 @@ let keywordTable = function
   | "false" -> False
   | "for" -> For
   | "if" -> If
-  | "import" -> Import
   | "in" -> In
   | "include" -> Include
   | "lazy" -> Lazy
@@ -245,9 +242,9 @@ let keywordTable = function
 
 let isKeyword = function
   | And | As | Assert | Constraint | Else | Exception | Export | External
-  | False | For | If | Import | In | Include | Land | Lazy | Let | List | Lor
-  | Module | Mutable | Of | Open | Private | Rec | Switch | True | Try | Typ
-  | When | While ->
+  | False | For | If | In | Include | Land | Lazy | Let | List | Lor | Module
+  | Mutable | Of | Open | Private | Rec | Switch | True | Try | Typ | When
+  | While ->
     true
   | _ -> false