diff --git a/browser/listing.m b/browser/listing.m index a430bc95e..7870233c8 100644 --- a/browser/listing.m +++ b/browser/listing.m @@ -1,7 +1,7 @@ %---------------------------------------------------------------------------% % vim: ft=mercury ts=4 sw=4 et %---------------------------------------------------------------------------% -% Copyright (C) 2005-2007, 2010 The University of Melbourne. +% Copyright (C) 2005-2007, 2010-2011 The University of Melbourne. % This file may only be copied under the terms of the GNU Library General % Public License - see the file COPYING.LIB in the Mercury distribution. % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0 @@ -192,11 +192,10 @@ list_file(OutStrm, ErrStrm, FileName, FirstLine, LastLine, MarkLine, Path, :- pred write_to_c_file(c_file_ptr::in, string::in, io::di, io::uo) is det. :- pragma foreign_proc("C", - write_to_c_file(ErrStrm::in, Str::in, IO0::di, IO::uo), + write_to_c_file(ErrStrm::in, Str::in, _IO0::di, _IO::uo), [promise_pure, thread_safe, will_not_call_mercury], " fputs(Str, (FILE *)ErrStrm); - IO = IO0; "). %-----------------------------------------------------------------------------% @@ -279,7 +278,7 @@ find_and_open_file([Dir | Path], FileName, Result, !IO) :- :- pragma foreign_proc("C", print_lines_in_range_c(InStrm::in, OutStrm::in, ThisLine::in, FirstLine::in, - LastLine::in, MarkLine::in, IO0::di, IO::uo), + LastLine::in, MarkLine::in, _IO0::di, _IO::uo), [promise_pure, thread_safe, will_not_call_mercury], " if (FirstLine <= ThisLine && ThisLine <= LastLine) { @@ -303,7 +302,6 @@ find_and_open_file([Dir | Path], FileName, Result, !IO) :- } } } - IO = IO0; "). %-----------------------------------------------------------------------------% diff --git a/compiler/layout_out.m b/compiler/layout_out.m index 622db6319..a9b2564d3 100644 --- a/compiler/layout_out.m +++ b/compiler/layout_out.m @@ -375,9 +375,10 @@ output_layout_array_decls(Info, PseudoTypeInfos, HLDSVarNums, ; AllocSites = [_ | _], AllocSiteArrayName = alloc_site_array, + list.length(AllocSites, NumAllocSites), output_layout_array_name_storage_type_name(MangledModuleName, AllocSiteArrayName, not_being_defined, !IO), - io.write_string("[];\n", !IO) + io.format("[%d];\n", [i(NumAllocSites)], !IO) ). output_layout_array_defns(Info, PseudoTypeInfos, HLDSVarNums, diff --git a/deep_profiler/.cvsignore b/deep_profiler/.cvsignore index a50cb2302..036833295 100644 --- a/deep_profiler/.cvsignore +++ b/deep_profiler/.cvsignore @@ -25,6 +25,8 @@ mdprof_server mdprof_dump mdprof_feedback mdprof_procrep +mdprof_create_feedback +mdprof_report_feedback Mercury Mercury.modules .deep.tags diff --git a/doc/.cvsignore b/doc/.cvsignore index 8dc3cdc71..ce563d1e9 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -9,3 +9,5 @@ library-menu.texi library-chapters.texi mercury.html mercury.info mdb_doc mdb_command_list mdb_command_test.inp +Prof.MemoryCells +Prof.MemoryWords diff --git a/samples/.cvsignore b/samples/.cvsignore index 41b0c4efe..6e79ff2fe 100644 --- a/samples/.cvsignore +++ b/samples/.cvsignore @@ -9,3 +9,4 @@ *.mih all_solutions calculator cat committed_choice eliza hello ultra_sub sort calculator2 e expand_terms interpreter +Mercury diff --git a/tests/.cvsignore b/tests/.cvsignore index 8114f3460..d5eb17857 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -13,3 +13,7 @@ UNEXPECTED_FAILED_TESTS mdbrc mdbrc.in runtests.errs +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/analysis/.cvsignore b/tests/analysis/.cvsignore index 99009f61a..c20ed2840 100644 --- a/tests/analysis/.cvsignore +++ b/tests/analysis/.cvsignore @@ -3,3 +3,7 @@ FAILED_TESTS NOMAKE_DIRS .mgnuc_opts .mgnuc_copts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/benchmarks/.cvsignore b/tests/benchmarks/.cvsignore index 276eb15d6..e02a11440 100644 --- a/tests/benchmarks/.cvsignore +++ b/tests/benchmarks/.cvsignore @@ -10,3 +10,5 @@ Prof.MemoryWords Prof.MemoryCells CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl diff --git a/tests/debugger/.cvsignore b/tests/debugger/.cvsignore index bbd5350b5..1a4b51f50 100644 --- a/tests/debugger/.cvsignore +++ b/tests/debugger/.cvsignore @@ -31,3 +31,7 @@ dice.passes runtests.errs .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/debugger/declarative/.cvsignore b/tests/debugger/declarative/.cvsignore index c28ac95ab..1fec22749 100644 --- a/tests/debugger/declarative/.cvsignore +++ b/tests/debugger/declarative/.cvsignore @@ -6,3 +6,7 @@ CLEAN dice.pass .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/dppd/.cvsignore b/tests/dppd/.cvsignore index e94421da0..1e69adb79 100644 --- a/tests/dppd/.cvsignore +++ b/tests/dppd/.cvsignore @@ -1,3 +1,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/general/.cvsignore b/tests/general/.cvsignore index df5cc04b8..5a61470d8 100644 --- a/tests/general/.cvsignore +++ b/tests/general/.cvsignore @@ -20,3 +20,7 @@ base_string_to_integer *.d *.mih *.mh +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/general/accumulator/.cvsignore b/tests/general/accumulator/.cvsignore index 1450b1028..fcb562c76 100644 --- a/tests/general/accumulator/.cvsignore +++ b/tests/general/accumulator/.cvsignore @@ -26,3 +26,7 @@ disj INTRODUCED.diff .mgnuc_opts .mgnuc_copts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/general/string_format/.cvsignore b/tests/general/string_format/.cvsignore index e94421da0..1e69adb79 100644 --- a/tests/general/string_format/.cvsignore +++ b/tests/general/string_format/.cvsignore @@ -1,3 +1,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/grade_subdirs/.cvsignore b/tests/grade_subdirs/.cvsignore index 70ae0ce26..879976c0d 100644 --- a/tests/grade_subdirs/.cvsignore +++ b/tests/grade_subdirs/.cvsignore @@ -1,2 +1,6 @@ .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/hard_coded/.cvsignore b/tests/hard_coded/.cvsignore index 1e6989025..717cbd92d 100644 --- a/tests/hard_coded/.cvsignore +++ b/tests/hard_coded/.cvsignore @@ -125,3 +125,7 @@ runtests.errs FAILED_TESTS NOMAKE_DIRS Mercury.modules +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/hard_coded/exceptions/.cvsignore b/tests/hard_coded/exceptions/.cvsignore index e94421da0..1e69adb79 100644 --- a/tests/hard_coded/exceptions/.cvsignore +++ b/tests/hard_coded/exceptions/.cvsignore @@ -1,3 +1,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/hard_coded/purity/.cvsignore b/tests/hard_coded/purity/.cvsignore index e94421da0..1e69adb79 100644 --- a/tests/hard_coded/purity/.cvsignore +++ b/tests/hard_coded/purity/.cvsignore @@ -1,3 +1,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/hard_coded/sub-modules/.cvsignore b/tests/hard_coded/sub-modules/.cvsignore index 41d04b645..6d3de433a 100644 --- a/tests/hard_coded/sub-modules/.cvsignore +++ b/tests/hard_coded/sub-modules/.cvsignore @@ -7,3 +7,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/hard_coded/typeclasses/.cvsignore b/tests/hard_coded/typeclasses/.cvsignore index 7475b27a7..9d8ed3d14 100644 --- a/tests/hard_coded/typeclasses/.cvsignore +++ b/tests/hard_coded/typeclasses/.cvsignore @@ -26,3 +26,7 @@ FAILED_TESTS .mgnuc_copts .mgnuc_opts runtests.errs +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/invalid/.cvsignore b/tests/invalid/.cvsignore index c7fc73b53..8a4c6b8fa 100644 --- a/tests/invalid/.cvsignore +++ b/tests/invalid/.cvsignore @@ -23,3 +23,7 @@ FAILED_TESTS Mercury .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/invalid/purity/.cvsignore b/tests/invalid/purity/.cvsignore index dc4b40277..550d5c20b 100644 --- a/tests/invalid/purity/.cvsignore +++ b/tests/invalid/purity/.cvsignore @@ -16,3 +16,7 @@ FAILED_TESTS runtests.errs .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/misc_tests/.cvsignore b/tests/misc_tests/.cvsignore index 3c76f1b1c..3545430ee 100644 --- a/tests/misc_tests/.cvsignore +++ b/tests/misc_tests/.cvsignore @@ -4,3 +4,7 @@ CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/mmc_make/.cvsignore b/tests/mmc_make/.cvsignore index 70ae0ce26..879976c0d 100644 --- a/tests/mmc_make/.cvsignore +++ b/tests/mmc_make/.cvsignore @@ -1,2 +1,6 @@ .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/par_conj/.cvsignore b/tests/par_conj/.cvsignore index 73b4546c3..5e924d147 100644 --- a/tests/par_conj/.cvsignore +++ b/tests/par_conj/.cvsignore @@ -14,3 +14,7 @@ undead_proc.h CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/recompilation/.cvsignore b/tests/recompilation/.cvsignore index 1688ac224..58fc618d2 100644 --- a/tests/recompilation/.cvsignore +++ b/tests/recompilation/.cvsignore @@ -2,3 +2,7 @@ CLEAN *.err .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/tabling/.cvsignore b/tests/tabling/.cvsignore index e389a3ba8..f20dc03b5 100644 --- a/tests/tabling/.cvsignore +++ b/tests/tabling/.cvsignore @@ -11,3 +11,7 @@ CLEAN .mgnuc_copts .mgnuc_opts table_foreign_enum +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/term/.cvsignore b/tests/term/.cvsignore index bf2dea85a..813614f8c 100644 --- a/tests/term/.cvsignore +++ b/tests/term/.cvsignore @@ -63,3 +63,7 @@ vangelder CLEAN .mgnuc_copts .mgnuc_opts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/trailing/.cvsignore b/tests/trailing/.cvsignore index bb6af5189..a2d4a54a6 100644 --- a/tests/trailing/.cvsignore +++ b/tests/trailing/.cvsignore @@ -1,2 +1,6 @@ .mgnuc_opts .mgnuc_copts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/valid/.cvsignore b/tests/valid/.cvsignore index 47e1d7aaa..6e2b7203f 100644 --- a/tests/valid/.cvsignore +++ b/tests/valid/.cvsignore @@ -21,3 +21,7 @@ CLEAN .mgnuc_copts FAILED_TESTS runtests.errs +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords diff --git a/tests/warnings/.cvsignore b/tests/warnings/.cvsignore index f5b66be2d..6eb01fbf2 100644 --- a/tests/warnings/.cvsignore +++ b/tests/warnings/.cvsignore @@ -5,3 +5,7 @@ CLEAN .allres .mgnuc_opts .mgnuc_copts +Prof.CallPair +Prof.Decl +Prof.MemoryCells +Prof.MemoryWords