Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #2776 from JinShil/move_code
Browse files Browse the repository at this point in the history
Reorganzie a few things in object.d so similar constructs are found next to each other
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>
  • Loading branch information
dlang-bot committed Aug 30, 2019
2 parents 60fa829 + 79124bd commit a2ee5cc
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions src/object.d
Expand Up @@ -38,23 +38,6 @@ alias dstring = immutable(dchar)[];

version (D_ObjectiveC) public import core.attribute : selector;

/// See $(REF capacity, core,internal,array,capacity)
public import core.internal.array.capacity: capacity;
/// See $(REF reserve, core,internal,array,capacity)
public import core.internal.array.capacity: reserve;
/// See $(REF assumeSafeAppend, core,internal,array,capacity)
public import core.internal.array.capacity: assumeSafeAppend;

/// See $(REF destroy, core,internal,destruction)
public import core.internal.destruction: destroy;

private
{
extern (C) Object _d_newclass(const TypeInfo_Class ci);
}

public @trusted @nogc nothrow pure extern (C) void _d_delThrowable(scope Throwable);

/**
* All D class objects inherit from Object.
*/
Expand Down Expand Up @@ -975,6 +958,8 @@ class TypeInfo_Delegate : TypeInfo
override @property immutable(void)* rtInfo() nothrow pure const @safe { return RTInfo!(int delegate()); }
}

private extern (C) Object _d_newclass(const TypeInfo_Class ci);

/**
* Runtime type information about a class.
* Can be retrieved from an object instance by using the
Expand Down Expand Up @@ -2125,6 +2110,16 @@ class Error : Throwable
}
}

/// See $(REF capacity, core,internal,array,capacity)
public import core.internal.array.capacity: capacity;
/// See $(REF reserve, core,internal,array,capacity)
public import core.internal.array.capacity: reserve;
/// See $(REF assumeSafeAppend, core,internal,array,capacity)
public import core.internal.array.capacity: assumeSafeAppend;

/// See $(REF destroy, core,internal,destruction)
public import core.internal.destruction: destroy;

extern (C)
{
// from druntime/src/rt/aaA.d
Expand Down Expand Up @@ -3211,6 +3206,8 @@ public import core.internal.postblit: __ArrayPostblit;
public import core.internal.switch_: __switch;
public import core.internal.switch_: __switch_error;

public @trusted @nogc nothrow pure extern (C) void _d_delThrowable(scope Throwable);

// Compare class and interface objects for ordering.
private int __cmp(Obj)(Obj lhs, Obj rhs)
if (is(Obj : Object))
Expand Down

0 comments on commit a2ee5cc

Please sign in to comment.