for review: more some old #defines
|
View:
New views
2 Messages
—
Rating Filter:
Alert me
|
 |
for review: more some old #defines
by Zoltan Somogyi-2
::
Rate this Message:
runtime/mercury_bootstrap.h:
Move all the deprecated #defines except one (one that we still use) into the section of the file that contains macros that are enabled only if the user asks for them with -DMR_EXTRA_BACKWARDS_COMPAT. library/robdd.m: mdbcomp/rtti_access.m: Stop using some long-ago deprecated #defines. Zoltan. cvs diff: Diffing . cvs diff: Diffing analysis cvs diff: Diffing bindist cvs diff: Diffing boehm_gc cvs diff: Diffing boehm_gc/Mac_files cvs diff: Diffing boehm_gc/cord cvs diff: Diffing boehm_gc/cord/private cvs diff: Diffing boehm_gc/doc cvs diff: Diffing boehm_gc/include cvs diff: Diffing boehm_gc/include/private cvs diff: Diffing boehm_gc/libatomic_ops-1.2 cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests cvs diff: Diffing boehm_gc/tests cvs diff: Diffing boehm_gc/windows-untested cvs diff: Diffing boehm_gc/windows-untested/vc60 cvs diff: Diffing boehm_gc/windows-untested/vc70 cvs diff: Diffing boehm_gc/windows-untested/vc71 cvs diff: Diffing browser cvs diff: Diffing bytecode cvs diff: Diffing compiler cvs diff: Diffing compiler/notes cvs diff: Diffing debian cvs diff: Diffing debian/patches cvs diff: Diffing deep_profiler cvs diff: Diffing deep_profiler/notes cvs diff: Diffing doc cvs diff: Diffing extras cvs diff: Diffing extras/base64 cvs diff: Diffing extras/cgi cvs diff: Diffing extras/complex_numbers cvs diff: Diffing extras/complex_numbers/samples cvs diff: Diffing extras/complex_numbers/tests cvs diff: Diffing extras/concurrency cvs diff: Diffing extras/curs cvs diff: Diffing extras/curs/samples cvs diff: Diffing extras/curses cvs diff: Diffing extras/curses/sample cvs diff: Diffing extras/dynamic_linking cvs diff: Diffing extras/error cvs diff: Diffing extras/fixed cvs diff: Diffing extras/gator cvs diff: Diffing extras/gator/generations cvs diff: Diffing extras/gator/generations/1 cvs diff: Diffing extras/graphics cvs diff: Diffing extras/graphics/easyx cvs diff: Diffing extras/graphics/easyx/samples cvs diff: Diffing extras/graphics/mercury_allegro cvs diff: Diffing extras/graphics/mercury_allegro/examples cvs diff: Diffing extras/graphics/mercury_allegro/samples cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2 cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed cvs diff: Diffing extras/graphics/mercury_glut cvs diff: Diffing extras/graphics/mercury_opengl cvs diff: Diffing extras/graphics/mercury_tcltk cvs diff: Diffing extras/graphics/samples cvs diff: Diffing extras/graphics/samples/calc cvs diff: Diffing extras/graphics/samples/gears cvs diff: Diffing extras/graphics/samples/maze cvs diff: Diffing extras/graphics/samples/pent cvs diff: Diffing extras/lazy_evaluation cvs diff: Diffing extras/lex cvs diff: Diffing extras/lex/samples cvs diff: Diffing extras/lex/tests cvs diff: Diffing extras/log4m cvs diff: Diffing extras/logged_output cvs diff: Diffing extras/moose cvs diff: Diffing extras/moose/samples cvs diff: Diffing extras/moose/tests cvs diff: Diffing extras/mopenssl cvs diff: Diffing extras/morphine cvs diff: Diffing extras/morphine/non-regression-tests cvs diff: Diffing extras/morphine/scripts cvs diff: Diffing extras/morphine/source cvs diff: Diffing extras/net cvs diff: Diffing extras/odbc cvs diff: Diffing extras/posix cvs diff: Diffing extras/posix/samples cvs diff: Diffing extras/quickcheck cvs diff: Diffing extras/quickcheck/tutes cvs diff: Diffing extras/references cvs diff: Diffing extras/references/samples cvs diff: Diffing extras/references/tests cvs diff: Diffing extras/solver_types cvs diff: Diffing extras/solver_types/library cvs diff: Diffing extras/trailed_update cvs diff: Diffing extras/trailed_update/samples cvs diff: Diffing extras/trailed_update/tests cvs diff: Diffing extras/windows_installer_generator cvs diff: Diffing extras/windows_installer_generator/sample cvs diff: Diffing extras/windows_installer_generator/sample/images cvs diff: Diffing extras/xml cvs diff: Diffing extras/xml/samples cvs diff: Diffing extras/xml_stylesheets cvs diff: Diffing java cvs diff: Diffing java/runtime cvs diff: Diffing library Index: library/robdd.m =================================================================== RCS file: /home/mercury/mercury1/repository/mercury/library/robdd.m,v retrieving revision 1.13 diff -u -b -r1.13 robdd.m --- library/robdd.m 26 Mar 2009 06:32:18 -0000 1.13 +++ library/robdd.m 18 Oct 2009 10:35:19 -0000 @@ -1469,7 +1469,7 @@ node_num(R::in) = (N::out), [will_not_call_mercury, promise_pure], " - N = (Integer) R; + N = (MR_Integer) R; "). :- func terminal_name(robdd(T)) = string. cvs diff: Diffing mdbcomp Index: mdbcomp/rtti_access.m =================================================================== RCS file: /home/mercury/mercury1/repository/mercury/mdbcomp/rtti_access.m,v retrieving revision 1.13 diff -u -b -r1.13 rtti_access.m --- mdbcomp/rtti_access.m 14 Sep 2009 05:58:22 -0000 1.13 +++ mdbcomp/rtti_access.m 18 Oct 2009 15:27:48 -0000 @@ -381,7 +381,7 @@ ** for the numerical suffix. */ start_of_num == out_base_name_len && - strneq(out_name, in_name, start_of_num) + MR_strneq(out_name, in_name, start_of_num) ) || ( @@ -393,7 +393,7 @@ start_of_num == out_base_name_len + 1 && start_of_num > 0 && in_name[start_of_num - 1] == '_' && - strneq(out_name, in_name, start_of_num - 1) + MR_strneq(out_name, in_name, start_of_num - 1) ) )) { cvs diff: Diffing profiler cvs diff: Diffing robdd cvs diff: Diffing runtime Index: runtime/mercury_bootstrap.h =================================================================== RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v retrieving revision 1.41 diff -u -b -r1.41 mercury_bootstrap.h --- runtime/mercury_bootstrap.h 13 Jul 2009 05:27:12 -0000 1.41 +++ runtime/mercury_bootstrap.h 18 Oct 2009 11:11:17 -0000 @@ -15,7 +15,47 @@ #ifndef MERCURY_BOOTSTRAP_H #define MERCURY_BOOTSTRAP_H -#ifndef MR_DISABLE_ALIASES +/*---------------------------------------------------------------------------*/ +/* +** This stuff is enabled by default, +** but you can disable it by defining MR_NO_BACKWARDS_COMPAT. +*/ + +#ifndef MR_NO_BACKWARDS_COMPAT + +/* +** MR_Bool is the C representation for the Mercury type bool__bool. +** For ordinary booleans, use MR_bool in mercury_std.h. +** +** XXX Why is it not defined defined to be MR_Word, and why is the definition +** here? +*/ + +typedef MR_intptr_t MR_Bool; + +#endif /* !MR_NO_BACKWARDS_COMPAT */ + +/*---------------------------------------------------------------------------*/ +/* +** This stuff is not enabled by default. +** To enable it, you must explicitly define MR_EXTRA_BACKWARDS_COMPAT. +*/ + +#ifdef MR_EXTRA_BACKWARDS_COMPAT + +/* +** For a long time the Mercury C types were defined as Char, Float, +** Integer, Word, etc. There will doubtless be lots of C code in +** libraries that relies upon these names. +** +** People may have written code that relies upon these names, so +** if you remove these names you need to give warning (unlike some of +** the other changes in this file). +*/ + +#include "mercury_types.h" +#include "mercury_float.h" + #define MR_Table_Trie_Step MR_TableTrieStep #define MR_Long_Lval_Type MR_LongLvalType #define MR_Long_Lval MR_LongLval @@ -40,31 +80,10 @@ #define MR_Stack_Walk_Step_Result MR_StackWalkStepResult #define MR_Context_Position MR_ContextPosition #define MR_find_first_call_seq_or_event MR_FindFirstCallSeqOrEvent -#endif #define MR_STATIC(l) MR_ENTRY(l) #define MR_GOTO_STATIC(l) MR_GOTO_ENTRY(l) -/* -** This stuff is enabled by default, -** but you can disable it by defining MR_NO_BACKWARDS_COMPAT. -*/ - -#ifndef MR_NO_BACKWARDS_COMPAT - -/* -** For a long time the Mercury C types were defined as Char, Float, -** Integer, Word, etc. There will doubtless be lots of C code in -** libraries that relies upon these names. -** -** People may have written code that relies upon these names, so -** if you remove these names you need to give warning (unlike some of -** the other changes in this file). -*/ - -#include "mercury_types.h" -#include "mercury_float.h" - typedef MR_Word Word; typedef MR_Code Code; typedef MR_Char Char; @@ -76,11 +95,6 @@ typedef MR_String String; typedef MR_ConstString ConstString; -/* -** MR_Bool is the C representation for the Mercury type bool__bool. -** For ordinary booleans, use MR_bool in mercury_std.h. -*/ -typedef MR_intptr_t MR_Bool; typedef MR_Bool Bool; /* @@ -115,15 +129,6 @@ #define NO_RETURN MR_NO_RETURN #endif -#endif /* !MR_NO_BACKWARDS_COMPAT */ - -/*---------------------------------------------------------------------------*/ -/* -** This stuff is not enabled by default. -** To enable it, you must explicitly define MR_EXTRA_BACKWARDS_COMPAT. -*/ -#ifdef MR_EXTRA_BACKWARDS_COMPAT - #define MR_saved_reg(save_area, n) \ MR_LVALUE_COND((n) > MR_MAX_REAL_R_REG, \ (save_area)[(n) + MR_NUM_SPECIAL_REG - 1], \ cvs diff: Diffing runtime/GETOPT cvs diff: Diffing runtime/machdeps cvs diff: Diffing samples cvs diff: Diffing samples/c_interface cvs diff: Diffing samples/c_interface/c_calls_mercury cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury cvs diff: Diffing samples/c_interface/mercury_calls_c cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus cvs diff: Diffing samples/c_interface/mercury_calls_fortran cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury cvs diff: Diffing samples/c_interface/standalone_c cvs diff: Diffing samples/diff cvs diff: Diffing samples/muz cvs diff: Diffing samples/rot13 cvs diff: Diffing samples/solutions cvs diff: Diffing samples/solver_types cvs diff: Diffing samples/tests cvs diff: Diffing samples/tests/c_interface cvs diff: Diffing samples/tests/c_interface/c_calls_mercury cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury cvs diff: Diffing samples/tests/c_interface/mercury_calls_c cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury cvs diff: Diffing samples/tests/diff cvs diff: Diffing samples/tests/muz cvs diff: Diffing samples/tests/rot13 cvs diff: Diffing samples/tests/solutions cvs diff: Diffing samples/tests/toplevel cvs diff: Diffing scripts cvs diff: Diffing slice cvs diff: Diffing ssdb cvs diff: Diffing tests cvs diff: Diffing tests/analysis cvs diff: Diffing tests/analysis/ctgc cvs diff: Diffing tests/analysis/excp cvs diff: Diffing tests/analysis/ext cvs diff: Diffing tests/analysis/sharing cvs diff: Diffing tests/analysis/table cvs diff: Diffing tests/analysis/trail cvs diff: Diffing tests/analysis/unused_args cvs diff: Diffing tests/benchmarks cvs diff: Diffing tests/debugger cvs diff: Diffing tests/debugger/declarative cvs diff: Diffing tests/dppd cvs diff: Diffing tests/general cvs diff: Diffing tests/general/accumulator cvs diff: Diffing tests/general/string_format cvs diff: Diffing tests/general/structure_reuse cvs diff: Diffing tests/grade_subdirs cvs diff: Diffing tests/hard_coded cvs diff: Diffing tests/hard_coded/exceptions cvs diff: Diffing tests/hard_coded/purity cvs diff: Diffing tests/hard_coded/sub-modules cvs diff: Diffing tests/hard_coded/typeclasses cvs diff: Diffing tests/invalid cvs diff: Diffing tests/invalid/purity cvs diff: Diffing tests/misc_tests cvs diff: Diffing tests/mmc_make cvs diff: Diffing tests/mmc_make/lib cvs diff: Diffing tests/par_conj cvs diff: Diffing tests/recompilation cvs diff: Diffing tests/stm cvs diff: Diffing tests/stm/orig cvs diff: Diffing tests/stm/orig/stm-compiler cvs diff: Diffing tests/stm/orig/stm-compiler/test1 cvs diff: Diffing tests/stm/orig/stm-compiler/test10 cvs diff: Diffing tests/stm/orig/stm-compiler/test2 cvs diff: Diffing tests/stm/orig/stm-compiler/test3 cvs diff: Diffing tests/stm/orig/stm-compiler/test4 cvs diff: Diffing tests/stm/orig/stm-compiler/test5 cvs diff: Diffing tests/stm/orig/stm-compiler/test6 cvs diff: Diffing tests/stm/orig/stm-compiler/test7 cvs diff: Diffing tests/stm/orig/stm-compiler/test8 cvs diff: Diffing tests/stm/orig/stm-compiler/test9 cvs diff: Diffing tests/stm/orig/stm-compiler-par cvs diff: Diffing tests/stm/orig/stm-compiler-par/bm1 cvs diff: Diffing tests/stm/orig/stm-compiler-par/bm2 cvs diff: Diffing tests/stm/orig/stm-compiler-par/stmqueue cvs diff: Diffing tests/stm/orig/stm-compiler-par/test1 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test10 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test11 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test2 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test3 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test4 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test5 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test6 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test7 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test8 cvs diff: Diffing tests/stm/orig/stm-compiler-par/test9 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test1 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test2 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test3 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test4 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test5 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test6 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test7 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test8 cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test9 cvs diff: Diffing tests/tabling cvs diff: Diffing tests/term cvs diff: Diffing tests/trailing cvs diff: Diffing tests/valid cvs diff: Diffing tests/warnings cvs diff: Diffing tools cvs diff: Diffing trace cvs diff: Diffing util cvs diff: Diffing vim cvs diff: Diffing vim/after cvs diff: Diffing vim/ftplugin cvs diff: Diffing vim/syntax -------------------------------------------------------------------------- mercury-reviews mailing list Post messages to: mercury-reviews@... Administrative Queries: owner-mercury-reviews@... Subscriptions: mercury-reviews-request@... -------------------------------------------------------------------------- |
|
|
Re: for review: more some old #defines
by Julien Fischer-2
::
Rate this Message:
On Tue, 20 Oct 2009, Zoltan Somogyi wrote: > runtime/mercury_bootstrap.h: > Move all the deprecated #defines except one (one that we still use) > into the section of the file that contains macros that are enabled > only if the user asks for them with -DMR_EXTRA_BACKWARDS_COMPAT. > > library/robdd.m: > mdbcomp/rtti_access.m: > Stop using some long-ago deprecated #defines. That's fine. Julien. -------------------------------------------------------------------------- mercury-reviews mailing list Post messages to: mercury-reviews@... Administrative Queries: owner-mercury-reviews@... Subscriptions: mercury-reviews-request@... -------------------------------------------------------------------------- |
| Free embeddable forum powered by Nabble | Forum Help |
