Navigation

Changeset 956

Timestamp:

03/04/09 17:11:51 (3 years ago)

Author:

andrei

Message:

Changed eval() to not use the same filename for all expressions

Files:

r954	r956
33	33	// For --eval
34	34	immutable string importWorld = "
	35	module temporary;
35	36	import std.stdio, std.algorithm, std.array, std.atomics, std.base64,
36		std.bigint, std.bind, /std.bitarray,/ std.bitmanip, std.boxer,
	37	std.bigint, /std.bind, std.bitarray,/ std.bitmanip, std.boxer,
37	38	std.compiler, std.complex, std.contracts, std.conv, std.cpuid, std.cstream,
38	39	std.ctype, std.date, std.dateparse, std.demangle, std.encoding, std.file,
…	…
44	45	std.string, std.syserror, std.system, std.traits, std.typecons,
45	46	std.typetuple, std.uni, std.uri, std.utf, std.variant, std.xml, std.zip,
46		std.zlib;";
	47	std.zlib;
	48	";
47	49
48	50	int main(string[] args)
…	…
177	179	// Have at it
178	180	if (isNewer(root, exe) \|\|
179		~~canFind!((string a) {return isNewer(a, exe);})(myModules.keys)~~)
	181	find!((string a) {return isNewer(a, exe);})(myModules.keys).length)
180	182	{
181	183	invariant result = rebuild(root, exe, objDir, myModules, compilerFlags);
…	…
226	228	context.update(root);
227	229	foreach (flag; compilerFlags) {
228		if (~~canFind(irrelevantSwitches, flag)~~) continue;
	230	if (find(irrelevantSwitches, flag).length) continue;
229	231	context.update(flag);
230	232	}
…	…
352	354	int eval(string todo)
353	355	{
354		auto progname = tmpDir~"/eval.d";
	356	MD5_CTX context;
	357	context.start();
	358	context.update(todo);
	359	ubyte digest[16];
	360	context.finish(digest);
	361	auto progname = std.path.join(tmpDir,
	362	"rdmd_eval" ~ digestToString(digest) ~ ".d");
	363
355	364	std.file.write(progname, todo);
356	365	scope(exit) std.file.remove(progname);