Skip to content

Commit 13e281e

Browse files
committed
Remove GenType module.
1 parent 2dc6cf8 commit 13e281e

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

Diff for: jscomp/core/js_implementation.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ let output_deps_set name set =
4242
output_string stdout "\n"
4343

4444
let process_with_gentype cmt_file =
45-
if !Clflags.bs_gentype then
46-
GenType.processCmt cmt_file
45+
if !Clflags.bs_gentype then GenTypeMain.processCmtFile cmt_file
4746

4847
let after_parsing_sig ppf outputprefix ast =
4948
Ast_config.iter_on_bs_config_sigi ast;

Diff for: jscomp/gentype/GenType.ml

-4
This file was deleted.

Diff for: jscomp/gentype/GenTypeMain.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ let readCmt cmtFile =
9393
Log_.item "And try to clean and rebuild.\n\n";
9494
assert false
9595

96-
let processCmtFile ~config cmt =
96+
let processCmtFile cmt =
97+
let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
98+
if !Debug.basic then Log_.item "Cmt %s\n" cmt;
9799
let cmtFile = cmt |> Paths.getCmtFile in
98100
if cmtFile <> "" then
99101
let outputFile = cmt |> Paths.getOutputFile ~config in

Diff for: lib/4.06.1/whole_compiler.ml

+4-12
Original file line numberDiff line numberDiff line change
@@ -241846,7 +241846,9 @@ let readCmt cmtFile =
241846241846
Log_.item "And try to clean and rebuild.\n\n";
241847241847
assert false
241848241848

241849-
let processCmtFile ~config cmt =
241849+
let processCmtFile cmt =
241850+
let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
241851+
if !Debug.basic then Log_.item "Cmt %s\n" cmt;
241850241852
let cmtFile = cmt |> Paths.getCmtFile in
241851241853
if cmtFile <> "" then
241852241854
let outputFile = cmt |> Paths.getOutputFile ~config in
@@ -241918,15 +241920,6 @@ let processCmtFile ~config cmt =
241918241920
outputFile |> GeneratedFiles.logFileAction NoMatch;
241919241921
if Sys.file_exists outputFile then Unix.unlink outputFile)
241920241922

241921-
end
241922-
module GenType
241923-
= struct
241924-
#1 "GenType.ml"
241925-
let processCmt cmt =
241926-
let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
241927-
if !Debug.basic then Log_.item "Add %s\n" cmt;
241928-
cmt |> GenTypeMain.processCmtFile ~config
241929-
241930241923
end
241931241924
module Includeclass : sig
241932241925
#1 "includeclass.mli"
@@ -291650,8 +291643,7 @@ let output_deps_set name set =
291650291643
output_string stdout "\n"
291651291644

291652291645
let process_with_gentype cmt_file =
291653-
if !Clflags.bs_gentype then
291654-
GenType.processCmt cmt_file
291646+
if !Clflags.bs_gentype then GenTypeMain.processCmtFile cmt_file
291655291647

291656291648
let after_parsing_sig ppf outputprefix ast =
291657291649
Ast_config.iter_on_bs_config_sigi ast;

Diff for: lib/4.06.1/whole_compiler.ml.d

-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@
444444
../lib/4.06.1/whole_compiler.ml: ./gentype/ExportModule.ml
445445
../lib/4.06.1/whole_compiler.ml: ./gentype/FindSourceFile.ml
446446
../lib/4.06.1/whole_compiler.ml: ./gentype/GenIdent.ml
447-
../lib/4.06.1/whole_compiler.ml: ./gentype/GenType.ml
448447
../lib/4.06.1/whole_compiler.ml: ./gentype/GenTypeCommon.ml
449448
../lib/4.06.1/whole_compiler.ml: ./gentype/GenTypeConfig.ml
450449
../lib/4.06.1/whole_compiler.ml: ./gentype/GenTypeMain.ml

0 commit comments

Comments
 (0)