Skip to content

Commit

Permalink
Merge pull request #26 from rainers/master
Browse files Browse the repository at this point in the history 
Bump version to 0.3.39rc1
  • Loading branch information
@rainers
rainers committed Oct 2, 2014
2 parents 6114cbe + f087245 commit 01a2e43
Show file tree
Hide file tree
Showing 20 changed files with 393 additions and 97 deletions.
2 changes: 2 additions & 0 deletions CHANGES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,8 @@ Version history
- displays static members of classes and structs
- fixed not closing executable file causing linker to fail when rebuilding
- fixed breakpoints not set in all instances of a template
- breakpoints no longer span multiple lines
- disassembly now shows a maximum of 8 lines of source code before instruction
* new dparser version: 78a007c9aaee915e2824f30c5c7293e8853343c4
* add option "up to date with same time" to custom build
* target no longer rebuilt if only custom builds necessary
Expand Down
4 changes: 2 additions & 2 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 3
#define VERSION_REVISION 39
#define VERSION_BETA -beta
#define VERSION_BUILD 3
#define VERSION_BETA -rc
#define VERSION_BUILD 1
60 changes: 48 additions & 12 deletions c2d/c2d.visualdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
<imppath>..</imppath>
<fileImppath>..</fileImppath>
<outdir>..\bin\$(ConfigurationName)</outdir>
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
<objdir>$(OutDir)</objdir>
<objname />
<libname />
Expand Down Expand Up @@ -89,6 +91,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -138,6 +141,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
Expand Down Expand Up @@ -183,6 +188,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -232,6 +238,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd.exe</program>
Expand Down Expand Up @@ -277,6 +285,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -324,14 +333,16 @@
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2.043</Dversion>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>1</otherDMD>
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
<imppath>..</imppath>
<fileImppath>..</fileImppath>
<outdir>..\bin\$(ConfigurationName)</outdir>
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
<objdir>$(OutDir)</objdir>
<objname />
<libname />
Expand Down Expand Up @@ -371,6 +382,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -420,6 +432,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
Expand Down Expand Up @@ -465,6 +479,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -514,6 +529,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
Expand Down Expand Up @@ -559,6 +576,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -608,6 +626,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd.exe</program>
Expand Down Expand Up @@ -653,6 +673,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -700,10 +721,12 @@
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2.043</Dversion>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<compiler>0</compiler>
<otherDMD>1</otherDMD>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>1</compiler>
<otherDMD>0</otherDMD>
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
<imppath>..</imppath>
<fileImppath>..</fileImppath>
Expand Down Expand Up @@ -745,8 +768,9 @@
<libpaths />
<deffile />
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<exefile>$(OutDir)\$(ProjectName).a</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -796,12 +820,14 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>2</compiler>
<otherDMD>0</otherDMD>
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
<imppath>..</imppath>
<fileImppath>..</fileImppath>
<outdir>..\bin\$(ConfigurationName)</outdir>
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
<objdir>$(OutDir)</objdir>
<objname />
<libname />
Expand Down Expand Up @@ -841,6 +867,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -888,14 +915,16 @@
<pic>0</pic>
<cov>0</cov>
<nofloat>0</nofloat>
<Dversion>2.043</Dversion>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<compiler>0</compiler>
<otherDMD>1</otherDMD>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>2</compiler>
<otherDMD>0</otherDMD>
<program>c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd</program>
<imppath>..</imppath>
<fileImppath>..</fileImppath>
<outdir>..\bin\$(ConfigurationName)</outdir>
<outdir>..\bin\$(ConfigurationName)\$(PLATFORMNAME)</outdir>
<objdir>$(OutDir)</objdir>
<objname />
<libname />
Expand Down Expand Up @@ -935,6 +964,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -984,6 +1014,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
Expand Down Expand Up @@ -1029,6 +1061,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions>-m32ms</additionalOptions>
<preBuildCommand />
<postBuildCommand />
Expand Down Expand Up @@ -1078,6 +1111,8 @@
<nofloat>0</nofloat>
<Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst>
<stackStomp>0</stackStomp>
<compiler>0</compiler>
<otherDMD>0</otherDMD>
<program>m:\s\d\rainers\windows\bin\dmd_msc.exe</program>
Expand Down Expand Up @@ -1123,6 +1158,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
Expand Down
16 changes: 8 additions & 8 deletions c2d/cpp2d.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct C2DIni
// filepattern:: search => replace
static bool parsePatchRule(ref PatchRule rule, string line)
{
int pos = std.string.indexOf(line, "::");
ptrdiff_t pos = std.string.indexOf(line, "::");
if(pos >= 0)
{
rule.filenamePattern = std.string.strip(line[0..pos]);
Expand Down Expand Up @@ -294,7 +294,7 @@ struct C2DIni
foreach(v; split(expandConditionals))
{
bool b = true;
int pos = indexOf(v, '=');
ptrdiff_t pos = indexOf(v, '=');
string def;
if(pos > 0)
{
Expand Down Expand Up @@ -1493,7 +1493,7 @@ void extractStructDefinition(Declaration decl)
{
if(indexOf(ndtype.start.pretext, "\n") < 0)
{
int pos = lastIndexOf(begIt.pretext, "\n");
ptrdiff_t pos = lastIndexOf(begIt.pretext, "\n");
if(pos >= 0)
ndtype.start.pretext = begIt.pretext[pos .. $] ~ strip(ndtype.start.pretext);
}
Expand Down Expand Up @@ -1634,7 +1634,7 @@ void splitNonSimpleVarList(Declaration decl)
{
DeclType ndtype = dtype.clone();
TokenList typeTokens = ndtype.cloneTokens(true);
int pos = lastIndexOf(typeTokens.begin().pretext, "\n");
ptrdiff_t pos = lastIndexOf(typeTokens.begin().pretext, "\n");
if(pos > 0)
typeTokens.begin().pretext = typeTokens.begin().pretext[pos .. $];

Expand Down Expand Up @@ -2168,10 +2168,10 @@ bool isClassType(string ident)

///////////////////////////////////////////////////////////////

int firstPathSeparator(string path)
ptrdiff_t firstPathSeparator(string path)
{
int fslash = indexOf(path, '/');
int bslash = indexOf(path, '\\');
ptrdiff_t fslash = indexOf(path, '/');
ptrdiff_t bslash = indexOf(path, '\\');
if(fslash < 0)
return bslash;
if(bslash < 0)
Expand Down Expand Up @@ -2326,7 +2326,7 @@ class Cpp2DConverter

if(msg.indexOf("SyntaxException") > 0)
{
int pos = msg.indexOf("):");
ptrdiff_t pos = msg.indexOf("):");
if(pos > 0)
msg = strip(msg[pos + 2 .. $]);
if(msg.startsWith("("))
Expand Down
Loading

0 comments on commit 01a2e43

Please sign in to comment.