diff --git a/infer/src/clang/ALVar.ml b/infer/src/al/ALVar.ml similarity index 100% rename from infer/src/clang/ALVar.ml rename to infer/src/al/ALVar.ml diff --git a/infer/src/clang/ALVar.mli b/infer/src/al/ALVar.mli similarity index 100% rename from infer/src/clang/ALVar.mli rename to infer/src/al/ALVar.mli diff --git a/infer/src/clang/CLintersContext.ml b/infer/src/al/CLintersContext.ml similarity index 100% rename from infer/src/clang/CLintersContext.ml rename to infer/src/al/CLintersContext.ml diff --git a/infer/src/clang/CLintersContext.mli b/infer/src/al/CLintersContext.mli similarity index 100% rename from infer/src/clang/CLintersContext.mli rename to infer/src/al/CLintersContext.mli diff --git a/infer/src/clang/CTLExceptions.ml b/infer/src/al/CTLExceptions.ml similarity index 100% rename from infer/src/clang/CTLExceptions.ml rename to infer/src/al/CTLExceptions.ml diff --git a/infer/src/clang/CTLExceptions.mli b/infer/src/al/CTLExceptions.mli similarity index 100% rename from infer/src/clang/CTLExceptions.mli rename to infer/src/al/CTLExceptions.mli diff --git a/infer/src/clang/CTLParserHelper.ml b/infer/src/al/CTLParserHelper.ml similarity index 100% rename from infer/src/clang/CTLParserHelper.ml rename to infer/src/al/CTLParserHelper.ml diff --git a/infer/src/clang/CTLParserHelper.mli b/infer/src/al/CTLParserHelper.mli similarity index 100% rename from infer/src/clang/CTLParserHelper.mli rename to infer/src/al/CTLParserHelper.mli diff --git a/infer/src/clang/CiOSVersionNumbers.ml b/infer/src/al/CiOSVersionNumbers.ml similarity index 100% rename from infer/src/clang/CiOSVersionNumbers.ml rename to infer/src/al/CiOSVersionNumbers.ml diff --git a/infer/src/clang/CiOSVersionNumbers.mli b/infer/src/al/CiOSVersionNumbers.mli similarity index 100% rename from infer/src/clang/CiOSVersionNumbers.mli rename to infer/src/al/CiOSVersionNumbers.mli diff --git a/infer/src/clang/ComponentKit.ml b/infer/src/al/ComponentKit.ml similarity index 100% rename from infer/src/clang/ComponentKit.ml rename to infer/src/al/ComponentKit.ml diff --git a/infer/src/clang/ComponentKit.mli b/infer/src/al/ComponentKit.mli similarity index 100% rename from infer/src/clang/ComponentKit.mli rename to infer/src/al/ComponentKit.mli diff --git a/infer/src/clang/cFrontend_checkers.ml b/infer/src/al/cFrontend_checkers.ml similarity index 100% rename from infer/src/clang/cFrontend_checkers.ml rename to infer/src/al/cFrontend_checkers.ml diff --git a/infer/src/clang/cFrontend_checkers.mli b/infer/src/al/cFrontend_checkers.mli similarity index 100% rename from infer/src/clang/cFrontend_checkers.mli rename to infer/src/al/cFrontend_checkers.mli diff --git a/infer/src/clang/cFrontend_checkers_main.ml b/infer/src/al/cFrontend_checkers_main.ml similarity index 100% rename from infer/src/clang/cFrontend_checkers_main.ml rename to infer/src/al/cFrontend_checkers_main.ml diff --git a/infer/src/clang/cFrontend_checkers_main.mli b/infer/src/al/cFrontend_checkers_main.mli similarity index 100% rename from infer/src/clang/cFrontend_checkers_main.mli rename to infer/src/al/cFrontend_checkers_main.mli diff --git a/infer/src/clang/cFrontend_errors.ml b/infer/src/al/cFrontend_errors.ml similarity index 100% rename from infer/src/clang/cFrontend_errors.ml rename to infer/src/al/cFrontend_errors.ml diff --git a/infer/src/clang/cFrontend_errors.mli b/infer/src/al/cFrontend_errors.mli similarity index 96% rename from infer/src/clang/cFrontend_errors.mli rename to infer/src/al/cFrontend_errors.mli index bfdf93a15..52d4c397f 100644 --- a/infer/src/clang/cFrontend_errors.mli +++ b/infer/src/al/cFrontend_errors.mli @@ -19,11 +19,10 @@ val filter_parsed_linters : linter list -> SourceFile.t -> linter list val pp_linters : Format.formatter -> linter list -> unit -(* map used to expand macro. It maps a formula id to a triple +(** map used to expand macro. It maps a formula id to a triple (visited, parameters, definition). Visited is used during the expansion phase to understand if the formula was already expanded and, if yes we have a cyclic definifion *) - type macros_map = (bool * ALVar.t list * CTL.t) ALVar.FormulaIdMap.t (** Map a path name to a list of paths. *) diff --git a/infer/src/clang/cIssue.ml b/infer/src/al/cIssue.ml similarity index 100% rename from infer/src/clang/cIssue.ml rename to infer/src/al/cIssue.ml diff --git a/infer/src/clang/cIssue.mli b/infer/src/al/cIssue.mli similarity index 100% rename from infer/src/clang/cIssue.mli rename to infer/src/al/cIssue.mli diff --git a/infer/src/clang/cPredicates.ml b/infer/src/al/cPredicates.ml similarity index 100% rename from infer/src/clang/cPredicates.ml rename to infer/src/al/cPredicates.ml diff --git a/infer/src/clang/cPredicates.mli b/infer/src/al/cPredicates.mli similarity index 100% rename from infer/src/clang/cPredicates.mli rename to infer/src/al/cPredicates.mli diff --git a/infer/src/clang/cTL.ml b/infer/src/al/cTL.ml similarity index 100% rename from infer/src/clang/cTL.ml rename to infer/src/al/cTL.ml diff --git a/infer/src/clang/cTL.mli b/infer/src/al/cTL.mli similarity index 100% rename from infer/src/clang/cTL.mli rename to infer/src/al/cTL.mli diff --git a/infer/src/clang/ctl_lexer.mll b/infer/src/al/ctl_lexer.mll similarity index 100% rename from infer/src/clang/ctl_lexer.mll rename to infer/src/al/ctl_lexer.mll diff --git a/infer/src/clang/ctl_parser.mly b/infer/src/al/ctl_parser.mly similarity index 100% rename from infer/src/clang/ctl_parser.mly rename to infer/src/al/ctl_parser.mly diff --git a/infer/src/clang/ctl_parser_types.ml b/infer/src/al/ctl_parser_types.ml similarity index 100% rename from infer/src/clang/ctl_parser_types.ml rename to infer/src/al/ctl_parser_types.ml diff --git a/infer/src/clang/ctl_parser_types.mli b/infer/src/al/ctl_parser_types.mli similarity index 100% rename from infer/src/clang/ctl_parser_types.mli rename to infer/src/al/ctl_parser_types.mli diff --git a/infer/src/clang/tableaux.ml b/infer/src/al/tableaux.ml similarity index 100% rename from infer/src/clang/tableaux.ml rename to infer/src/al/tableaux.ml diff --git a/infer/src/clang/tableaux.mli b/infer/src/al/tableaux.mli similarity index 100% rename from infer/src/clang/tableaux.mli rename to infer/src/al/tableaux.mli diff --git a/infer/src/clang/types_lexer.mll b/infer/src/al/types_lexer.mll similarity index 100% rename from infer/src/clang/types_lexer.mll rename to infer/src/al/types_lexer.mll diff --git a/infer/src/clang/types_parser.mly b/infer/src/al/types_parser.mly similarity index 100% rename from infer/src/clang/types_parser.mly rename to infer/src/al/types_parser.mly diff --git a/infer/src/deadcode/Makefile b/infer/src/deadcode/Makefile index 420d501ef..d8167911b 100644 --- a/infer/src/deadcode/Makefile +++ b/infer/src/deadcode/Makefile @@ -44,8 +44,8 @@ ml_src_files_without_mli:=$(shell cd .. && for i in $$(find . -not -path "./*stu depend: cd .. && \ ocamldep -native \ - -I IR -I absint -I atd -I backend -I base -I biabduction -I bufferoverrun -I checkers \ - -I clang -I concurrency -I facebook -I integration -I istd -I java \ + -I IR -I absint -I al -I atd -I backend -I base -I biabduction -I bufferoverrun \ + -I checkers -I clang -I concurrency -I facebook -I integration -I istd -I java \ -I labs -I nullsafe -I pulse -I scuba -I quandary -I topl -I unit -I unit/clang -I deadcode \ $(ml_src_files) > deadcode/.depend diff --git a/infer/src/dune.in b/infer/src/dune.in index 5e65825e8..7038c0e26 100644 --- a/infer/src/dune.in +++ b/infer/src/dune.in @@ -11,7 +11,8 @@ let ( ^/ ) = Filename.concat let source_dirs = (if facebook then "facebook" else "opensource") - :: ( (if clang then ["clang"; "unit" ^/ "clang"] else ["clang_stubs"; "unit" ^/ "clang_stubs"]) + :: ( ( if clang then ["al"; "clang"; "unit" ^/ "clang"] + else ["clang_stubs"; "unit" ^/ "clang_stubs"] ) @ [ (if java then "java" else "java_stubs") ; "absint" ; "backend"