Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

core.stdc.stdlib: annotate with 'scope' #1749

Merged
andralex merged 1 commit into from
Feb 13, 2017
Merged

core.stdc.stdlib: annotate with 'scope' #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions src/core/stdc/stdlib.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ extern (C):
/* Placed outside @nogc in order to not constrain what the callback does.
*/
///
alias int function(in void*, in void*) _compare_fp_t;
alias int function(scope const void*, scope const void*) _compare_fp_t;
///
void* bsearch(in void* key, in void* base, size_t nmemb, size_t size, _compare_fp_t compar);
inout(void)* bsearch(scope const void* key, scope inout(void)* base, size_t nmemb, size_t size, _compare_fp_t compar);
///
void qsort(void* base, size_t nmemb, size_t size, _compare_fp_t compar);
void qsort(scope void* base, size_t nmemb, size_t size, _compare_fp_t compar);


nothrow:
Expand Down Expand Up @@ -81,55 +81,55 @@ else version(CRuntime_Bionic) enum RAND_MAX = 0x7fffffff;
else static assert( false, "Unsupported platform" );

///
double atof(in char* nptr);
double atof(scope const char* nptr);
///
int atoi(in char* nptr);
int atoi(scope const char* nptr);
///
c_long atol(in char* nptr);
c_long atol(scope const char* nptr);
///
long atoll(in char* nptr);
long atoll(scope const char* nptr);
Copy link
Member

@MartinNowak MartinNowak Feb 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was circulated for quite a while that in is supposed to mean scope const, in the compiler it was always just const but lots of people have used it as scope const. Have you thought about actually changing the semantic of in?

Copy link
Member

@jmdavis jmdavis Feb 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://forum.dlang.org/post/o6m17i$1jh7$1@digitalmars.com


///
double strtod(in char* nptr, char** endptr);
double strtod(scope inout(char)* nptr, scope inout(char)** endptr);
///
float strtof(in char* nptr, char** endptr);
float strtof(scope inout(char)* nptr, scope inout(char)** endptr);
///
c_long strtol(in char* nptr, char** endptr, int base);
c_long strtol(scope inout(char)* nptr, scope inout(char)** endptr, int base);
Copy link
Member

@rainers rainers Feb 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to have broken the travis builds for dmd, e.g. https://travis-ci.org/dlang/dmd/jobs/201062823#L5271

The change seems ok, but it breaks code that tried to work around the wrong annotation. The problem with fixing dmd is that it is built with both dmd 2.073 and git-master...

Copy link
Member Author

@WalterBright WalterBright Feb 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error message:

mars.d(420): Error: function core.stdc.stdlib.strtol (scope inout(char)* nptr, scope inout(char)** endptr, int base) is not callable using argument types (const(char)*, char**, int)

This is the problem I was trying to correct. The old declaration allowed a const pointer to be converted to a mutable one. Any code that relies on such needs to be fixed.

Copy link
Member

@rainers rainers Feb 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. dmd doesn't rely on the old signature, it had to workaround it with a cast. See dlang/dmd#6539

Copy link
Member

@rainers rainers Feb 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect we need to readd the old signatures as deprecated, otherwise every other project will fail to compile.

///
long strtoll(in char* nptr, char** endptr, int base);
long strtoll(scope inout(char)* nptr, scope inout(char)** endptr, int base);
///
c_ulong strtoul(in char* nptr, char** endptr, int base);
c_ulong strtoul(scope inout(char)* nptr, scope inout(char)** endptr, int base);
///
ulong strtoull(in char* nptr, char** endptr, int base);
ulong strtoull(scope inout(char)* nptr, scope inout(char)** endptr, int base);

version (CRuntime_Microsoft)
{
// strtold exists starting from VS2013, so we make this a template to avoid link errors
// strtold exists starting from VS2013, so we give it D linkage to avoid link errors
///
real strtold()(in char* nptr, char** endptr)
extern (D) real strtold(scope inout(char)* nptr, inout(char)** endptr)
{ // Fake it 'till we make it
return strtod(nptr, endptr);
}
}
else version (MinGW)
{
///
real __mingw_strtold(in char* nptr, char** endptr);
real __mingw_strtold(scope inout(char)* nptr, scope inout(char)** endptr);
///
alias __mingw_strtold strtold;
}
else version (CRuntime_Bionic)
{
///
real strtold(in char* nptr, char** endptr)
real strtold(scope inout(char)* nptr, scope inout(char)** endptr)
{ // Fake it again till we make it
return strtod(nptr, endptr);
}
}
else
{
///
real strtold(in char* nptr, char** endptr);
real strtold(scope inout(char)* nptr, scope inout(char)** endptr);
}

// No unsafe pointer manipulation.
Expand Down Expand Up @@ -175,9 +175,9 @@ int atexit(void function() func);
void _Exit(int status);

///
char* getenv(in char* name);
char* getenv(scope const char* name);
///
int system(in char* string);
int system(scope const char* string);

// These only operate on integer values.
@trusted
Expand All @@ -198,15 +198,15 @@ int system(in char* string);
}

///
int mblen(in char* s, size_t n);
int mblen(scope const char* s, size_t n);
///
int mbtowc(wchar_t* pwc, in char* s, size_t n);
int mbtowc(scope wchar_t* pwc, scope const char* s, size_t n);
///
int wctomb(char*s, wchar_t wc);
int wctomb(scope char* s, wchar_t wc);
///
size_t mbstowcs(wchar_t* pwcs, in char* s, size_t n);
size_t mbstowcs(scope wchar_t* pwcs, scope const char* s, size_t n);
///
size_t wcstombs(char* s, in wchar_t* pwcs, size_t n);
size_t wcstombs(scope char* s, scope const wchar_t* pwcs, size_t n);

///
version( DigitalMars )
Expand All @@ -222,12 +222,12 @@ else version( GNU )
version( CRuntime_Microsoft )
{
///
ulong _strtoui64(in char *,char **,int);
ulong _strtoui64(scope inout(char)*, scope inout(char)**,int);
///
ulong _wcstoui64(in wchar *,wchar **,int);
ulong _wcstoui64(scope inout(wchar)*, scope inout(wchar)**,int);

///
long _strtoi64(in char *,char **,int);
long _strtoi64(scope inout(char)*, scope inout(char)**,int);
///
long _wcstoi64(in wchar *,wchar **,int);
long _wcstoi64(scope inout(wchar)*, scope inout(wchar)**,int);
}
2 changes: 1 addition & 1 deletion src/rt/profilegc.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ shared static ~this()
Entry entry;

// qsort() comparator to sort by count field
extern (C) static int qsort_cmp(const void *r1, const void *r2)
extern (C) static int qsort_cmp(scope const void *r1, scope const void *r2)
{
auto result1 = cast(Result*)r1;
auto result2 = cast(Result*)r2;
Expand Down
28 changes: 14 additions & 14 deletions src/rt/qsort.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ else version (WatchOS)

version (CRuntime_Glibc)
{
alias extern (C) int function(const void *, const void *, void *) Cmp;
extern (C) void qsort_r(void *base, size_t nmemb, size_t size, Cmp cmp, void *arg);
alias extern (C) int function(scope const void *, scope const void *, scope void *) Cmp;
extern (C) void qsort_r(scope void *base, size_t nmemb, size_t size, Cmp cmp, scope void *arg);

extern (C) void[] _adSort(void[] a, TypeInfo ti)
extern (C) void[] _adSort(return scope void[] a, TypeInfo ti)
{
extern (C) int cmp(in void* p1, in void* p2, void* ti)
extern (C) int cmp(scope const void* p1, scope const void* p2, scope void* ti)
{
return (cast(TypeInfo)ti).compare(p1, p2);
}
Expand All @@ -44,12 +44,12 @@ version (CRuntime_Glibc)
}
else version (FreeBSD)
{
alias extern (C) int function(void *, const void *, const void *) Cmp;
extern (C) void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, Cmp cmp);
alias extern (C) int function(scope void *, scope const void *, scope const void *) Cmp;
extern (C) void qsort_r(scope void *base, size_t nmemb, size_t size, scope void *thunk, Cmp cmp);

extern (C) void[] _adSort(void[] a, TypeInfo ti)
extern (C) void[] _adSort(return scope void[] a, TypeInfo ti)
{
extern (C) int cmp(void* ti, in void* p1, in void* p2)
extern (C) int cmp(scope void* ti, scope const void* p1, scope const void* p2)
{
return (cast(TypeInfo)ti).compare(p1, p2);
}
Expand All @@ -59,12 +59,12 @@ else version (FreeBSD)
}
else version (Darwin)
{
alias extern (C) int function(void *, const void *, const void *) Cmp;
extern (C) void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, Cmp cmp);
alias extern (C) int function(scope void *, scope const void *, scope const void *) Cmp;
extern (C) void qsort_r(scope void *base, size_t nmemb, size_t size, scope void *thunk, Cmp cmp);

extern (C) void[] _adSort(void[] a, TypeInfo ti)
extern (C) void[] _adSort(return scope void[] a, TypeInfo ti)
{
extern (C) int cmp(void* ti, in void* p1, in void* p2)
extern (C) int cmp(scope void* ti, scope const void* p1, scope const void* p2)
{
return (cast(TypeInfo)ti).compare(p1, p2);
}
Expand All @@ -76,9 +76,9 @@ else
{
private TypeInfo tiglobal;

extern (C) void[] _adSort(void[] a, TypeInfo ti)
extern (C) void[] _adSort(return scope void[] a, TypeInfo ti)
{
extern (C) int cmp(in void* p1, in void* p2)
extern (C) int cmp(scope const void* p1, scope const void* p2)
{
return tiglobal.compare(p1, p2);
}
Expand Down
4 changes: 2 additions & 2 deletions src/rt/trace.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private void stack_free(Stack *s)
//////////////////////////////////////
// Qsort() comparison routine for array of pointers to SymPair's.

private int sympair_cmp(in void* e1, in void* e2)
private int sympair_cmp(scope const void* e1, scope const void* e2)
{
auto count1 = (*cast(SymPair**)e1).count;
auto count2 = (*cast(SymPair**)e2).count;
Expand Down Expand Up @@ -271,7 +271,7 @@ private void trace_array(Symbol*[] psymbols, Symbol *s, ref uint u)
//////////////////////////////////////
// Qsort() comparison routine for array of pointers to Symbol's.

private int symbol_cmp(in void* e1, in void* e2)
private int symbol_cmp(scope const void* e1, scope const void* e2)
{
auto ps1 = cast(Symbol **)e1;
auto ps2 = cast(Symbol **)e2;
Expand Down