mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-17 18:33:58 +00:00
2b559ad054
Estimated hours taken: 8
Branches: main
Move the RTTI-related parts of std_util.m to three new modules in the standard
library, and (in the case of embedded C code) to new modules in the runtime.
The main reason for this is to allow a reorganization of some of the
RTTi-related functionality without breaking backward compatibility. However,
the new arrangement should also be easier to maintain.
Use a separate type_ctor_rep for functions, to distinguish them from predicates
for RTTI code. (At one point, I thought this could avoid the need for the
change to the initialization files mentioned below. It can't, but it is a good
idea in any case.)
library/std_util.m:
Remove the functionality moved to the new modules, and replace them
with type equivalences and forwarding code. There are no changes in
the meanings of the user-visible predicates, with two exceptions.
- First, the true, equivalence-expanded names of what used to be
std_util:type_desc and std_util:type_ctor_desc are now
type_desc:type_desc and type_desc: type_ctor_desc.
- Second, deconstructing a function term now yields
"<<function>>" instead of "<<predicate>>".
The intention is that the RTTI predicates in std_util.m will continue
to work in a backwards-compatible manner for the near future, i.e. as
the new modules are updated, the code in std_util will be updated to
maintain the same functionality, modulo improvements such as avoiding
unwanted exceptions. When the RTTI functionality in the other modules
has stabilised, the RTTI predicates in std_util.m should be marked
obsolete.
The exported but non-documented functionality of std_util has been
moved to one of the new modules without forwarding code, with one
of the moved predicates being turned into the function it should have
been in the first place.
library/construct.m:
library/deconstruct.m:
library/type_desc.m:
Three new modules for the code moved from std_util.m.
library/library.m:
compiler/modules.m:
Record the names of the three new library modules.
runtime/mercury.[ch]:
compiler/mlds_to_il.m:
Record that type_desc is now in type_desc.m, not std_util.m.
compiler/static_term.m:
Import the deconstruct module, since we are using its undocumented
facilities.
runtime/Mmakefile:
Mention the two new modules.
runtime/mercury_construct.[ch]:
runtime/mercury_type_desc.[ch]:
Two new modules holding the C functions that used to be in foreign_code
in std_util, now using MR_ instead of ML_ prefixes, and being more
consistent about indentation.
runtime/mercury_type_info.h:
Add a new type_ctor_rep for functions, separate from predicates.
(It reuses the EQUIV_VAR type_ctor_rep, which hasn't been used
in ages.)
Use type_ctor_reps to distinguish between the type_ctor_infos of
pred/0 and func/0. However, to create higher order typeinfos, we
still need to know the addresses of the type_ctor_infos for
pred/0 and func/0, and we still need to know the address of the
type_ctor_info for tuples to create typeinfos for tuples. Since
these three type_ctor_infos are defined in the library,
we cannot access them directly from the runtime. We therefore need
to access them indirectly in the usual manner, via address_of
variables initialized by mkinit-generated code.
library/builtin.m:
library/private_builtin.m:
library/rtti_implementation.m:
runtime/mercury.c:
runtime/mercury_mcpp.{h,cpp}:
java/TypeCtorRep.java:
Updates to accommondate the new function type_ctor_rep.
runtime/mercury_type_info.[ch]:
Add some functions from foreign_code in std_util that fit in best here.
runtime/mercury_ml_expand_body.h:
runtime/mercury_tabling.h:
runtime/mercury_unify_compare_body.h:
Delete the code for handling EQUIV_VAR, and add code for handling
functions.
runtime/mercury_init.h:
runtime/mercury_wrapper.[ch]:
Add three variables holding the address of the type_ctor_infos
representing functions, predicates and tuples.
util/mkinit.c:
Fill in these three variables.
tests/general/accumulator/construct.{m,exp}:
tests/general/accumulator/deconstruct.{m,exp}:
tests/hard_coded/construct.{m,exp}:
Rename these tests by adding a _test at the ends of their names,
in order to avoid collisions with the names of the new standard library
modules. The test cases have not changed, with the exception of the :-
module declaration of course.
tests/general/accumulator/Mmakefile:
tests/general/accumulator/INTRODUCED:
tests/hard_coded/Mmakefile:
Record the name changes.
tests/hard_coded/existential_float.exp:
Updated the expected output to reflect that deconstructions now print
"<<function>>" instead of "<<predicate>>" when appropriate.
tests/hard_coded/higher_order_type_manip.exp:
Updated the expected output to reflect the new name of what used to be
std_util:type_desc.
trace/mercury_trace_browse.c:
trace/mercury_trace_external.c:
trace/mercury_trace_help.c:
#include type_desc.h instead of std_util.h, since the C functions
we want to call are now defined there.
trace/mercury_trace_vars.c:
Update to account for the movement of type_desc from std_util to
type_desc, and ensure that we don't refer to any type_ctor_infos
in MLDS grades.
61 lines
2.4 KiB
Java
61 lines
2.4 KiB
Java
//
|
|
// Copyright (C) 2001-2002 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.
|
|
//
|
|
|
|
package mercury.runtime;
|
|
|
|
public class TypeCtorRep {
|
|
|
|
// Constants
|
|
|
|
public static final int MR_TYPECTOR_REP_ENUM = 0;
|
|
public static final int MR_TYPECTOR_REP_ENUM_USEREQ = 1;
|
|
public static final int MR_TYPECTOR_REP_DU = 2;
|
|
public static final int MR_TYPECTOR_REP_DU_USEREQ = 3;
|
|
public static final int MR_TYPECTOR_REP_NOTAG = 4;
|
|
public static final int MR_TYPECTOR_REP_NOTAG_USEREQ = 5;
|
|
public static final int MR_TYPECTOR_REP_EQUIV = 6;
|
|
public static final int MR_TYPECTOR_REP_FUNC = 7;
|
|
public static final int MR_TYPECTOR_REP_INT = 8;
|
|
public static final int MR_TYPECTOR_REP_CHAR = 9;
|
|
public static final int MR_TYPECTOR_REP_FLOAT = 10;
|
|
public static final int MR_TYPECTOR_REP_STRING = 11;
|
|
public static final int MR_TYPECTOR_REP_PRED = 12;
|
|
public static final int MR_TYPECTOR_REP_UNIV = 13;
|
|
public static final int MR_TYPECTOR_REP_VOID = 14;
|
|
public static final int MR_TYPECTOR_REP_C_POINTER = 15;
|
|
public static final int MR_TYPECTOR_REP_TYPEINFO = 16;
|
|
public static final int MR_TYPECTOR_REP_TYPECLASSINFO = 17;
|
|
public static final int MR_TYPECTOR_REP_ARRAY = 18;
|
|
public static final int MR_TYPECTOR_REP_SUCCIP = 19;
|
|
public static final int MR_TYPECTOR_REP_HP = 20;
|
|
public static final int MR_TYPECTOR_REP_CURFR = 21;
|
|
public static final int MR_TYPECTOR_REP_MAXFR = 22;
|
|
public static final int MR_TYPECTOR_REP_REDOFR = 23;
|
|
public static final int MR_TYPECTOR_REP_REDOIP = 24;
|
|
public static final int MR_TYPECTOR_REP_TRAIL_PTR = 25;
|
|
public static final int MR_TYPECTOR_REP_TICKET = 26;
|
|
public static final int MR_TYPECTOR_REP_NOTAG_GROUND = 27;
|
|
public static final int MR_TYPECTOR_REP_NOTAG_GROUND_USEREQ = 28;
|
|
public static final int MR_TYPECTOR_REP_EQUIV_GROUND = 29;
|
|
public static final int MR_TYPECTOR_REP_TUPLE = 30;
|
|
public static final int MR_TYPECTOR_REP_RESERVED_ADDR = 31;
|
|
public static final int MR_TYPECTOR_REP_RESERVED_ADDR_USEREQ = 32;
|
|
public static final int MR_TYPECTOR_REP_TYPECTORINFO = 33;
|
|
public static final int MR_TYPECTOR_REP_BASETYPECLASSINFO = 34;
|
|
public static final int MR_TYPECTOR_REP_UNKNOWN = 35;
|
|
|
|
// Instance variable for TypeCtorRep objects.
|
|
|
|
public int value;
|
|
|
|
// Constructor
|
|
|
|
public TypeCtorRep(int arg) {
|
|
this.value = arg;
|
|
}
|
|
}
|
|
|