forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove trailing whitespace

This commit is contained in:
John Colvin 2023-03-02 14:00:12 +00:00
parent cc416c9848
commit 251cb73f71
38 changed files with 307 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archive.d
View File

@ -3009,16 +3009,16 @@ static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
else
p.unpackSize = cast(UInt32)(p.control & 0x1F) << 16;
return ELzma2State.LZMA2_STATE_UNPACK0;
case ELzma2State.LZMA2_STATE_UNPACK0:
p.unpackSize |= cast(UInt32)b << 8;
return ELzma2State.LZMA2_STATE_UNPACK1;
case ELzma2State.LZMA2_STATE_UNPACK1:
p.unpackSize |= cast(UInt32)b;
p.unpackSize++;
return (LZMA2_IS_UNCOMPRESSED_STATE(p)) ? ELzma2State.LZMA2_STATE_DATA : ELzma2State.LZMA2_STATE_PACK0;
case ELzma2State.LZMA2_STATE_PACK0:
p.packSize = cast(UInt32)b << 8;
return ELzma2State.LZMA2_STATE_PACK1;
@ -3090,7 +3090,7 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
SizeT destSizeCur = dicLimit - dicPos;
SizeT srcSizeCur = inSize - *srcLen;
ELzmaFinishMode curFinishMode = LZMA_FINISH_ANY;
if (p.unpackSize <= destSizeCur)
{
destSizeCur = cast(SizeT)p.unpackSize;
@ -3141,7 +3141,7 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
bool initState = (mode > 0);
if ((!initDic && p.needInitDic) || (!initState && p.needInitState))
return SRes.ERROR_DATA;
LzmaDec_InitDicAndState(&p.decoder, initDic, initState);
p.needInitDic = false;
p.needInitState = false;
@ -3149,9 +3149,9 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
}
if (srcSizeCur > p.packSize)
srcSizeCur = cast(SizeT)p.packSize;
res = LzmaDec_DecodeToDic(&p.decoder, dicPos + destSizeCur, src, &srcSizeCur, curFinishMode, status);
src += srcSizeCur;
*srcLen += srcSizeCur;
p.packSize -= cast(UInt32)srcSizeCur;
@ -3238,7 +3238,7 @@ SRes Lzma2Decode(Byte *dest, SizeT *destLen, Byte *src, SizeT *srcLen,
if(wtf != 0) return wtf;
wtf = LzmaDec_AllocateProbs(&decoder.decoder, props.ptr, LZMA_PROPS_SIZE);
if(wtf != 0) return wtf;
*srcLen = inSize;
res = Lzma2Dec_DecodeToDic(&decoder, outSize, src, srcLen, finishMode, status);
*destLen = decoder.decoder.dicPos;

30
characterencodings.d
View File

@ -228,7 +228,7 @@ immutable dchar[] Windows_1252 = [
// the following tables give the characters from decimal 160 up to 255
// in the given encodings.
immutable dchar[] ISO_8859_1 = [
immutable dchar[] ISO_8859_1 = [
' ', '¡', '¢', '£', '¤', '¥', '¦', '§',
'¨', '©', 'ª', '«', '¬', '­', '®', '¯',
'°', '±', '²', '³', '´', 'µ', '¶', '·',
@ -242,7 +242,7 @@ immutable dchar[] ISO_8859_1 = [
'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', '÷',
'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ÿ'];
immutable dchar[] ISO_8859_2 = [
immutable dchar[] ISO_8859_2 = [
' ', 'Ą', '˘', 'Ł', '¤', 'Ľ', 'Ś', '§',
'¨', 'Š', 'Ş', 'Ť', 'Ź', '­', 'Ž', 'Ż',
'°', 'ą', '˛', 'ł', '´', 'ľ', 'ś', 'ˇ',
@ -256,7 +256,7 @@ immutable dchar[] ISO_8859_2 = [
'đ', 'ń', 'ň', 'ó', 'ô', 'ő', 'ö', '÷',
'ř', 'ů', 'ú', 'ű', 'ü', 'ý', 'ţ', '˙'];
immutable dchar[] ISO_8859_3 = [
immutable dchar[] ISO_8859_3 = [
' ', 'Ħ', '˘', '£', '¤', ' ', 'Ĥ', '§',
'¨', 'İ', 'Ş', 'Ğ', 'Ĵ', '­', ' ', 'Ż',
'°', 'ħ', '²', '³', '´', 'µ', 'ĥ', '·',
@ -270,7 +270,7 @@ immutable dchar[] ISO_8859_3 = [
' ', 'ñ', 'ò', 'ó', 'ô', 'ġ', 'ö', '÷',
'ĝ', 'ù', 'ú', 'û', 'ü', 'ŭ', 'ŝ', '˙'];
immutable dchar[] ISO_8859_4 = [
immutable dchar[] ISO_8859_4 = [
' ', 'Ą', 'ĸ', 'Ŗ', '¤', 'Ĩ', 'Ļ', '§',
'¨', 'Š', 'Ē', 'Ģ', 'Ŧ', '­', 'Ž', '¯',
'°', 'ą', '˛', 'ŗ', '´', 'ĩ', 'ļ', 'ˇ',
@ -284,7 +284,7 @@ immutable dchar[] ISO_8859_4 = [
'đ', 'ņ', 'ō', 'ķ', 'ô', 'õ', 'ö', '÷',
'ø', 'ų', 'ú', 'û', 'ü', 'ũ', 'ū', '˙'];
immutable dchar[] ISO_8859_5 = [
immutable dchar[] ISO_8859_5 = [
' ', 'Ё', 'Ђ', 'Ѓ', 'Є', 'Ѕ', 'І', 'Ї',
'Ј', 'Љ', 'Њ', 'Ћ', 'Ќ', '­', 'Ў', 'Џ',
'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ж', 'З',
@ -298,7 +298,7 @@ immutable dchar[] ISO_8859_5 = [
'№', 'ё', 'ђ', 'ѓ', 'є', 'ѕ', 'і', 'ї',
'ј', 'љ', 'њ', 'ћ', 'ќ', '§', 'ў', 'џ'];
immutable dchar[] ISO_8859_6 = [
immutable dchar[] ISO_8859_6 = [
' ', ' ', ' ', ' ', '¤', ' ', ' ', ' ',
' ', ' ', ' ', ' ', '،', '­', ' ', ' ',
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
@ -312,7 +312,7 @@ immutable dchar[] ISO_8859_6 = [
'ِ', 'ّ', 'ْ', ' ', ' ', ' ', ' ', ' ',
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '];
immutable dchar[] ISO_8859_7 = [
immutable dchar[] ISO_8859_7 = [
' ', '‘', '’', '£', '€', '₯', '¦', '§',
'¨', '©', 'ͺ', '«', '¬', '­', ' ', '―',
'°', '±', '²', '³', '΄', '΅', 'Ά', '·',
@ -326,7 +326,7 @@ immutable dchar[] ISO_8859_7 = [
'π', 'ρ', 'ς', 'σ', 'τ', 'υ', 'φ', 'χ',
'ψ', 'ω', 'ϊ', 'ϋ', 'ό', 'ύ', 'ώ', ' '];
immutable dchar[] ISO_8859_8 = [
immutable dchar[] ISO_8859_8 = [
' ', ' ', '¢', '£', '¤', '¥', '¦', '§',
'¨', '©', '×', '«', '¬', '­', '®', '¯',
'°', '±', '²', '³', '´', 'µ', '¶', '·',
@ -341,7 +341,7 @@ immutable dchar[] ISO_8859_8 = [
// v v those are wrong
'ר', 'ש', 'ת', ' ', ' ', ' ', ' ', ' ']; // FIXME: those ones marked wrong are supposed to be left to right and right to left markers, not spaces. lol maybe it isn't wrong
immutable dchar[] ISO_8859_9 = [
immutable dchar[] ISO_8859_9 = [
' ', '¡', '¢', '£', '¤', '¥', '¦', '§',
'¨', '©', 'ª', '«', '¬', '­', '®', '¯',
'°', '±', '²', '³', '´', 'µ', '¶', '·',
@ -355,7 +355,7 @@ immutable dchar[] ISO_8859_9 = [
'ğ', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', '÷',
'ø', 'ù', 'ú', 'û', 'ü', 'ı', 'ş', 'ÿ'];
immutable dchar[] ISO_8859_10 = [
immutable dchar[] ISO_8859_10 = [
' ', 'Ą', 'Ē', 'Ģ', 'Ī', 'Ĩ', 'Ķ', '§',
'Ļ', 'Đ', 'Š', 'Ŧ', 'Ž', '­', 'Ū', 'Ŋ',
'°', 'ą', 'ē', 'ģ', 'ī', 'ĩ', 'ķ', '·',
@ -369,7 +369,7 @@ immutable dchar[] ISO_8859_10 = [
'ð', 'ņ', 'ō', 'ó', 'ô', 'õ', 'ö', 'ũ',
'ø', 'ų', 'ú', 'û', 'ü', 'ý', 'þ', 'ĸ'];
immutable dchar[] ISO_8859_11 = [
immutable dchar[] ISO_8859_11 = [
' ', 'ก', 'ข', 'ฃ', 'ค', 'ฅ', 'ฆ', 'ง',
'จ', 'ฉ', 'ช', 'ซ', 'ฌ', 'ญ', 'ฎ', 'ฏ',
'ฐ', 'ฑ', 'ฒ', 'ณ', 'ด', 'ต', 'ถ', 'ท',
@ -383,7 +383,7 @@ immutable dchar[] ISO_8859_11 = [
'๐', '๑', '๒', '๓', '๔', '๕', '๖', '๗',
'๘', '๙', '๚', '๛', ' ', ' ', ' ', ' '];
immutable dchar[] ISO_8859_13 = [
immutable dchar[] ISO_8859_13 = [
' ', '”', '¢', '£', '¤', '„', '¦', '§',
'Ø', '©', 'Ŗ', '«', '¬', '­', '®', 'Æ',
'°', '±', '²', '³', '“', 'µ', '¶', '·',
@ -397,7 +397,7 @@ immutable dchar[] ISO_8859_13 = [
'š', 'ń', 'ņ', 'ó', 'ō', 'ő', 'ö', '÷',
'ų', 'ł', 'ś', 'ū', 'ü', 'ż', 'ž', '’'];
immutable dchar[] ISO_8859_14 = [
immutable dchar[] ISO_8859_14 = [
' ', 'Ḃ', 'ḃ', '£', 'Ċ', 'ċ', 'Ḋ', '§',
'Ẁ', '©', 'Ẃ', 'ḋ', 'Ỳ', '­', '®', 'Ÿ',
'Ḟ', 'ḟ', 'Ġ', 'ġ', 'Ṁ', 'ṁ', '¶', 'Ṗ',
@ -411,7 +411,7 @@ immutable dchar[] ISO_8859_14 = [
'ŵ', 'ñ', 'ò', 'ó', 'ô', 'ő', 'ö', 'ṫ',
'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'ŷ', 'ÿ'];
immutable dchar[] ISO_8859_15 = [
immutable dchar[] ISO_8859_15 = [
' ', '¡', '¢', '£', '€', '¥', 'Š', '§',
'š', '©', 'ª', '«', '¬', '­', '®', '¯',
'°', '±', '²', '³', 'Ž', 'µ', '¶', '·',
@ -425,7 +425,7 @@ immutable dchar[] ISO_8859_15 = [
'ð', 'ñ', 'ò', 'ó', 'ô', 'ő', 'ö', '÷',
'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ÿ'];
immutable dchar[] ISO_8859_16 = [
immutable dchar[] ISO_8859_16 = [
' ', 'Ą', 'ą', 'Ł', '€', '„', 'Š', '§',
'š', '©', 'Ș', '«', 'Ź', '­', 'ź', 'Ż',
'°', '±', 'Č', 'ł', 'Ž', '”', '¶', '·',

4
color.d
View File

@ -653,7 +653,7 @@ float srbgToLinear(float x) { // aka f_inv
import core.stdc.math;
if (x >= 0.04045)
return powf((x + 0.055)/(1 + 0.055), 2.4);
else
else
return x / 12.92;
}
@ -904,7 +904,7 @@ double[3] toHsl(Color c, bool useWeightedLightness = false) nothrow pure @truste
H += 360;
}
return [H, S, L];
return [H, S, L];
}
/// .

2
com.d
View File

@ -424,7 +424,7 @@ T getFromVariant(T)(VARIANT arg) {
if(SUCCEEDED(hr)) {
scope(exit) SafeArrayUnlock(a);
// BTW this is where things get interesting with the
// BTW this is where things get interesting with the
// mid-level wrapper. it can avoid these copies
// maybe i should check bounds.lLbound too.....

2
database_generation.d
View File

@ -915,7 +915,7 @@ string toFieldName(T)(string s, bool isPlural = false)
In conclusion, children is nice in that its simple, doesn't require mixins to create extra symbols(functions). However it doesn't handle the one in one-to-many relationships at all, and it also doesn't work in tables with more than one relationship to a table. And finally, you might prefer the syntax of `prof.get_courses(db)` over `prof.children!(Course, Professor).execute(db)`.
Examples:
Examples:
---
Struct Role { int id; }

4
dbus.d
View File

@ -99,7 +99,7 @@ template VariantType(T) {
template allCanDBus(TS...) {
static if (TS.length == 0) {
enum allCanDBus = true;
enum allCanDBus = true;
} else static if(!canDBus!(TS[0])) {
enum allCanDBus = false;
} else {
@ -199,7 +199,7 @@ string typeSig(T)() if(canDBus!T) {
string sig = "(";
foreach(i, S; T.Types) {
sig ~= typeSig!S();
}
}
sig ~= ")";
return sig;
} else static if(isInputRange!T) {

4
engine.d
View File

@ -405,7 +405,7 @@ class Engine{
if(SDLNet_TCP_Recv(clientsock, data.ptr, 16) <= 0)
throw new Exception("Server closed the connection");
int lagAmount = SDLNet_Read32(data.ptr);
int lagAmount = SDLNet_Read32(data.ptr);
int delayAmount = SDLNet_Read32(data.ptr + 4);
numberOfPlayers = SDLNet_Read32(data.ptr+8);
@ -1196,7 +1196,7 @@ extern(C){
int SDLNet_SocketReady(void* sock) {
SDLNet_GenericSocket s = cast(SDLNet_GenericSocket)sock;
return sock != cast(TCPsocket)0 && s.ready;
return sock != cast(TCPsocket)0 && s.ready;
}

30
exception.d
View File

@ -44,24 +44,24 @@ mixin template ThrowableBaseImplementation() {
}
override void toString(scope void delegate(in char[]) sink) const {
char[32] tmpBuff = void;
char[32] tmpBuff = void;
printName(sink);
sink("@"); sink(file);
sink("("); sink(line.sizeToTempString(tmpBuff[])); sink(")");
sink("@"); sink(file);
sink("("); sink(line.sizeToTempString(tmpBuff[])); sink(")");
sink(": "); getHumanReadableMessage(sink);
sink("\n");
printMembers(sink);
if (info) {
try {
sink("----------------");
foreach (t; info) {
sink("\n"); sink(t);
}
}
catch (Throwable) {
// ignore more errors
}
}
if (info) {
try {
sink("----------------");
foreach (t; info) {
sink("\n"); sink(t);
}
}
catch (Throwable) {
// ignore more errors
}
}
}
}
@ -91,7 +91,7 @@ mixin template PrintMembers() {
static if(is(typeof(__traits(getMember, this, memberName)) : const(char)[]))
sink(__traits(getMember, this, memberName));
else static if(is(typeof(__traits(getMember, this, memberName)) : long)) {
char[32] tmpBuff = void;
char[32] tmpBuff = void;
sink(sizeToTempString(__traits(getMember, this, memberName), tmpBuff));
} // else pragma(msg, typeof(__traits(getMember, this, memberName)));
sink("\n");

8
game.d
View File

@ -1308,11 +1308,11 @@ final class OpenGlTexture {
glColor4f(cast(float)bg.r/255.0, cast(float)bg.g/255.0, cast(float)bg.b/255.0, cast(float)bg.a / 255.0);
glBindTexture(GL_TEXTURE_2D, _tex);
glBegin(GL_QUADS);
glBegin(GL_QUADS);
glTexCoord2f(0, 0); glVertex2i(0, 0);
glTexCoord2f(texCoordWidth, 0); glVertex2i(width, 0);
glTexCoord2f(texCoordWidth, texCoordHeight); glVertex2i(width, height);
glTexCoord2f(0, texCoordHeight); glVertex2i(0, height);
glTexCoord2f(texCoordWidth, 0); glVertex2i(width, 0);
glTexCoord2f(texCoordWidth, texCoordHeight); glVertex2i(width, height);
glTexCoord2f(0, texCoordHeight); glVertex2i(0, height);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0); // unbind the texture

4
html.d
View File

@ -315,14 +315,14 @@ Element checkbox(string name, string value, string label, bool checked = false)
/++ Convenience function to create a small <form> to POST, but the creation function is more like a link
than a DOM form.
The idea is if you have a link to a page which needs to be changed since it is now taking an action,
this should provide an easy way to do it.
You might want to style these with css. The form these functions create has no class - use regular
dom functions to add one. When styling, hit the form itself and form > [type=submit]. (That will
cover both input[type=submit] and button[type=submit] - the two possibilities the functions may create.)
Param:
href: the link. Query params (if present) are converted into hidden form inputs and the rest is used as the form action
innerText: the text to show on the submit button

2
http.d
View File

@ -186,7 +186,7 @@ HttpResponse httpRequest(string method, string uri, const(ubyte)[] content = nul
of the parameters are the caller's responsibility. Content-Length is added automatically,
but YOU must give Content-Type!
*/
HttpResponse doHttpRequestOnHelpers(void delegate(string) write, char[] delegate() read, string method, string uri, const(ubyte)[] content = null, string[string] cookies = null, string[] headers = null, bool https = false)
HttpResponse doHttpRequestOnHelpers(void delegate(string) write, char[] delegate() read, string method, string uri, const(ubyte)[] content = null, string[string] cookies = null, string[] headers = null, bool https = false)
in {
assert(method == "POST" || method == "GET");
}

6
http2.d
View File

@ -357,7 +357,7 @@ struct HttpResponse {
cookie.attributes[remaining.idup_if_needed] = "";
remaining = remaining[$..$];
}
}
}
ret ~= cookie;
@ -2252,7 +2252,7 @@ class HttpRequest {
headerReadingState.justSawLf = true;
headerReadingState.atStartOfLine = true;
continue;
} else
} else
headerReadingState.justSawLf = false;
responseData.headers[$-1] ~= data[position];
@ -3265,7 +3265,7 @@ class HttpCache : ICache {
return null;
}
}
// / Gives simple maximum age caching, ignoring the actual http headers
class SimpleCache : ICache {
const(HttpResponse)* getCachedResponse(HttpRequestParameters request) {

2
ico.d
View File

@ -57,7 +57,7 @@ struct ICONDIRENTRY {
/*
Recall that if an image is stored in BMP format, it must exclude the opening BITMAPFILEHEADER structure, whereas if it is stored in PNG format, it must be stored in its entirety.
Note that the height of the BMP image must be twice the height declared in the image directory. The second half of the bitmap should be an AND mask for the existing screen pixels, with the output pixels given by the formula Output = (Existing AND Mask) XOR Image. Set the mask to be zero everywhere for a clean overwrite.
Note that the height of the BMP image must be twice the height declared in the image directory. The second half of the bitmap should be an AND mask for the existing screen pixels, with the output pixels given by the formula Output = (Existing AND Mask) XOR Image. Set the mask to be zero everywhere for a clean overwrite.
from wikipedia
*/

14
jni.d
View File

@ -130,7 +130,7 @@
Do not use default arguments on the exported methods. No promise
the wrapper will do what you want when called from Java.
You may choose to only import JavaClass from here to minimize the
You may choose to only import JavaClass from here to minimize the
namespace pollution.
Constructing Java objects works and it will pin it. Just remember
@ -656,7 +656,7 @@ string javaObjectToDTypeString(const(char)[] input, ref string[string] javaPacka
ret = "string"; // or could be wstring...
} else if(input == "java/lang/Object") {
ret = "IJavaObject";
} else {
} else {
// NOTE rughs strings in this file
string type = input.replace("$", "_").idup;
@ -1008,12 +1008,12 @@ struct ClassFile {
/+ } end java class file definitions +/
// semi-FIXME: java.lang.CharSequence is the interface for String. We should support that just as well.
// possibly other boxed types too, like Integer.
// possibly other boxed types too, like Integer.
// FIXME: in general, handle substituting subclasses for interfaces nicely
// FIXME: solve the globalref/pin issue with the type system
//
//
// FIXME: what about the parent class of the java object? Best we can probably do is an interface but perhaps it could be auto-generated by the JavaClass magic. It could take the list and just copy the @Import items.
@ -1095,7 +1095,7 @@ __gshared JavaVM* activeJvm;
JNIEnv* activeEnv;
struct ActivateJniEnv {
// this will put it on a call stack so it will be
// sane through re-entrant situations
// sane through re-entrant situations
JNIEnv* old;
this(JNIEnv* e) {
old = activeEnv;
@ -2572,8 +2572,8 @@ enum JNI_OK = 0;
enum JNI_ERR = -1;
enum JNI_EDETACHED = -2;
enum JNI_EVERSION = -3;
enum JNI_COMMIT = 1;
enum JNI_ABORT = 2;
enum JNI_COMMIT = 1;
enum JNI_ABORT = 2;
struct JNINativeMethod
{

2
jpg.d
View File

@ -166,7 +166,7 @@ version(with_libjpeg) {
* output image dimensions available, as well as the output colormap
* if we asked for color quantization.
* In this example, we need to make an output work buffer of the right size.
*/
*/
/* JSAMPLEs per row in output buffer */
row_stride = cinfo.output_width * cinfo.output_components;
/* Make a one-row-high sample array that will go away when done with image */

22
libssh2.d
View File

@ -171,8 +171,8 @@ extern(C) {
struct LIBSSH2_SFTP {}
struct LIBSSH2_SFTP_HANDLE {}
LIBSSH2_SFTP* libssh2_sftp_init(LIBSSH2_SESSION *session);
int libssh2_sftp_shutdown(LIBSSH2_SFTP *sftp);
c_ulong libssh2_sftp_last_error(LIBSSH2_SFTP *sftp);
int libssh2_sftp_shutdown(LIBSSH2_SFTP *sftp);
c_ulong libssh2_sftp_last_error(LIBSSH2_SFTP *sftp);
int libssh2_sftp_close_handle(LIBSSH2_SFTP_HANDLE *handle);
int libssh2_sftp_shutdown(LIBSSH2_SFTP *sftp);
@ -264,7 +264,7 @@ extern(C) {
LIBSSH2_SFTP_HANDLE * libssh2_sftp_open_ex(LIBSSH2_SFTP *sftp, const char *filename, uint filename_len, c_ulong flags, c_long mode, int open_type);
ssize_t libssh2_sftp_read(LIBSSH2_SFTP_HANDLE *handle, char *buffer, size_t buffer_maxlen);
ssize_t libssh2_sftp_read(LIBSSH2_SFTP_HANDLE *handle, char *buffer, size_t buffer_maxlen);
ssize_t libssh2_sftp_write(LIBSSH2_SFTP_HANDLE *handle, const char *buffer, size_t count);
enum LIBSSH2_SFTP_ATTR {
@ -372,7 +372,7 @@ extern(C) {
uint window_size,
uint packet_size,
const char *message,
uint message_len);
uint message_len);
// channel_open_session calls the above
int libssh2_channel_setenv_ex(
@ -385,7 +385,7 @@ extern(C) {
enum LIBSSH2_CHANNEL_WINDOW_DEFAULT = (256*1024);
enum LIBSSH2_CHANNEL_PACKET_DEFAULT = 32768;
int libssh2_channel_request_pty_ex(LIBSSH2_CHANNEL *channel, const char *term, uint term_len, const char *modes, uint modes_len, int width, int height, int width_px, int height_px);
int libssh2_channel_request_pty_ex(LIBSSH2_CHANNEL *channel, const char *term, uint term_len, const char *modes, uint modes_len, int width, int height, int width_px, int height_px);
int libssh2_channel_process_startup(
LIBSSH2_CHANNEL* channel,
@ -393,11 +393,11 @@ extern(C) {
uint request_len,
const char *message,
uint message_len);
int libssh2_channel_free(LIBSSH2_CHANNEL *channel);
int libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, const char *description, const char *lang);
int libssh2_session_free(LIBSSH2_SESSION *session);
int libssh2_channel_free(LIBSSH2_CHANNEL *channel);
int libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, const char *description, const char *lang);
int libssh2_session_free(LIBSSH2_SESSION *session);
int libssh2_init(int flags);
void libssh2_exit();
@ -418,7 +418,7 @@ extern(C) {
int libssh2_keepalive_send(LIBSSH2_SESSION *session,
int *seconds_to_next);
LIBSSH2_CHANNEL * libssh2_channel_direct_tcpip_ex(LIBSSH2_SESSION *session, const char *host, int port, const char *shost, int sport);
LIBSSH2_CHANNEL * libssh2_channel_direct_tcpip_ex(LIBSSH2_SESSION *session, const char *host, int port, const char *shost, int sport);
int libssh2_channel_request_pty_size_ex(LIBSSH2_CHANNEL *channel,
int width, int height,
@ -448,7 +448,7 @@ extern(C) {
int libssh2_channel_get_exit_status(LIBSSH2_CHANNEL* channel);
int libssh2_channel_get_exit_signal(LIBSSH2_CHANNEL *channel, char **exitsignal, size_t *exitsignal_len, char **errmsg, size_t *errmsg_len, char **langtag, size_t *langtag_len);
int libssh2_channel_get_exit_signal(LIBSSH2_CHANNEL *channel, char **exitsignal, size_t *exitsignal_len, char **errmsg, size_t *errmsg_len, char **langtag, size_t *langtag_len);
int libssh2_channel_send_eof(LIBSSH2_CHANNEL *channel);

54
minigui.d
View File

@ -552,7 +552,7 @@ class Widget : ReflectableProperties {
Widget disabledBy() {
Widget p = this;
while(p) {
if(!p._enabled)
if(!p._enabled)
return p;
p = p.parent;
}
@ -3338,8 +3338,8 @@ version(win32_widgets) {
case WM_CONTEXTMENU:
auto hwndFrom = cast(HWND) wParam;
auto xPos = cast(short) LOWORD(lParam);
auto yPos = cast(short) HIWORD(lParam);
auto xPos = cast(short) LOWORD(lParam);
auto yPos = cast(short) HIWORD(lParam);
if(auto widgetp = hwndFrom in Widget.nativeMapping) {
POINT p;
@ -4723,7 +4723,7 @@ class ListWidget : ListWidgetBase {
tabStop = false;
super(parent);
version(win32_widgets)
createWin32Window(this, WC_LISTBOX, "",
createWin32Window(this, WC_LISTBOX, "",
0|WS_CHILD|WS_VISIBLE|LBS_NOTIFY, 0);
}
@ -4906,7 +4906,7 @@ class ScrollableWidget : Widget {
this.parentWindow = parent.parentWindow;
version(win32_widgets) {
createWin32Window(this, Win32Class!"arsd_minigui_ScrollableWidget"w, "",
createWin32Window(this, Win32Class!"arsd_minigui_ScrollableWidget"w, "",
0|WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL, 0);
super(parent);
} else version(custom_widgets) {
@ -5757,7 +5757,7 @@ abstract class Slider : Widget {
version(win32_widgets)
void win32Setup(int style) {
createWin32Window(this, TRACKBAR_CLASS, "",
createWin32Window(this, TRACKBAR_CLASS, "",
0|WS_CHILD|WS_VISIBLE|style|TBS_TOOLTIPS, 0);
// the trackbar sends the same messages as scroll, which
@ -6285,7 +6285,7 @@ class HorizontalScrollbar : ScrollbarBase {
super(parent);
version(win32_widgets) {
createWin32Window(this, "Scrollbar"w, "",
createWin32Window(this, "Scrollbar"w, "",
0|WS_CHILD|WS_VISIBLE|SBS_HORZ|SBS_BOTTOMALIGN, 0);
} else version(custom_widgets) {
auto vl = new HorizontalLayout(this);
@ -6407,7 +6407,7 @@ class VerticalScrollbar : ScrollbarBase {
super(parent);
version(win32_widgets) {
createWin32Window(this, "Scrollbar"w, "",
createWin32Window(this, "Scrollbar"w, "",
0|WS_CHILD|WS_VISIBLE|SBS_VERT|SBS_RIGHTALIGN, 0);
} else version(custom_widgets) {
auto vl = new VerticalLayout(this);
@ -8948,7 +8948,7 @@ class TableView : Widget {
/+
version(win32_widgets)
override int handleWmDrawItem(DRAWITEMSTRUCT* dis)
override int handleWmDrawItem(DRAWITEMSTRUCT* dis)
auto itemId = dis.itemID;
auto hdc = dis.hDC;
auto rect = dis.rcItem;
@ -9304,7 +9304,7 @@ private class TableViewWidgetInner : Widget {
tempPainter.fillColor = style.backgroundColor;
tempPainter.outlineColor = style.backgroundColor;
tempPainter.drawRectangle(Point(startX - smw.position.x, y),
tempPainter.drawRectangle(Point(startX - smw.position.x, y),
Point(endX - smw.position.x, y + lh));
}
auto tempPainter = painter;
@ -9893,7 +9893,7 @@ class ToolBar : Widget {
} else static assert(false);
override int heightStretchiness() { return 0; }
version(win32_widgets)
version(win32_widgets)
HIMAGELIST imageList;
this(Widget parent) {
@ -12721,7 +12721,7 @@ class LineEdit : EditableTextWidget {
this(Widget parent) {
super(parent);
version(win32_widgets) {
createWin32Window(this, "edit"w, "",
createWin32Window(this, "edit"w, "",
0, WS_EX_CLIENTEDGE);//|WS_HSCROLL|ES_AUTOHSCROLL);
} else version(custom_widgets) {
version(trash_text) {
@ -12816,7 +12816,7 @@ class PasswordEdit : EditableTextWidget {
this(Widget parent) {
super(parent);
version(win32_widgets) {
createWin32Window(this, "edit"w, "",
createWin32Window(this, "edit"w, "",
ES_PASSWORD, WS_EX_CLIENTEDGE);//|WS_HSCROLL|ES_AUTOHSCROLL);
} else version(custom_widgets) {
version(trash_text)
@ -12841,7 +12841,7 @@ class TextEdit : EditableTextWidget {
this(Widget parent) {
super(parent);
version(win32_widgets) {
createWin32Window(this, "edit"w, "",
createWin32Window(this, "edit"w, "",
0|WS_VSCROLL|WS_HSCROLL|ES_MULTILINE|ES_WANTRETURN|ES_AUTOHSCROLL|ES_AUTOVSCROLL, WS_EX_CLIENTEDGE);
} else version(custom_widgets) {
version(trash_text)
@ -13947,7 +13947,7 @@ abstract class MouseEventBase : Event {
int state; ///
/++
for consistent names with key event.
for consistent names with key event.
History:
Added September 28, 2021 (dub v10.3)
@ -14439,7 +14439,7 @@ void getSaveFileName(
string prefilledName = null,
string[] filters = null,
void delegate() onCancel = null,
string initialDirectory = null,
string initialDirectory = null,
)
{
return getFileName(false, onOK, prefilledName, filters, onCancel, initialDirectory);
@ -14458,16 +14458,16 @@ void getFileName(
version(win32_widgets) {
import core.sys.windows.commdlg;
/*
Ofn.lStructSize = sizeof(OPENFILENAME);
Ofn.hwndOwner = hWnd;
Ofn.lpstrFilter = szFilter;
Ofn.lpstrFile= szFile;
Ofn.nMaxFile = sizeof(szFile)/ sizeof(*szFile);
Ofn.lpstrFileTitle = szFileTitle;
Ofn.nMaxFileTitle = sizeof(szFileTitle);
Ofn.lpstrInitialDir = (LPSTR)NULL;
Ofn.Flags = OFN_SHOWHELP | OFN_OVERWRITEPROMPT;
Ofn.lpstrTitle = szTitle;
Ofn.lStructSize = sizeof(OPENFILENAME);
Ofn.hwndOwner = hWnd;
Ofn.lpstrFilter = szFilter;
Ofn.lpstrFile= szFile;
Ofn.nMaxFile = sizeof(szFile)/ sizeof(*szFile);
Ofn.lpstrFileTitle = szFileTitle;
Ofn.nMaxFileTitle = sizeof(szFileTitle);
Ofn.lpstrInitialDir = (LPSTR)NULL;
Ofn.Flags = OFN_SHOWHELP | OFN_OVERWRITEPROMPT;
Ofn.lpstrTitle = szTitle;
*/
@ -14494,7 +14494,7 @@ void getFileName(
ofn.lpstrInitialDir = file.ptr;
}
if(openOrSave ? GetOpenFileName(&ofn) : GetSaveFileName(&ofn))
if(openOrSave ? GetOpenFileName(&ofn) : GetSaveFileName(&ofn))
{
string okString = makeUtf8StringFromWindowsString(ofn.lpstrFile);
if(okString.length && okString[$-1] == '\0')

2
minigui_addons/color_dialog.d
View File

@ -62,7 +62,7 @@ class ColorPickerDialog : Dialog {
super(360, 460, "Color picker");
this.onOK = onOK;
/*
statusBar.parts ~= new StatusBar.Part(140);

2
minigui_addons/terminal_emulator_widget.d
View File

@ -295,7 +295,7 @@ class TerminalEmulatorInsideWidget : TerminalEmulator {
version(Posix) {
auto cls = new PosixFdReader(&readyToRead, master);
} else
} else
version(Windows) {
overlapped = new OVERLAPPED();
overlapped.hEvent = cast(void*) this;

70
mp3.d
View File

@ -390,12 +390,12 @@ bool HDR_IS_MS_STEREO(const(ubyte)* h)
bool HDR_IS_FREE_FORMAT(const(ubyte)* h)
{
return (((h[2]) & 0xF0) == 0);
}
}
bool HDR_IS_CRC(const(ubyte)* h)
{
return (!((h[1]) & 1));
}
}
int HDR_TEST_PADDING(const(ubyte)* h)
{
@ -480,7 +480,7 @@ int MINIMP3_MAX(int a, int b)
{
return (a < b) ? b : a;
}
struct bs_t
{
const(uint8_t)* buf;
@ -517,7 +517,7 @@ struct mp3dec_scratch_t
L3_gr_info_t[4] gr_info;
float[576][2] grbuf;
float[40] scf;
float[2*32][18 + 15] syn;
float[2*32][18 + 15] syn;
uint8_t[39][2] ist_pos;
}
@ -606,34 +606,34 @@ const(L12_subband_alloc_t)* L12_subband_alloc_table(const uint8_t *hdr, L12_scal
if (HDR_IS_LAYER_1(hdr))
{
static immutable L12_subband_alloc_t[] g_alloc_L1 =
[
L12_subband_alloc_t(76, 4, 32)
static immutable L12_subband_alloc_t[] g_alloc_L1 =
[
L12_subband_alloc_t(76, 4, 32)
];
alloc = g_alloc_L1.ptr;
nbands = 32;
}
}
else if (!HDR_TEST_MPEG1(hdr))
{
static immutable L12_subband_alloc_t[] g_alloc_L2M2 =
[
static immutable L12_subband_alloc_t[] g_alloc_L2M2 =
[
L12_subband_alloc_t(60, 4, 4),
L12_subband_alloc_t(44, 3, 7 ),
L12_subband_alloc_t(44, 2, 19),
];
alloc = g_alloc_L2M2.ptr;
nbands = 30;
}
}
else
{
static immutable L12_subband_alloc_t[] g_alloc_L2M1 =
static immutable L12_subband_alloc_t[] g_alloc_L2M1 =
[
L12_subband_alloc_t(0, 4, 3),
L12_subband_alloc_t(16, 4, 8),
L12_subband_alloc_t(32, 3, 12),
L12_subband_alloc_t(40, 2, 7)
];
int sample_rate_idx = HDR_GET_SAMPLE_RATE(hdr);
uint kbps = hdr_bitrate_kbps(hdr) >> cast(int)(mode != MODE_MONO);
if (!kbps) /* free-format */
@ -645,15 +645,15 @@ const(L12_subband_alloc_t)* L12_subband_alloc_table(const uint8_t *hdr, L12_scal
nbands = 27;
if (kbps < 56)
{
static immutable L12_subband_alloc_t[] g_alloc_L2M1_lowrate =
static immutable L12_subband_alloc_t[] g_alloc_L2M1_lowrate =
[
L12_subband_alloc_t(44, 4, 2),
L12_subband_alloc_t(44, 4, 2),
L12_subband_alloc_t(44, 3, 10)
];
];
alloc = g_alloc_L2M1_lowrate.ptr;
nbands = sample_rate_idx == 2 ? 12 : 8;
}
}
else if (kbps >= 96 && sample_rate_idx != 1)
{
nbands = 30;
@ -670,14 +670,14 @@ void L12_read_scalefactors(bs_t *bs, uint8_t *pba, uint8_t *scfcod, int bands, f
{
static immutable float[18*3] g_deq_L12 =
[
3.17891e-07, 2.52311e-07, 2.00259e-07, 1.36239e-07, 1.08133e-07, 8.58253e-08,
6.35783e-08, 5.04621e-08, 4.00518e-08, 3.07637e-08, 2.44172e-08, 1.93799e-08,
1.51377e-08, 1.20148e-08, 9.53615e-09, 7.50925e-09, 5.96009e-09, 4.73053e-09,
3.7399e-09, 2.96836e-09, 2.35599e-09, 1.86629e-09, 1.48128e-09, 1.17569e-09,
9.32233e-10, 7.39914e-10, 5.8727e-10, 4.65889e-10, 3.69776e-10, 2.93492e-10,
2.32888e-10, 1.84843e-10, 1.4671e-10, 1.1643e-10, 9.24102e-11, 7.3346e-11,
5.82112e-11, 4.62023e-11, 3.66708e-11, 2.91047e-11, 2.31004e-11, 1.83348e-11,
1.45521e-11, 1.155e-11, 9.16727e-12, 3.17891e-07, 2.52311e-07, 2.00259e-07,
3.17891e-07, 2.52311e-07, 2.00259e-07, 1.36239e-07, 1.08133e-07, 8.58253e-08,
6.35783e-08, 5.04621e-08, 4.00518e-08, 3.07637e-08, 2.44172e-08, 1.93799e-08,
1.51377e-08, 1.20148e-08, 9.53615e-09, 7.50925e-09, 5.96009e-09, 4.73053e-09,
3.7399e-09, 2.96836e-09, 2.35599e-09, 1.86629e-09, 1.48128e-09, 1.17569e-09,
9.32233e-10, 7.39914e-10, 5.8727e-10, 4.65889e-10, 3.69776e-10, 2.93492e-10,
2.32888e-10, 1.84843e-10, 1.4671e-10, 1.1643e-10, 9.24102e-11, 7.3346e-11,
5.82112e-11, 4.62023e-11, 3.66708e-11, 2.91047e-11, 2.31004e-11, 1.83348e-11,
1.45521e-11, 1.155e-11, 9.16727e-12, 3.17891e-07, 2.52311e-07, 2.00259e-07,
1.90735e-07, 1.51386e-07, 1.20155e-07, 1.05964e-07, 8.41035e-08, 6.6753e-08
];
@ -701,7 +701,7 @@ void L12_read_scalefactors(bs_t *bs, uint8_t *pba, uint8_t *scfcod, int bands, f
void L12_read_scale_info(const uint8_t *hdr, bs_t *bs, L12_scale_info *sci)
{
static immutable uint8_t[] g_bitalloc_code_tab =
static immutable uint8_t[] g_bitalloc_code_tab =
[
0,17, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16,
0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,16,
@ -801,7 +801,7 @@ void L12_apply_scf_384(L12_scale_info *sci, const(float)*scf, float *dst)
int L3_read_side_info(bs_t *bs, L3_gr_info_t *gr, const uint8_t *hdr)
{
static immutable uint8_t[23][8] g_scf_long =
static immutable uint8_t[23][8] g_scf_long =
[
[ 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 ],
[ 12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2,0 ],
@ -960,7 +960,7 @@ void L3_read_scalefactors(uint8_t *scf, uint8_t *ist_pos, const uint8_t *scf_siz
float L3_ldexp_q2(float y, int exp_q2)
{
static immutable float[4] g_expfrac =
static immutable float[4] g_expfrac =
[ 9.31322575e-10f,7.83145814e-10f,6.58544508e-10f,5.53767716e-10f ];
int e;
do
@ -979,7 +979,7 @@ void L3_decode_scalefactors(const uint8_t *hdr, uint8_t *ist_pos, bs_t *bs, cons
[ 9,9,6,12,9,9,9,9,9,9,12,6,18,18,0,0,12,12,12,0,12, 9,9,6,15,12,9,0 ]
];
const(uint8_t)* scf_partition = g_scf_partitions[!!gr.n_short_sfb + !gr.n_long_sfb].ptr;
uint8_t[4] scf_size;
uint8_t[4] scf_size;
uint8_t[40] iscf;
int i, scf_shift = gr.scalefac_scale + 1, gain_exp, scfsi = gr.scfsi;
float gain;
@ -1701,13 +1701,13 @@ void mp3d_synth(float *xl, mp3d_sample_t *dstl, int nch, float *lins)
zlin[4*(i - 16) + 3] = xr[18*(1 + i)];
/* S0(0) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 0*64]; float *vy = &zlin[4*i - (15 - 0)*64]; /* LOAD(0); */ for (j = 0; j < 4; j++) b[j] = vz[j]*w1 + vy[j]*w0, a[j] = vz[j]*w0 - vy[j]*w1; }
/* S2(1) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 1*64]; float *vy = &zlin[4*i - (15 - 1)*64]; /* LOAD(1); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S2(1) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 1*64]; float *vy = &zlin[4*i - (15 - 1)*64]; /* LOAD(1); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S1(2) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 2*64]; float *vy = &zlin[4*i - (15 - 2)*64]; /* LOAD(2); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; }
/* S2(3) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 3*64]; float *vy = &zlin[4*i - (15 - 3)*64]; /* LOAD(3); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S2(3) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 3*64]; float *vy = &zlin[4*i - (15 - 3)*64]; /* LOAD(3); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S1(4) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 4*64]; float *vy = &zlin[4*i - (15 - 4)*64]; /* LOAD(4); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; }
/* S2(5) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 5*64]; float *vy = &zlin[4*i - (15 - 5)*64]; /* LOAD(5); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S2(5) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 5*64]; float *vy = &zlin[4*i - (15 - 5)*64]; /* LOAD(5); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S1(6) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 6*64]; float *vy = &zlin[4*i - (15 - 6)*64]; /* LOAD(6); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; }
/* S2(7) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 7*64]; float *vy = &zlin[4*i - (15 - 7)*64]; /* LOAD(7); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
/* S2(7) */ { int j; float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - 7*64]; float *vy = &zlin[4*i - (15 - 7)*64]; /* LOAD(7); */ for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
dstr[(15 - i)*nch] = mp3d_scale_pcm(a[1]);
dstr[(17 + i)*nch] = mp3d_scale_pcm(b[1]);
@ -2004,7 +2004,7 @@ void mp3dec_skip_id3v1(const uint8_t *buf, size_t *pbuf_size)
enum MINIMP3_ID3_DETECT_SIZE = 10;
size_t mp3dec_skip_id3v2(const uint8_t *buf, size_t buf_size)
{
{
if (buf_size >= MINIMP3_ID3_DETECT_SIZE && !memcmp(buf, "ID3".ptr, 3) && !((buf[5] & 15) || (buf[6] & 0x80) || (buf[7] & 0x80) || (buf[8] & 0x80) || (buf[9] & 0x80)))
{
size_t id3v2size = (((buf[6] & 0x7f) << 21) | ((buf[7] & 0x7f) << 14) | ((buf[8] & 0x7f) << 7) | (buf[9] & 0x7f)) + 10;

12
mssql.d
View File

@ -216,14 +216,14 @@ class MsSqlResult : ResultSet {
private string getSQLError(short handletype, SQLHANDLE handle)
{
char[32] sqlstate;
char[256] message;
char[256] message;
SQLINTEGER nativeerror=0;
SQLSMALLINT textlen=0;
auto ret = SQLGetDiagRec(handletype, handle, 1,
cast(ubyte*)sqlstate.ptr,
cast(int*)&nativeerror,
cast(ubyte*)message.ptr,
256,
auto ret = SQLGetDiagRec(handletype, handle, 1,
cast(ubyte*)sqlstate.ptr,
cast(int*)&nativeerror,
cast(ubyte*)message.ptr,
256,
&textlen);
return message.idup;

6
mysql.d
View File

@ -283,7 +283,7 @@ class MySql : Database {
if(cnames[i] in columnsToModify)
v = columnsToModify[cnames[i]];
vals ~= "'" ~ escape(v) ~ "'";
vals ~= "'" ~ escape(v) ~ "'";
}
}
@ -833,7 +833,7 @@ extern(System) {
struct MYSQL_FIELD {
cstring name; /* Name of column */
cstring org_name; /* Original column name, if an alias */
cstring org_name; /* Original column name, if an alias */
cstring table; /* Table of column if column was a field */
cstring org_table; /* Org table name, if table was an alias */
cstring db; /* Database for table */
@ -853,7 +853,7 @@ extern(System) {
uint charsetnr; /* Character set */
uint type; /* Type of field. See mysql_com.h for types */
// type is actually an enum btw
version(MySQL_51) {
void* extension;
}

4
nanovega.d
View File

@ -13288,7 +13288,7 @@ int glnvg__renderCreateTexture (void* uptr, NVGtexture type, int w, int h, int i
flag = GL_REPEAT;
else if (imageFlags&NVGImageFlag.ClampToBorderX)
flag = GL_CLAMP_TO_BORDER;
else
else
flag = GL_CLAMP_TO_EDGE;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, flag);
@ -13297,7 +13297,7 @@ int glnvg__renderCreateTexture (void* uptr, NVGtexture type, int w, int h, int i
flag = GL_REPEAT;
else if (imageFlags&NVGImageFlag.ClampToBorderY)
flag = GL_CLAMP_TO_BORDER;
else
else
flag = GL_CLAMP_TO_EDGE;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, flag);

4
oauth.d
View File

@ -736,14 +736,14 @@ bool hasPermission(DataObject person, FacebookPermissions permission) {
if(person.facebook_access_token.length == 0)
return false;
try {
try {
auto perms = getBasicDataFromVariant(fbGraphPermissions(person. facebook_access_token))[0];
return (to!string(permission) in perms) ? true : false;
} catch(FacebookApiException e) {
return false; // the token doesn't work
}
return false;
return false;
}
+/

50
qrcode.d
View File

@ -6,12 +6,12 @@
Ported to D by me on July 26, 2021
+/
/*
/*
* QR Code generator library (C)
*
*
* Copyright (c) Project Nayuki. (MIT License)
* https://www.nayuki.io/page/qr-code-generator-library
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
@ -73,14 +73,14 @@ import core.stdc.config;
import core.stdc.stdlib;
import core.stdc.math;
/*
/*
* This library creates QR Code symbols, which is a type of two-dimension barcode.
* Invented by Denso Wave and described in the ISO/IEC 18004 standard.
* A QR Code structure is an immutable square grid of black and white cells.
* The library provides functions to create a QR Code from text or binary data.
* The library covers the QR Code Model 2 specification, supporting all versions (sizes)
* from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
*
*
* Ways to create a QR Code object:
* - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
* - Low level: Custom-make the list of segments and call
@ -91,7 +91,7 @@ import core.stdc.math;
/*---- Enum and struct types----*/
/*
/*
* The error correction level in a QR Code symbol.
*/
@ -107,7 +107,7 @@ enum /*qrcodegen_Ecc*/ {
}
/*
/*
* The mask pattern used in a QR Code symbol.
*/
alias qrcodegen_Mask = int;
@ -127,7 +127,7 @@ enum /* qrcodegen_Mask */ {
}
/*
/*
* Describes how a segment's data bits are interpreted.
*/
alias qrcodegen_Mode = int;
@ -140,7 +140,7 @@ enum /*qrcodegen_Mode*/ {
}
/*
/*
* A segment of character/binary/control data in a QR Code symbol.
* The mid-level way to create a segment is to take the payload data
* and call a factory function such as qrcodegen_makeNumeric().
@ -192,7 +192,7 @@ auto qrcodegen_BUFFER_LEN_MAX() { return qrcodegen_BUFFER_LEN_FOR_VERSION(qrcode
/*---- Functions (high level) to generate QR Codes ----*/
/*
/*
* Encodes the given text string to a QR Code, returning true if encoding succeeded.
* If the data is too long to fit in any version in the given range
* at the given ECC level, then false is returned.
@ -215,7 +215,7 @@ bool qrcodegen_encodeText(const char *text, uint8_t* tempBuffer, uint8_t* qrcode
qrcodegen_Ecc ecl, int minVersion, int maxVersion, qrcodegen_Mask mask, bool boostEcl);
/*
/*
* Encodes the given binary data to a QR Code, returning true if encoding succeeded.
* If the data is too long to fit in any version in the given range
* at the given ECC level, then false is returned.
@ -241,12 +241,12 @@ bool qrcodegen_encodeBinary(uint8_t* dataAndTemp, size_t dataLen, uint8_t* qrcod
/*---- Functions to extract raw data from QR Codes ----*/
/*
/*
* QR Code generator library (C)
*
*
* Copyright (c) Project Nayuki. (MIT License)
* https://www.nayuki.io/page/qr-code-generator-library
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
@ -389,7 +389,7 @@ private void appendBitsToBuffer(uint val, int numBits, uint8_t* buffer, int *bit
// Public function - see documentation comment in header file.
/*
/*
* Renders a QR Code representing the given segments at the given error correction level.
* The smallest possible QR Code version is automatically chosen for the output. Returns true if
* QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
@ -412,7 +412,7 @@ bool qrcodegen_encodeSegments(const qrcodegen_Segment* segs, size_t len,
// Public function - see documentation comment in header file.
/*
/*
* Renders a QR Code representing the given segments with the given encoding parameters.
* Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of versions.
* The smallest possible QR Code version within the given range is automatically
@ -972,7 +972,7 @@ static void finderPenaltyAddHistory(int currentRunLength, ref int[7] runHistory,
// Public function - see documentation comment in header file.
/*
/*
* Returns the side length of the given QR Code, assuming that encoding succeeded.
* The result is in the range [21, 177]. Note that the length of the array buffer
* is related to the side length - every 'uint8_t qrcode[]' must have length at least
@ -990,7 +990,7 @@ int qrcodegen_getSize(const uint8_t* qrcode) {
// Public function - see documentation comment in header file.
/*
/*
* Returns the color of the module (pixel) at the given coordinates, which is false
* for white or true for black. The top left corner has the coordinates (x=0, y=0).
* If the given coordinates are out of bounds, then false (white) is returned.
@ -1045,7 +1045,7 @@ static bool getBit(int x, int i) {
// Public function - see documentation comment in header file.
/*
/*
* Tests whether the given string can be encoded as a segment in alphanumeric mode.
* A string is encodable iff each character is in the following set: 0 to 9, A to Z
* (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
@ -1062,7 +1062,7 @@ bool qrcodegen_isAlphanumeric(const(char)* text) {
// Public function - see documentation comment in header file.
/*
/*
* Tests whether the given string can be encoded as a segment in numeric mode.
* A string is encodable iff each character is in the range 0 to 9.
*/
@ -1078,7 +1078,7 @@ bool qrcodegen_isNumeric(const(char)* text) {
// Public function - see documentation comment in header file.
/*
/*
* Returns the number of bytes (uint8_t) needed for the data buffer of a segment
* containing the given number of characters using the given mode. Notes:
* - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
@ -1134,7 +1134,7 @@ private int calcSegmentBitLength(qrcodegen_Mode mode, size_t numChars) {
// Public function - see documentation comment in header file.
/*
/*
* Returns a segment representing the given binary data encoded in
* byte mode. All input byte arrays are acceptable. Any text string
* can be converted to UTF-8 bytes and encoded as a byte mode segment.
@ -1156,7 +1156,7 @@ qrcodegen_Segment qrcodegen_makeBytes(const uint8_t* data, size_t len, uint8_t*
// Public function - see documentation comment in header file.
/*
/*
* Returns a segment representing the given string of decimal digits encoded in numeric mode.
*/
@ -1195,7 +1195,7 @@ qrcodegen_Segment qrcodegen_makeNumeric(const(char)* digits, uint8_t* buf) {
// Public function - see documentation comment in header file.
/*
/*
* Returns a segment representing the given text string encoded in alphanumeric mode.
* The characters allowed are: 0 to 9, A to Z (uppercase only), space,
* dollar, percent, asterisk, plus, hyphen, period, slash, colon.
@ -1236,7 +1236,7 @@ qrcodegen_Segment qrcodegen_makeAlphanumeric(const(char)* text, uint8_t* buf) {
// Public function - see documentation comment in header file.
/*
/*
* Returns a segment representing an Extended Channel Interpretation
* (ECI) designator with the given assignment value.
*/

32
querygenerator.d
View File

@ -25,7 +25,7 @@ import std.typetuple;
/**
* The generated query + args.
*
*
* It offers support for concatenation, so you can create your query in parts and concatenate them afterwards.
* Ths string prepend will be inserted inbetween two CreatedQuery.query strings at concatation if and only if both query strings are non empty.
* The resulting CreatedQuery has a prepend string equal to the one of the left side of the '~' operation.
@ -62,7 +62,7 @@ struct CreatedQuery {
return res;
}
ref CreatedQuery opOpAssign(string op)(string right) if(op=="~") {
query~=right;
return this;
@ -118,7 +118,7 @@ string createQueryGenerator(string preSql) {
* Uses createQueryGenerator for actually doing the job.
* data_ will be made available with D's 'with' statement to the embedded code in queryString. So you can access the elements just as regular variables.
*
* Params:
* Params:
* queryString = An SQL template. An SQL template consists of nested blocks. The
* uppermost block is the queryString itself, you create subblocks by
* enclosing it in braces '{}'.
@ -153,7 +153,7 @@ string createQueryGenerator(string preSql) {
Multiple declarations of the form '${}' might be present
within the declaration part, they may be separated by
white space.
white space.
__Body part__
@ -202,7 +202,7 @@ string createQueryGenerator(string preSql) {
data_.foo will just be 'foo'.
__Blocks__
Blocks are the building blocks of the resulting
expression. If a block contains a D expression or a
subblock which contains D expressions, then its contents
@ -254,7 +254,7 @@ string createQueryGenerator(string preSql) {
string.
The outputs of each loop iteration will be separated with " or " by default,
you can change this, by setting queryGenSep in the declaration part.
you can change this, by setting queryGenSep in the declaration part.
data_ = The contents of data_ will be made available to the D expressions and declarations in the queryString. (The code gets embedded withing a with(data_) { ... })
@ -283,8 +283,8 @@ unittest {
}
Test t1;
CreatedQuery myQuery(Test t1) {
return createQuery!`select * from testtable where
{({${queryGenSep=" or "} ${f in foo} : ({col1=#{f.a}} and {col2=#{f.b}})})} or
return createQuery!`select * from testtable where
{({${queryGenSep=" or "} ${f in foo} : ({col1=#{f.a}} and {col2=#{f.b}})})} or
{col3>#{k}}`(t1);
}
auto res=myQuery(t1);
@ -325,8 +325,8 @@ size_t indexOf(string heap, char needle) {
//pragma(msg, createQueryGenerator( " (${item in datespan} : ( { date>=#{item.from} and} {date<=#{item.to} and} {comment like #{\"%:Autorun:\"~item.autorun~\":Autorun:%\"}})"));
//pragma(msg, createQueryGenerator( " Hello this is a test!"));
//pragma(msg, createQueryGenerator( ` ${item in datespan} : ( { date>=#{item.from} } and {date<=#{item.to} } and {comment like #{"%:Autorun:"~item.autorun~":Autorun:%"}})`));
//pragma(msg, createQueryGenerator(`select * from testtable where
//{({${queryGenSep=" or "} ${f in foo} : ({col1=#{f.a}} and {col2=#{f.b}})})} or
//pragma(msg, createQueryGenerator(`select * from testtable where
//{({${queryGenSep=" or "} ${f in foo} : ({col1=#{f.a}} and {col2=#{f.b}})})} or
//{col3>k}`));
//Syntax:
@ -495,19 +495,19 @@ string preSqlParser(ref string data, int level=0) {
}
}
out_cmd~=text~"=`"~data[0..end]~"`;\n";
out_cmd~=buf~"~=`"~data[0..end]~"`;\n";
out_cmd~=buf~"~=`"~data[0..end]~"`;\n";
data=data[end..$];
if(data.length==0)
if(data.length==0)
break;
debug(querygenerator) writefln("Remaining (level: %s) data: %s", level, data);
switch(data[0]) {
case '{' :
case '{' :
assert(data.length>2, "Expected some data after '{' at: "~data);
data=data[1..$];
out_cmd~="if("~validCount~"==0) {\n";
out_cmd~=buf~"="~buf~"[0..$-"~text~".length];\n}\n";
out_cmd~=wasValid~"=0;\n"; // Reset, because inner level will just add to it.
out_cmd~=preSqlParser(data, level+1);
out_cmd~=preSqlParser(data, level+1);
assert(data[0]=='}', "Expected closing '}', got: "~data);
data=data[1..$];
@ -518,7 +518,7 @@ string preSqlParser(ref string data, int level=0) {
out_cmd~=validCount~"="~validCount~"==-1 ? "~wasValid~" : "~validCount~"+"~wasValid~";\n";
out_cmd~=`debug(queryGenerator) writefln("Updated valid count is now: %s", `~validCount~`);`~"\n";
break;
case '}' :
case '}' :
goto finish;
case '#' :
out_cmd~="if("~validCount~"==-1) {\n\t";
@ -547,6 +547,6 @@ finish:
// End of loop:
out_cmd~="}\n";
// End of block:
out_cmd~="}\n";
out_cmd~="}\n";
return out_cmd;
}

2
rpc.d
View File

@ -20,7 +20,7 @@ interface ExampleNetworkFunctions {
S2 structTest(S1);
void die();
}
// the server must implement the interface
class ExampleServer : ExampleNetworkFunctions {
override string sayHello(string name) {

62
rss.d
View File

@ -500,50 +500,50 @@ unittest {
auto test1 = `<?xml version="1.0" encoding="ISO-8859-1"?>
<rss version="0.91">
<channel>
<title>WriteTheWeb</title>
<link>http://writetheweb.com</link>
<description>News for web users that write back</description>
<language>en-us</language>
<copyright>Copyright 2000, WriteTheWeb team.</copyright>
<managingEditor>editor@writetheweb.com</managingEditor>
<webMaster>webmaster@writetheweb.com</webMaster>
<title>WriteTheWeb</title>
<link>http://writetheweb.com</link>
<description>News for web users that write back</description>
<language>en-us</language>
<copyright>Copyright 2000, WriteTheWeb team.</copyright>
<managingEditor>editor@writetheweb.com</managingEditor>
<webMaster>webmaster@writetheweb.com</webMaster>
<image>
<title>WriteTheWeb</title>
<url>http://writetheweb.com/images/mynetscape88.gif</url>
<link>http://writetheweb.com</link>
<width>88</width>
<height>31</height>
<description>News for web users that write back</description>
<title>WriteTheWeb</title>
<url>http://writetheweb.com/images/mynetscape88.gif</url>
<link>http://writetheweb.com</link>
<width>88</width>
<height>31</height>
<description>News for web users that write back</description>
</image>
<item>
<title>Giving the world a pluggable Gnutella</title>
<link>http://writetheweb.com/read.php?item=24</link>
<description>WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing.</description>
<title>Giving the world a pluggable Gnutella</title>
<link>http://writetheweb.com/read.php?item=24</link>
<description>WorldOS is a framework on which to build programs that work like Freenet or Gnutella -allowing distributed applications using peer-to-peer routing.</description>
</item>
<item>
<title>Syndication discussions hot up</title>
<link>http://writetheweb.com/read.php?item=23</link>
<description>After a period of dormancy, the Syndication mailing list has become active again, with contributions from leaders in traditional media and Web syndication.</description>
<title>Syndication discussions hot up</title>
<link>http://writetheweb.com/read.php?item=23</link>
<description>After a period of dormancy, the Syndication mailing list has become active again, with contributions from leaders in traditional media and Web syndication.</description>
</item>
<item>
<title>Personal web server integrates file sharing and messaging</title>
<link>http://writetheweb.com/read.php?item=22</link>
<description>The Magi Project is an innovative project to create a combined personal web server and messaging system that enables the sharing and synchronization of information across desktop, laptop and palmtop devices.</description>
<title>Personal web server integrates file sharing and messaging</title>
<link>http://writetheweb.com/read.php?item=22</link>
<description>The Magi Project is an innovative project to create a combined personal web server and messaging system that enables the sharing and synchronization of information across desktop, laptop and palmtop devices.</description>
</item>
<item>
<title>Syndication and Metadata</title>
<link>http://writetheweb.com/read.php?item=21</link>
<description>RSS is probably the best known metadata format around. RDF is probably one of the least understood. In this essay, published on my O'Reilly Network weblog, I argue that the next generation of RSS should be based on RDF.</description>
<title>Syndication and Metadata</title>
<link>http://writetheweb.com/read.php?item=21</link>
<description>RSS is probably the best known metadata format around. RDF is probably one of the least understood. In this essay, published on my O'Reilly Network weblog, I argue that the next generation of RSS should be based on RDF.</description>
</item>
<item>
<title>UK bloggers get organised</title>
<link>http://writetheweb.com/read.php?item=20</link>
<description>Looks like the weblogs scene is gathering pace beyond the shores of the US. There's now a UK-specific page on weblogs.com, and a mailing list at egroups.</description>
<title>UK bloggers get organised</title>
<link>http://writetheweb.com/read.php?item=20</link>
<description>Looks like the weblogs scene is gathering pace beyond the shores of the US. There's now a UK-specific page on weblogs.com, and a mailing list at egroups.</description>
</item>
<item>
<title>Yournamehere.com more important than anything</title>
<link>http://writetheweb.com/read.php?item=19</link>
<description>Whatever you're publishing on the web, your site name is the most valuable asset you have, according to Carl Steadman.</description>
<title>Yournamehere.com more important than anything</title>
<link>http://writetheweb.com/read.php?item=19</link>
<description>Whatever you're publishing on the web, your site name is the most valuable asset you have, according to Carl Steadman.</description>
</item>
</channel>
</rss>`;

2
rtud.d
View File

@ -527,7 +527,7 @@ struct Channel {
string id;
Message*[] messages;
// a poor man's set...
// a poor man's set...
NotificationConnection[NotificationConnection] listeningConnections;

20
screen.d
View File

@ -789,42 +789,42 @@ scope class Painter{
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_LINES);
glBegin(GL_LINES);
}
void beginDrawingConnectedLines(){
if(glbegin)
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_LINE_STRIP);
glBegin(GL_LINE_STRIP);
}
void beginDrawingPolygon(){
if(glbegin)
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_POLYGON);
glBegin(GL_POLYGON);
}
void beginDrawingTriangles(){
if(glbegin)
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_TRIANGLES);
glBegin(GL_TRIANGLES);
}
void beginDrawingBoxes(){
if(glbegin)
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_QUADS);
glBegin(GL_QUADS);
}
void beginDrawingPoints(){
if(glbegin)
throw new Exception("Can only draw one kind at a time");
glbegin = true;
if(useGL && s.bpp == 124)
glBegin(GL_POINTS);
glBegin(GL_POINTS);
}
void endDrawingShapes(){
@ -874,11 +874,11 @@ scope class Painter{
// glColor4f(.5,.5,.5,1);
setGLColor(c);
glBindTexture(GL_TEXTURE_2D, i.toGL);
glBegin(GL_QUADS);
glBegin(GL_QUADS);
glTexCoord2f(0, 0); glVertex2i(x, y);
glTexCoord2f(i.texWidth, 0); glVertex2i(x+w, y);
glTexCoord2f(i.texWidth, i.texHeight); glVertex2i(x+w, y+h);
glTexCoord2f(0, i.texHeight); glVertex2i(x, y+h);
glTexCoord2f(i.texWidth, 0); glVertex2i(x+w, y);
glTexCoord2f(i.texWidth, i.texHeight); glVertex2i(x+w, y+h);
glTexCoord2f(0, i.texHeight); glVertex2i(x, y+h);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0); // unbind the texture... I guess

4
script.d
View File

@ -667,7 +667,7 @@ class TokenStream(TextStream) {
} else if((text[0] >= 'a' && text[0] <= 'z') || (text[0] == '_') || (text[0] >= 'A' && text[0] <= 'Z') || text[0] == '$') {
bool found = false;
foreach(keyword; keywords)
if(text.length >= keyword.length && text[0 .. keyword.length] == keyword &&
if(text.length >= keyword.length && text[0 .. keyword.length] == keyword &&
// making sure this isn't an identifier that starts with a keyword
(text.length == keyword.length || !(
(
@ -721,7 +721,7 @@ class TokenStream(TextStream) {
}
} else if(text[0] == '"' || text[0] == '\'' || text[0] == '`' ||
// Also supporting double curly quoted strings: “foo” which nest. This is the utf 8 coding:
(text.length >= 3 && text[0] == 0xe2 && text[1] == 0x80 && text[2] == 0x9c))
(text.length >= 3 && text[0] == 0xe2 && text[1] == 0x80 && text[2] == 0x9c))
{
char end = text[0]; // support single quote and double quote strings the same
int openCurlyQuoteCount = (end == 0xe2) ? 1 : 0;

2
sha.d
View File

@ -93,7 +93,7 @@ immutable(ubyte)[/*20*/] SHA1(T)(T data) if(isInputRange!(T)) /*const(ubyte)[] d
} else assert(0);
uint temp;
asm {
asm {
mov EAX, a;
rol EAX, 5;
add EAX, f;

30
simpleaudio.d
View File

@ -1028,7 +1028,7 @@ final class AudioPcmOutThreadImplementation : Thread {
Returns:
An implementation of [SampleController] which lets you pause, etc., the file.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playMp3] and [playWav], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playMp3] and [playWav], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
History:
Automatic resampling support added Nov 7, 2020.
@ -1165,7 +1165,7 @@ final class AudioPcmOutThreadImplementation : Thread {
Returns:
An implementation of [SampleController] which lets you pause, etc., the file.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playOgg] and [playWav], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playOgg] and [playWav], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
History:
Automatic resampling support added Nov 7, 2020.
@ -1359,7 +1359,7 @@ final class AudioPcmOutThreadImplementation : Thread {
Returns:
An implementation of [SampleController] which lets you pause, etc., the file.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playMp3] and [playOgg], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
Please note that the static type may change in the future. It will always be a subtype of [SampleController], but it may be more specialized as I add more features and this will not necessarily match its sister functions, [playMp3] and [playOgg], though all three will share an ancestor in [SampleController]. Therefore, if you use `auto`, there's no guarantee the static type won't change in future versions and I will NOT consider that a breaking change since the base interface will remain compatible.
Bugs:
The seek method is not yet implemented.
History:
@ -2311,7 +2311,7 @@ struct AudioOutput {
Sleep(1);
}
foreach(ref header; headers)
foreach(ref header; headers)
if(auto err = waveOutUnprepareHeader(handle, &header, header.sizeof))
throw new WinMMException("unprepare", err);
} else static assert(0);
@ -3022,7 +3022,7 @@ snd_pcm_t* openAlsaPcm(snd_pcm_stream_t direction, int SampleRate, int channels,
throw new AlsaException("params malloc", err);
scope(exit)
snd_pcm_hw_params_free(hwParams);
if (auto err = snd_pcm_hw_params_any(handle, hwParams))
// can actually survive a failure here, we will just move forward
{} // throw new AlsaException("params init", err);
@ -3121,16 +3121,16 @@ extern(C):
}
enum snd_pcm_access_t {
/** mmap access with simple interleaved channels */
SND_PCM_ACCESS_MMAP_INTERLEAVED = 0,
/** mmap access with simple non interleaved channels */
SND_PCM_ACCESS_MMAP_NONINTERLEAVED,
/** mmap access with complex placement */
SND_PCM_ACCESS_MMAP_COMPLEX,
/** snd_pcm_readi/snd_pcm_writei access */
SND_PCM_ACCESS_RW_INTERLEAVED,
/** snd_pcm_readn/snd_pcm_writen access */
SND_PCM_ACCESS_RW_NONINTERLEAVED,
/** mmap access with simple interleaved channels */
SND_PCM_ACCESS_MMAP_INTERLEAVED = 0,
/** mmap access with simple non interleaved channels */
SND_PCM_ACCESS_MMAP_NONINTERLEAVED,
/** mmap access with complex placement */
SND_PCM_ACCESS_MMAP_COMPLEX,
/** snd_pcm_readi/snd_pcm_writei access */
SND_PCM_ACCESS_RW_INTERLEAVED,
/** snd_pcm_readn/snd_pcm_writen access */
SND_PCM_ACCESS_RW_NONINTERLEAVED,
SND_PCM_ACCESS_LAST = SND_PCM_ACCESS_RW_NONINTERLEAVED
}

14
terminal.d
View File

@ -1782,7 +1782,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
color(fg, bg);
}
} else {
write(text); // graceful degrade
write(text); // graceful degrade
}
}
@ -2085,9 +2085,9 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
version(Windows) {
CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo( hConsole, &info );
int cols, rows;
cols = (info.srWindow.Right - info.srWindow.Left + 1);
rows = (info.srWindow.Bottom - info.srWindow.Top + 1);
@ -2164,7 +2164,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
bool uncertainIfAtEndOfLine = false;
/+
/// A combined moveTo and writef that puts the cursor back where it was before when it finishes the write.
/// Only works in cellular mode.
/// Only works in cellular mode.
/// Might give better performance than moveTo/writef because if the data to write matches the internal buffer, it skips sending anything (to override the buffer check, you can use moveTo and writePrintableString with ForceOption.alwaysSend)
void writefAt(T...)(int x, int y, string f, T t) {
import std.string;
@ -4535,7 +4535,7 @@ struct InputEvent {
The event types:
[KeyboardEvent], [MouseEvent], [SizeChangedEvent],
[PasteEvent], [UserInterruptionEvent],
[PasteEvent], [UserInterruptionEvent],
[EndOfFileEvent], [HangupEvent], [CustomEvent]
And associated functions:
@ -6688,7 +6688,7 @@ class LineGetter {
goto default;
goto case;
}
case 'd', 4: // ctrl+d will also send a newline-equivalent
case 'd', 4: // ctrl+d will also send a newline-equivalent
if(ev.modifierState & ModifierState.alt) {
// gnu alias for kill word (also on ctrl+backspace)
justHitTab = false;
@ -9337,7 +9337,7 @@ version(TerminalDirectToEmulator) {
static if(UsingSimpledisplayX11) {
if((ev.state & ModifierState.alt) && ev.originalKeyEvent.charsPossible.length) {
keyToSend = cast(Key) ev.originalKeyEvent.charsPossible[0];
}
}
}
defaultKeyHandler!(typeof(ev.key))(

14
terminalemulator.d
View File

@ -142,7 +142,7 @@ struct ScopeBuffer(T, size_t maxSize, bool allowGrowth = false) {
}
void clear() {
isNull = true;
length = 0;
length = 0;
}
}
@ -513,7 +513,7 @@ class TerminalEmulator {
ScopeBuffer!(char, 16) buffer;
buffer ~= "\033[M";
buffer ~= cast(char) (b | 32);
addMouseCoordinates(buffer, termX, termY);
addMouseCoordinates(buffer, termX, termY);
//buffer ~= cast(char) (x + 32);
//buffer ~= cast(char) (y + 32);
@ -1100,7 +1100,7 @@ class TerminalEmulator {
assert(!hasNonCharacterData);
return chStore;
}
void ch(dchar c) {
void ch(dchar c) {
hasNonCharacterData = false;
chStore = c;
}
@ -2600,7 +2600,7 @@ P s = 2 3 ; 2 → Restore xterm window title from stack.
// echo -e "\033]52;p;?\007"
// the p == primary
// c == clipboard
// q == secondary
// q == secondary
// s == selection
// 0-7, cut buffers
// the data after it is either base64 stuff to copy or ? to request a paste
@ -3473,7 +3473,7 @@ enum TerminalKey : int {
End = 0x23 + 0xF0000, /// .
PageUp = 0x21 + 0xF0000, /// .
PageDown = 0x22 + 0xF0000, /// .
ScrollLock = 0x91 + 0xF0000,
ScrollLock = 0x91 + 0xF0000,
}
/* These match simpledisplay.d which match terminal.d, so you can just cast them */
@ -4286,7 +4286,7 @@ mixin template PtySupport(alias resizeHelper) {
auto data = buffer[0 .. len];
if(debugMode) {
import std.array; import std.stdio; writeln("GOT ", data, "\nOR ",
import std.array; import std.stdio; writeln("GOT ", data, "\nOR ",
replace(cast(string) data, "\033", "\\")
.replace("\010", "^H")
.replace("\r", "^M")
@ -4601,7 +4601,7 @@ mixin template SdpyDraw() {
}
} else version(Windows) {
this.font = new OperatingSystemFont("Courier New", size, FontWeight.medium);
if(!this.font.isNull && !this.font.isMonospace)
if(!this.font.isNull && !this.font.isMonospace)
this.font.unload(); // non-monospace fonts are unusable here. This should never happen anyway though as Courier New comes with Windows
}

2
textlayouter.d
View File

@ -1196,7 +1196,7 @@ class TextLayouter {
/++
Gets the text that you need to draw, guaranteeing each call to your delegate will:
* Have a contiguous slice into text
* Have a contiguous slice into text
* Have exactly one style (which may be null, meaning use all your default values. Be sure you draw with the same font you passed as the default font to TextLayouter.)
* Be a linear block of text that fits in a single rectangular segment
* A segment will be as large a block of text as the implementation can do, but it may be as short as a single char.

58
web.d
View File

@ -167,7 +167,7 @@ struct IfInputContentType {
Running from the command line:
./myapp function positional args....
./myapp --format=json function
./myapp --format=json function
./myapp --make-nested-call
@ -448,7 +448,7 @@ class ApiProvider : WebDotDBaseType {
return false;
}
/// Shorthand for ensurePost and checkCsrfToken. You should use this on non-indempotent
/// Shorthand for ensurePost and checkCsrfToken. You should use this on non-indempotent
/// functions. Override it if doing some custom checking.
void ensureGoodPost() {
if(_noCsrfChecks) return;
@ -989,7 +989,7 @@ immutable(ReflectionInfo*) prepareReflectionImpl(alias PM, alias Parent)(Parent
foreach(member; __traits(derivedMembers, Class)) { // we do derived on a base class loop because we don't want interfaces (OR DO WE? seriously idk) and we definitely don't want stuff from Object, ApiProvider itself is out too but that might change.
static if(member[0] != '_') {
// FIXME: the filthiest of all hacks...
static if(!__traits(compiles,
static if(!__traits(compiles,
!is(typeof(__traits(getMember, Class, member)) == function) &&
isEnum!(__traits(getMember, Class, member))))
continue; // must be a data member or something...
@ -1920,7 +1920,7 @@ Form createAutomaticForm(Document document, string action, in Parameter[] parame
} else {
auto th = Element.make("th");
auto label = Element.make("label");
label.setAttribute("for", n);
label.setAttribute("for", n);
label.innerText = beautify(param.name) ~ ": ";
th.appendChild(label);
@ -1957,11 +1957,11 @@ Form createAutomaticForm(Document document, string action, in Parameter[] parame
/* *
* Returns the parameter names of the given function
*
*
* Params:
* func = the function alias to get the parameter names of
*
* Returns: an array of strings containing the parameter names
*
* Returns: an array of strings containing the parameter names
*/
/+
string parameterNamesOf( alias fn )( ) {
@ -1983,7 +1983,7 @@ string parameterNamesOf( alias fn )( ) {
}
+/
template parameterNamesOf (alias func) {
const parameterNamesOf = parameterInfoImpl!(func)[0];
}
@ -2019,7 +2019,7 @@ sizediff_t lastIndexOfNew(string s, char a) {
return i - 1;
return -1;
}
// FIXME: a problem here is the compiler only keeps one stringof
// for a particular type
@ -2027,7 +2027,7 @@ sizediff_t lastIndexOfNew(string s, char a) {
// so if you have void a(string a, string b); and void b(string b, string c),
// both a() and b() will show up as params == ["a", "b"]!
//
//
//
private string[][2] parameterInfoImpl (alias func) ()
{
string funcStr = typeof(func).stringof; // this might fix the fixme above...
@ -2038,37 +2038,37 @@ private string[][2] parameterInfoImpl (alias func) ()
assert(start != -1);
assert(end != -1);
const firstPattern = ' ';
const secondPattern = ',';
funcStr = funcStr[start + 1 .. end];
if (funcStr == "") // no parameters
return [null, null];
funcStr ~= secondPattern;
string token;
string[] arr;
foreach (c ; funcStr)
{
{
if (c != firstPattern && c != secondPattern)
token ~= c;
else
{
{
if (token)
arr ~= token;
token = null;
}
}
}
if (arr.length == 1)
return [arr, [""]];
string[] result;
string[] defaults;
bool skip = false;
@ -2077,7 +2077,7 @@ private string[][2] parameterInfoImpl (alias func) ()
string currentName = "";
string currentDefault = "";
foreach (str ; arr)
{
if(str == "=") {
@ -2093,7 +2093,7 @@ private string[][2] parameterInfoImpl (alias func) ()
}
skip = !skip;
if (skip) {
if(currentName.length) {
result ~= currentName;
@ -2112,7 +2112,7 @@ private string[][2] parameterInfoImpl (alias func) ()
}
assert(result.length == defaults.length);
return [result, defaults];
}
/////////////////////////////////
@ -2829,7 +2829,7 @@ string formatAs(T, R)(T ret, string format, R api = null, JSONValue* returnValue
return customFormatted;
}
}
}
}
switch(format) {
case "html":
retstr = toHtml(ret);
@ -4462,9 +4462,9 @@ else string javascriptBase = `
enum string javascriptBaseImpl = q{
"_doRequest": function(url, args, callback, method, async) {
var xmlHttp;
try {
try {
xmlHttp=new XMLHttpRequest();
}
}
catch (e) {
try {
xmlHttp=new ActiveXObject("Msxml2.XMLHTTP");

16
webview.d
View File

@ -20171,7 +20171,7 @@ notice, this list of conditions and the following disclaimer.
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* The name of Microsoft Corporation, or the names of its contributors
* The name of Microsoft Corporation, or the names of its contributors
may not be used to endorse or promote products derived from this
software without specific prior written permission.
@ -21934,7 +21934,7 @@ interface ICoreWebView2HttpHeadersCollectionIterator : IUnknown
extern(Windows):
/// Get the name and value of the current HTTP header of the iterator. This
/// method will fail if the last call to MoveNext set hasNext to FALSE.
HRESULT GetCurrentHeader(/+[out]+/ LPWSTR* name,
HRESULT GetCurrentHeader(/+[out]+/ LPWSTR* name,
/+[out]+/ LPWSTR* value);
/// True when the iterator hasn't run out of headers. If the collection over
@ -21960,13 +21960,13 @@ interface ICoreWebView2HttpRequestHeaders : IUnknown
static const GUID iid = { 0xe86cac0e,0x5523,0x465c,[ 0xb5,0x36,0x8f,0xb9,0xfc,0x8c,0x8c,0x60 ] };
extern(Windows):
/// Gets the header value matching the name.
HRESULT GetHeader(in LPCWSTR name,
HRESULT GetHeader(in LPCWSTR name,
/+[out, retval]+/ LPWSTR* value);
/// Gets the header value matching the name via an iterator.
HRESULT GetHeaders(in LPCWSTR name,
HRESULT GetHeaders(in LPCWSTR name,
/+[out, retval]+/ ICoreWebView2HttpHeadersCollectionIterator * iterator);
/// Checks whether the headers contain an entry matching the header name.
HRESULT Contains(in LPCWSTR name,
HRESULT Contains(in LPCWSTR name,
/+[out, retval]+/ BOOL* contains);
/// Adds or updates header that matches the name.
HRESULT SetHeader(in LPCWSTR name, in LPCWSTR value);
@ -21988,13 +21988,13 @@ interface ICoreWebView2HttpResponseHeaders : IUnknown
/// Appends header line with name and value.
HRESULT AppendHeader(in LPCWSTR name, in LPCWSTR value);
/// Checks whether the headers contain entries matching the header name.
HRESULT Contains(in LPCWSTR name,
HRESULT Contains(in LPCWSTR name,
/+[out, retval]+/ BOOL* contains);
/// Gets the first header value in the collection matching the name.
HRESULT GetHeader(in LPCWSTR name,
HRESULT GetHeader(in LPCWSTR name,
/+[out, retval]+/ LPWSTR* value);
/// Gets the header values matching the name.
HRESULT GetHeaders(in LPCWSTR name,
HRESULT GetHeaders(in LPCWSTR name,
/+[out, retval]+/ ICoreWebView2HttpHeadersCollectionIterator * iterator);
/// Gets an iterator over the collection of entire response headers.
HRESULT GetIterator(