Display missing import files

Author: Fabrice Le Fessant

src/solidity-common/solidity_ast.ml

@@ -39,6 +39,7 @@ and source_unit =
   | ContractDefinition of contract_definition
 
 and import_directive = {
+  import_pos : Solidity_common.pos ;
   import_from : string;
   import_symbols : import_symbols;
 }

src/solidity-common/solidity_ast.mli

@@ -56,6 +56,7 @@ and source_unit =
   (** Definition of a contract *)
 
 and import_directive = {
+  import_pos : Solidity_common.pos ;
   import_from : string;
   import_symbols : import_symbols;
 }

src/solidity-common/solidity_printer.ml

@@ -133,15 +133,18 @@ and bprint_source_unit b ~freeton indent  su =
   | Pragma (id, s) ->
       if not freeton then
         bprint b indent (Format.asprintf "pragma %a %s;" Ident.printf id s)
-  | Import { import_from; import_symbols = ImportAll (None) } ->
+  | Import { import_from; import_symbols = ImportAll (None) ;
+           import_pos = _ } ->
       if not freeton then
         bprint b indent
           (Format.sprintf "import %S;" import_from)
-  | Import { import_from; import_symbols = ImportAll (Some id) } ->
+  | Import { import_from; import_symbols = ImportAll (Some id) ;
+           import_pos = _ } ->
       bprint b indent
         (Format.sprintf "import * as %s from %s;"
            (string_of_ident id) import_from)
-  | Import { import_from; import_symbols = ImportIdents import_list } ->
+  | Import { import_from; import_symbols = ImportIdents import_list ;
+             import_pos = _ } ->
       bprint b indent
         (Format.sprintf "import { %s } from %s;"
            (String.concat ", "

src/solidity-common/solidity_visitor.ml

@@ -511,7 +511,7 @@ and visitSourceUnit (v : #ast_visitor) (su : source_unit) : unit =
   handleAction v#visitSourceUnit continueVisit su
 
 and visitImportDirective (v : #ast_visitor) (id : import_directive) : unit =
-  let continueVisit ({import_from; import_symbols} : import_directive) : unit =
+  let continueVisit ({import_from; import_symbols; import_pos=_} : import_directive) : unit =
     visitString v import_from;
     visitImportSymbols v import_symbols in
   handleAction v#visitImportDirective continueVisit id

src/solidity-parser/solidity_lexer.mli

@@ -15,3 +15,5 @@ val init : freeton:bool -> unit
 val reset : unit -> unit
 
 val token : Lexing.lexbuf -> Solidity_raw_parser.token
+
+val recursive_comments : bool ref

src/solidity-parser/solidity_lexer.mll

@@ -60,6 +60,8 @@
         pos_bol = pos.pos_cnum - chars;
       }
 
+  let recursive_comments = ref false
+
 }
 
 let eol_comment =
@@ -105,7 +107,7 @@ rule token = parse
       { update_loc lexbuf name (int_of_string num) true 0;
       token lexbuf }
 
-  | "/*"        { multiline_comment lexbuf }
+  | "/*"        { multiline_comment lexbuf ; token lexbuf }
   | "pragma"    { Buffer.clear buf; begin_pragma lexbuf }
 
   | "["   { LBRACKET }
@@ -204,8 +206,15 @@ rule token = parse
       { error lexbuf "Unrecognized lexeme: \"%s\"" (Lexing.lexeme lexbuf) }
 
 and multiline_comment = parse
-  | "*/"         { token lexbuf }
+  | "*/"         { () }
   | newline_char { newline lexbuf; multiline_comment lexbuf }
+  | "hex"? '\'' ([^ '\'' '\r' '\n' '\\'] | "\\" _)* '\''
+  | "hex"? '"' ([^ '"' '\r' '\n' '\\'] | "\\" _)* '"'
+      { multiline_comment lexbuf }
+  | "/*"         {
+      if !recursive_comments then
+        multiline_comment lexbuf;
+      multiline_comment lexbuf }
   | eof          { failwith "unexpected end of file in comment" }
   | _            { multiline_comment lexbuf }
 

src/solidity-parser/solidity_parser.ml

@@ -17,8 +17,12 @@ let get_imported_files m =
   let base = Filename.dirname m.module_file in
   List.fold_left (fun fileset unit_node ->
       match strip unit_node with
-      | Import { import_from; _ } ->
+      | Import { import_from; import_pos ; _ } ->
           let file = make_absolute_path base import_from in
+          if not ( Sys.file_exists file ) then
+            raise (
+              Solidity_exceptions.SyntaxError
+                ("File does not exist", import_pos ) );
           StringSet.add file fileset
       | _ -> fileset
     ) StringSet.empty m.module_units

src/solidity-parser/solidity_raw_parser.mly

@@ -216,8 +216,9 @@
     | AmbiguousArray (a, expo) ->
         Array (type_name_of_ambiguity a, expo)
 
-  let import import_from import_symbols =
-    { import_from; import_symbols }
+  let import import_pos import_from import_symbols =
+    let import_pos = to_pos import_pos in
+    { import_pos; import_from; import_symbols }
 
   let rec put_in_none_list l n =
     if n <= 0 then l
@@ -468,11 +469,11 @@ source_unit:
 
 import_directive:
   | STRINGLITERAL as_identifier?
-      { import $1 (ImportAll ($2)) }
+      { import $loc $1 (ImportAll ($2)) }
   | STAR as_identifier FROM STRINGLITERAL
-      { import $4 (ImportAll (Some $2)) }
+      { import $loc $4 (ImportAll (Some $2)) }
   | LBRACE import_declarations RBRACE FROM STRINGLITERAL
-      { import $5 (ImportIdents $2) }
+      { import $loc $5 (ImportIdents $2) }
 ;;
 
 import_declarations:

src/solidity-typechecker/solidity_typechecker.ml

@@ -1934,7 +1934,7 @@ let preprocess_module p menvs m =
       match strip unit_node with
       | Pragma (_) ->
           ()
-      | Import { import_from; import_symbols } ->
+      | Import { import_from; import_symbols ; import_pos=_ } ->
           let file = make_absolute_path base import_from in
           let im = StringMap.find file p.program_modules_by_file in
           let imenv = IdentMap.find im.module_id menvs in
@@ -2000,7 +2000,7 @@ let rec resolve_imports_internal ~only_anonymous
       let seen, ordered =
         List.fold_left (fun (seen, ordered) unit_node ->
             match strip unit_node with
-            | Import { import_from; import_symbols } ->
+            | Import { import_from; import_symbols; import_pos=_ } ->
                 let do_imports =
                   match import_symbols with
                   | ImportAll (None) -> true