Update Changelog

Silences compiler deprecation notice.

CHANGELOG.md

@@ -1,6 +1,25 @@
 RABCDAsm Changelog
 ==================
 
+RABCDAsm v1.15 (2014.01.11)
+---------------------------
+
+ * Fix building on systems with a noexec `/tmp/`
+ * Improve compatibility with 3rd-party players
+   * Don't emit forward references in TypeName-kind Multinames
+ * Improve performance and memory usage
+
+RABCDAsm v1.14 (2013.08.21)
+---------------------------
+
+ * Improved refid generation
+ * Worked around liblzma dictionary size limitation, which prevented 
+   decompression of some LZMA-compressed files
+ * Added an option to `swflzmacompress` to update the SWF version number
+ * Added `finddef` instruction
+ * Added unimplemented `{get|set|delete}propertylate` instructions
+ * Documentation updates
+
 RABCDAsm v1.13 (2012.09.29)
 ---------------------------
 

README.md

@@ -69,7 +69,7 @@ installed, compiling should be as straight-forward as:
 
 Substitute `dmd` with `gdmd` if you're using gdc. You can use the `DC` and 
 `DCFLAGS` environment variables to override the detected compiler and default 
-compilation flags (`-w -O -inline`).
+compilation flags (`-O -inline`).
 
 To be able to manipulate SWF files packed with LZMA compression, you'll need 
 to have the liblzma library and development files installed on your system.
@@ -82,11 +82,11 @@ to have the liblzma library and development files installed on your system.
 Pre-compiled binaries
 ---------------------
 
-You can find pre-compiled Windows binaries in the [Downloads section on 
-GitHub][downloads]. However, please don't expect them to be up-to-date with 
-the latest source versions.
+You can find pre-compiled Windows binaries on [my website][downloads]. 
+However, please don't expect them to be up-to-date with the latest source 
+versions.
 
-  [downloads]: http://github.com/CyberShadow/RABCDAsm/downloads
+  [downloads]: http://files.thecybershadow.net/RABCDAsm/
 
 Usage
 -----

abcfile.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010, 2011, 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2010, 2011, 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -754,7 +754,7 @@ const OpcodeInfo[256] opcodeInfo = [
 	/* 0x5C */		{"0x5C",				[OpcodeArgumentType.Unknown]},
 	/* 0x5D */		{"findpropstrict",		[OpcodeArgumentType.Multiname]},
 	/* 0x5E */		{"findproperty",		[OpcodeArgumentType.Multiname]},
-	/* 0x5F */		{"finddef",				[OpcodeArgumentType.Unknown]},
+	/* 0x5F */		{"finddef",				[OpcodeArgumentType.Multiname]},
 	/* 0x60 */		{"getlex",				[OpcodeArgumentType.Multiname]},
 	/* 0x61 */		{"setproperty",			[OpcodeArgumentType.Multiname]},
 	/* 0x62 */		{"getlocal",			[OpcodeArgumentType.UIntLiteral]},
@@ -762,11 +762,11 @@ const OpcodeInfo[256] opcodeInfo = [
 	/* 0x64 */		{"getglobalscope",		[]},
 	/* 0x65 */		{"getscopeobject",		[OpcodeArgumentType.UByteLiteral]},
 	/* 0x66 */		{"getproperty",			[OpcodeArgumentType.Multiname]},
-	/* 0x67 */		{"getpropertylate",		[OpcodeArgumentType.Unknown]},
+	/* 0x67 */		{"getpropertylate",		[]},
 	/* 0x68 */		{"initproperty",		[OpcodeArgumentType.Multiname]},
-	/* 0x69 */		{"setpropertylate",		[OpcodeArgumentType.Unknown]},
+	/* 0x69 */		{"setpropertylate",		[]},
 	/* 0x6A */		{"deleteproperty",		[OpcodeArgumentType.Multiname]},
-	/* 0x6B */		{"deletepropertylate",	[OpcodeArgumentType.Unknown]},
+	/* 0x6B */		{"deletepropertylate",	[]},
 	/* 0x6C */		{"getslot",				[OpcodeArgumentType.UIntLiteral]},
 	/* 0x6D */		{"setslot",				[OpcodeArgumentType.UIntLiteral]},
 	/* 0x6E */		{"getglobalslot",		[OpcodeArgumentType.UIntLiteral]},

asprogram.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010, 2011, 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2010, 2011, 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -157,6 +157,11 @@ final class ASProgram
 		uint id; // file index
 
 		MethodBody vbody;
+
+		override string toString() const
+		{
+			return name;
+		}
 	}
 
 	static class Metadata
@@ -165,6 +170,7 @@ final class ASProgram
 		string[] keys, values;
 
 		mixin AutoCompare;
+		mixin AutoToString;
 		mixin ProcessAllData;
 	}
 
@@ -232,7 +238,7 @@ final class ASProgram
 
 		Instance instance;
 
-		override string toString()
+		override string toString() const
 		{
 			return instance.name.toString();
 		}
@@ -737,135 +743,79 @@ private final class AStoABC : ASVisitor
 	}
 
 	/// Maintain an unordered set of values; sort/index by usage count
-	struct ConstantPool(T, bool haveNull = true)
+	struct Pool(T, bool byRef, bool haveNull = true)
 	{
-		alias immutable(T) I;
+		static if (byRef)
+			alias void* Key;
+		else
+			alias immutable(T) Key;
+
+		Key toKey(T value)
+		{
+			return cast(Key)value;
+		}
 
 		struct Entry
 		{
 			uint hits;
 			T value;
-			uint index;
+			size_t addIndex, index;
+			Key[] parents;
 
-			mixin AutoCompare;
-
-			R processData(R, string prolog, string epilog, H)(ref H handler) const
-			{
-				mixin(prolog);
-				mixin(addAutoField("hits", true));
-				mixin(addAutoField("value"));
-				mixin(epilog);
-			}
+			mixin AutoToString;
+			mixin ProcessAllData;
 		}
 
-		Entry[immutable(T)] pool;
+		Entry[Key] pool;
 		T[] values;
 
 		bool add(T value) // return true if added
 		{
-			if (haveNull && isNull(value))
+			if ((haveNull || byRef) && isNull(value))
 				return false;
-			auto cp = cast(I)value in pool;
-			if (cp is null)
+			auto p = toKey(value) in pool;
+			if (p is null)
 			{
-				pool[cast(I)value] = Entry(1, value);
+				pool[toKey(value)] = Entry(1, value, pool.length);
 				return true;
 			}
 			else
 			{
-				cp.hits++;
+				p.hits++;
 				return false;
 			}
 		}
 
 		bool notAdded(T value)
 		{
-			auto ep = cast(I)value in pool;
+			static if (haveNull || byRef)
+				if (isNull(value))
+					return false;
+			auto ep = toKey(value) in pool;
 			if (ep)
 				ep.hits++;
-			return !((haveNull && isNull(value)) || ep);
-		}
-
-		void finalize()
-		{
-			auto all = pool.values;
-			all.sort;
-			enum { NullOffset = haveNull ? 1 : 0 }
-			values.length = all.length + NullOffset;
-			foreach (uint i, ref c; all)
-			{
-				pool[cast(I)c.value].index = i + NullOffset;
-				values[i + NullOffset] = c.value;
-			}
-		}
-
-		uint get(T value)
-		{
-			if (haveNull && isNull(value))
-				return 0;
-			return pool[cast(I)value].index;
-		}
-	}
-
-	/// Pair an index with class instances
-	struct ReferencePool(T : Object)
-	{
-		struct Entry
-		{
-			uint hits;
-			void* object;
-			uint addIndex, index;
-			void*[] parents;
-
-			mixin AutoToString;
-			mixin ProcessAllData;
-		}
-
-		Entry[void*] pool;
-		T[] objects;
-
-		bool add(T obj) // return true if added
-		{
-			if (obj is null)
-				return false;
-			auto p = cast(void*)obj;
-			auto rp = p in pool;
-			if (rp is null)
-			{
-				pool[p] = Entry(1, p, to!uint(pool.length));
-				return true;
-			}
-			else
-			{
-				rp.hits++;
-				return false;
-			}
-		}
-
-		bool notAdded(T obj)
-		{
-			auto ep = (cast(void*)obj) in pool;
-			if (ep)
-				ep.hits++;
-			return !(obj is null || ep);
+			return !ep;
 		}
 
+		/// "from" is child of "to", thus "from" must come after "to"
 		void registerDependency(T from, T to)
 		{
-			auto pfrom = (cast(void*)from) in pool;
+			auto pfrom = toKey(from) in pool;
 			assert(pfrom, "Unknown dependency source");
-			auto vto = cast(void*)to;
+			auto vto = toKey(to);
 			auto pto = vto in pool;
 			assert(pto, "Unknown dependency target");
-			assert(!pfrom.parents.contains(vto), "Dependency already set");
+			assert(!pfrom.parents.contains!Key(vto), "Dependency already set");
 			pfrom.parents ~= vto;
 		}
 
-		T[] getPreliminaryObjects()
+		T[] getPreliminaryValues()
 		{
 			return cast(T[])pool.keys;
 		}
 
+		enum { NullOffset = haveNull ? 1 : 0 }
+
 		void finalize()
 		{
 			// create array
@@ -875,7 +825,17 @@ private final class AStoABC : ASVisitor
 				all[i++] = &e;
 
 			// sort
-			sort!q{a.hits > b.hits || (a.hits == b.hits && a.addIndex < b.addIndex)}(all);
+			static if (is(T == double))
+			{
+				static ulong repr(double d) { static assert(double.sizeof == ulong.sizeof); return *cast(ulong*)(&d); }
+				static bool sortPred(Entry* a, Entry* b) { return a.hits > b.hits || (a.hits == b.hits && repr(a.value) < repr(b.value)); }
+			}
+			else
+			static if (byRef)
+				enum sortPred = q{a.hits > b.hits || (a.hits == b.hits && a.addIndex < b.addIndex)};
+			else
+				enum sortPred = q{a.hits > b.hits || (a.hits == b.hits && a.value < b.value)};
+			all.sort!sortPred();
 
 			// topographical sort
 			topSort:
@@ -896,18 +856,29 @@ private final class AStoABC : ASVisitor
 					}
 				}
 
-			objects.length = i;
+			values.length = NullOffset + i;
 			foreach (j, e; all)
-				objects[j] = cast(T)e.object;
+				values[NullOffset + j] = e.value;
 		}
 
-		uint get(T obj)
+		uint get(T value)
 		{
-			assert(obj !is null, "Trying to get index of null object");
-			return pool[cast(void*)obj].index;
+			if (haveNull && isNull(value))
+				return 0;
+			return NullOffset + to!uint(pool[toKey(value)].index);
 		}
 	}
 
+	template ConstantPool(T, bool haveNull=true)
+	{
+		alias Pool!(T, false, haveNull) ConstantPool;
+	}
+
+	template ReferencePool(T : Object)
+	{
+		alias Pool!(T, true, false) ReferencePool;
+	}
+
 	ConstantPool!(long) ints;
 	ConstantPool!(ulong) uints;
 	ConstantPool!(double) doubles;
@@ -998,7 +969,7 @@ private final class AStoABC : ASVisitor
 	{
 		ASProgram.Class[ASProgram.Multiname] classByName;
 
-		ASProgram.Class[] classObjects = classes.getPreliminaryObjects();
+		ASProgram.Class[] classObjects = classes.getPreliminaryValues();
 		foreach (c; classObjects)
 		{
 			assert(!(c.instance.name in classByName), "Duplicate class name " ~ c.instance.name.toString());
@@ -1016,6 +987,17 @@ private final class AStoABC : ASVisitor
 					}
 	}
 
+	void registerMultinameDependencies()
+	{
+		foreach (m; multinames.getPreliminaryValues())
+			if (m.kind == ASType.TypeName)
+			{
+				multinames.registerDependency(m, m.vTypeName.name);
+				foreach (t; m.vTypeName.params)
+					multinames.registerDependency(m, t);
+			}
+	}
+
 	this(ASProgram as)
 	{
 		super(as);
@@ -1027,6 +1009,7 @@ private final class AStoABC : ASVisitor
 		super.run();
 
 		registerClassDependencies();
+		registerMultinameDependencies();
 
 		ints.finalize();
 		uints.finalize();
@@ -1115,8 +1098,8 @@ private final class AStoABC : ASVisitor
 
 		ASProgram.MethodBody[] bodies;
 
-		abc.methods.length = methods.objects.length;
-		foreach (i, o; methods.objects)
+		abc.methods.length = methods.values.length;
+		foreach (i, o; methods.values)
 		{
 			auto n = &abc.methods[i];
 			n.paramTypes.length = o.paramTypes.length;
@@ -1139,8 +1122,8 @@ private final class AStoABC : ASVisitor
 				bodies ~= o.vbody;
 		}
 
-		abc.instances.length = classes.objects.length;
-		foreach (i, c; classes.objects)
+		abc.instances.length = classes.values.length;
+		foreach (i, c; classes.values)
 		{
 			auto o = c.instance;
 			auto n = &abc.instances[i];
@@ -1156,8 +1139,8 @@ private final class AStoABC : ASVisitor
 			n.traits = convertTraits(o.traits);
 		}
 
-		abc.classes.length = classes.objects.length;
-		foreach (i, o; classes.objects)
+		abc.classes.length = classes.values.length;
+		foreach (i, o; classes.values)
 		{
 			auto n = &abc.classes[i];
 			n.cinit = methods.get(o.cinit);

build_rabcdasm.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010, 2011, 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2010, 2011, 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
 
 /// A simple tool to build RABCDAsm in one command.
 /// You can use the DC and DCFLAGS environment variables to override the detected compiler and compilation flags.
+/// You can also pass program names or compilation options on the command-line to override the default ones.
 
 module build_rabcdasm;
 
@@ -52,17 +53,20 @@ void compile(string program)
 
 void test(string code, string extraFlags=null)
 {
-	const FN = "test.d";
+	const BASE = "build_rabcdasm_buildtest";
+	const FN = BASE ~ ".d";
 	std.file.write(FN, code);
-	scope(exit) remove(FN);
-	enforce(system(format("rdmd --force --compiler=%s %s %s %s", compiler, flags, extraFlags, FN)) == 0, "Test failed");
+	scope(exit) foreach (de; dirEntries(".", BASE ~ "*", SpanMode.shallow)) remove(de.name);
+	enforce(system(format("rdmd --force --compiler=%s -od. %s %s %s", compiler, flags, extraFlags, FN)) == 0, "Test failed");
 	stderr.writeln(" >>> OK");
 }
 
-int main()
+int main(string[] args)
 {
 	try
 	{
+		auto programs = ["rabcasm", "rabcdasm", "abcexport", "abcreplace", "swfbinexport", "swfbinreplace", "swfdecompress", "swf7zcompress"];
+
 		compiler = getenv("DC");
 		if (compiler is null)
 			compiler = DEFAULT_COMPILER;
@@ -71,6 +75,15 @@ int main()
 		if (flags is null)
 			flags = DEFAULT_FLAGS;
 
+		string[] optionArgs, programArgs;
+		foreach (arg; args[1..$])
+			(arg.startsWith("-") ? optionArgs : programArgs) ~= arg;
+
+		if (optionArgs.length)
+			flags = optionArgs.join(" ");
+		if (programArgs.length)
+			programs = programArgs;
+
 		stderr.writeln("* Checking for working compiler...");
 		test(`
 			void main() {}
@@ -103,7 +116,7 @@ int main()
 		if (haveLZMA)
 			flags ~= " " ~ LZMA_FLAGS;
 
-		foreach (program; ["rabcasm", "rabcdasm", "abcexport", "abcreplace", "swfbinexport", "swfbinreplace", "swfdecompress", "swf7zcompress"])
+		foreach (program; programs)
 			compile(program);
 
 		if (haveLZMA)

disassembler.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010, 2011, 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2010, 2011, 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -18,14 +18,16 @@
 
 module disassembler;
 
-import std.file;
-import std.string;
+import std.algorithm;
 import std.array;
 import std.conv;
+import std.digest.md;
 import std.exception;
-import std.algorithm;
+import std.file;
+import std.format;
 import std.path;
-import std.md5;
+import std.stdio;
+import std.string;
 import abcfile;
 import asprogram;
 import autodata;
@@ -35,37 +37,20 @@ alias std.array.join join;
 
 final class StringBuilder
 {
-	char[] buf;
-	size_t pos;
+	enum BUF_SIZE = 256*1024;
+
+	static char[] buf;
+	static size_t pos;
+
 	string filename;
+	File file;
 
 	this(string filename)
 	{
+		this.filename = filename;
 		if (exists(longPath(filename)))
 			throw new Exception(filename ~ " exists");
-		this.filename = filename;
-		buf.length = 1024;
-	}
 
-	void opCatAssign(string s)
-	{
-		checkIndent();
-		auto end = pos + s.length;
-		while (buf.length < end)
-			buf.length = buf.length*2;
-		buf[pos..end] = s;
-		pos = end;
-	}
-
-	void opCatAssign(char c)
-	{
-		if (buf.length < pos+1) // speed hack: no loop, no indent check
-			buf.length = buf.length*2;
-		buf[pos++] = c;
-	}
-
-	void save()
-	{
 		string[] dirSegments = split(filename, "/");
 		for (int l=0; l<dirSegments.length-1; l++)
 		{
@@ -73,7 +58,58 @@ final class StringBuilder
 			if (subdir.length && !exists(longPath(subdir)))
 				mkdir(longPath(subdir));
 		}
-		write(longPath(filename), buf[0..pos]);
+		file.open(longPath(filename), "wb");
+		assert(!pos, "Opening new file with unflushed buffer");
+	}
+
+	static this()
+	{
+		buf = new char[BUF_SIZE];
+	}
+
+	void put(in char[] s)
+	{
+		checkIndent();
+		auto end = pos + s.length;
+		if (end > buf.length)
+		{
+			flush();
+			end = s.length;
+			while (end > buf.length)
+				buf.length = buf.length*2;
+		}
+		buf[pos..end] = s[];
+		pos = end;
+	}
+
+	void put(char c)
+	{
+		if (pos == buf.length) // speed hack: no indent check
+			flush();
+		buf[pos++] = c;
+	}
+
+	alias put opCatAssign;
+
+	void write(T)(T v)
+	{
+		checkIndent();
+		formattedWrite(this, "%s", v);
+	}
+
+	void flush()
+	{
+		if (pos)
+		{
+			file.rawWrite(buf[0..pos]);
+			pos = 0;
+		}
+	}
+
+	void save()
+	{
+		flush();
+		file.close();
 	}
 
 	int indent;
@@ -202,7 +238,7 @@ final class RefBuilder : ASTraitsVisitor
 							assert(0);
 				}
 				case Type.String:
-					return [Segment(filenameSuffix ? '.' : '/', str)];
+					return [Segment((filename && filenameSuffix) ? '.' : '/', str)];
 				case Type.Group:
 				{
 					Segment[] segments;
@@ -257,18 +293,32 @@ final class RefBuilder : ASTraitsVisitor
 			final switch (type)
 			{
 				case Type.Multiname:
-					auto ns = multiname.vQName.ns;
-					if (ns.kind == ASType.PrivateNamespace)
+					switch (multiname.kind)
 					{
-					//	auto pcontext = ns.id in refs.namespaces[ns.kind].contexts;
-					//	if (pcontext is null)
-					//		return (&this)[0..1];
-					//	assert(pcontext);
-						auto context = refs.namespaces[ns.kind].getContext(refs, ns.id);
-						debug(CONTEXTS) std.stdio.writefln("Context of namespace %s is:\n\t%s\n", ns, context);
-					//	auto expanded = expand(refs, context);
-					//	if (expanded is null) return null;
-						return /*expanded*/context ~ (multiname.vQName.name.length ? [ContextItem(multiname.vQName.name)] : null); // hack
+						case ASType.QName:
+						{
+							auto ns = multiname.vQName.ns;
+							if (ns.kind == ASType.PrivateNamespace)
+							{
+							//	auto pcontext = ns.id in refs.namespaces[ns.kind].contexts;
+							//	if (pcontext is null)
+							//		return (&this)[0..1];
+							//	assert(pcontext);
+								auto context = refs.namespaces[ns.kind].getContext(refs, ns.id);
+								debug(CONTEXTS) std.stdio.writefln("Context of namespace %s is:\n\t%s\n", ns, context);
+							//	auto expanded = expand(refs, context);
+							//	if (expanded is null) return null;
+								return /*expanded*/context ~ (multiname.vQName.name.length ? [ContextItem(multiname.vQName.name)] : null); // hack
+							}
+							break;
+						}
+						case ASType.Multiname:
+							return multiname.vMultiname.name.length ? [ContextItem(multiname.vMultiname.name)] : null;
+						default:
+							debug
+								assert(false, text(multiname.kind));
+							else
+								break;
 					}
 					break;
 				case Type.String:
@@ -332,6 +382,7 @@ final class RefBuilder : ASTraitsVisitor
 				case ContextItem.Type.String:
 					return i1.str == i2.str;
 				case ContextItem.Type.Multiname:
+					assert(i1.multiname.kind == ASType.QName && i2.multiname.kind == ASType.QName);
 					if (i1.multiname.vQName.name != i2.multiname.vQName.name) return false;
 					return nsSimilar(i1.multiname.vQName.ns, i2.multiname.vQName.ns);
 				case ContextItem.Type.Group:
@@ -425,16 +476,24 @@ final class RefBuilder : ASTraitsVisitor
 	void pushContext(T...)(T v) { context ~= ContextItem(v); }
 	void popContext() { context = context[0..$-1]; }
 
+	enum ContextPriority
+	{
+		declaration,
+		usage,
+		orphan,
+		max
+	}
+
 	struct ContextSet(T, bool ALLOW_DUPLICATES)
 	{
 		ContextItem[][T] contexts;
-		ContextItem[][][T] contextSets;
+		ContextItem[][][ContextPriority.max][T] contextSets;
 		debug bool contextsSealed;
 
 		string[T] names, filenames;
 		debug bool coagulated;
 
-		bool add(U)(U obj, ContextItem[] context)
+		bool add(U)(U obj, ContextItem[] context, ContextPriority priority)
 		{
 			debug assert(!coagulated);
 			debug assert(!contextsSealed);
@@ -444,23 +503,25 @@ final class RefBuilder : ASTraitsVisitor
 
 			if (!pset)
 			{
-				contextSets[p] ~= context.dup;
+				contextSets[p] = contextSets[p].init;
+				contextSets[p][priority] ~= context.dup;
 				return true;
 			}
 			else
 			{
-				if ((*pset)[$-1] != context)
-					*pset ~= context.dup;
+				static bool rawEqual(T)(T[] arr1, T[] arr2) { return cast(ubyte[])arr1 == cast(ubyte[])arr2; }
+				if ((*pset)[priority].length==0 || !rawEqual((*pset)[priority][$-1], context)) // Optimization: don't add contexts identical to the last added
+					(*pset)[priority] ~= context.dup;
 				return false;
 			}
 		}
 
-		bool addIfNew(U)(U obj, ContextItem[] context)
+		bool addIfNew(U)(U obj, ContextItem[] context, ContextPriority priority)
 		{
 			if (isAdded(obj))
 				return false;
 			else
-				return add(obj, context);
+				return add(obj, context, priority);
 		}
 
 		void coagulate(RefBuilder refs)
@@ -513,7 +574,10 @@ final class RefBuilder : ASTraitsVisitor
 			if (pcontext)
 				return *pcontext;
 
-			auto set = contextSets[p];
+			ContextItem[][] set;
+			foreach (prioritySet; contextSets[p])
+				if (prioritySet)
+					set = prioritySet;
 
 			static if (ALLOW_DUPLICATES)
 			{
@@ -597,31 +661,33 @@ final class RefBuilder : ASTraitsVisitor
 			ContextItem[] classContexts;
 
 			foreach (trait; v.traits)
-				if (trait.name.vQName.ns.kind != ASType.PrivateNamespace)
+			{
+				if (trait.name.kind == ASType.QName && trait.name.vQName.ns.kind != ASType.PrivateNamespace)
 					classContexts ~= ContextItem(trait.name);
+			}
 
 			if (!classContexts.length)
 				foreach (trait; v.traits)
 					classContexts ~= ContextItem(trait.name);
 
 			context = [ContextItem(classContexts, "script_" ~ to!string(i))];
-			scripts.add(v, context);
-			pushContext("sinit", true);
-			addMethod(v.sinit);
+			scripts.add(v, context, ContextPriority.declaration);
+			pushContext("init", true);
+			addMethod(v.sinit, ContextPriority.declaration);
 			context = null;
 		}
 		foreach (i, vclass; as.orphanClasses)
 			if (!objects.isAdded(vclass))
 			{
 				pushContext("orphan_class_" ~ to!string(i));
-				addClass(vclass);
+				addClass(vclass, ContextPriority.orphan);
 				popContext();
 			}
 		foreach (i, method; as.orphanMethods)
 			if (!objects.isAdded(method))
 			{
 				pushContext("orphan_method_" ~ to!string(i));
-				addMethod(method);
+				addMethod(method, ContextPriority.orphan);
 				popContext();
 			}
 
@@ -631,13 +697,13 @@ final class RefBuilder : ASTraitsVisitor
 		foreach (v; as.scripts)
 			foreach (trait; v.traits)
 				if (trait.name.kind == ASType.QName)
-					namespaces[trait.name.vQName.ns.kind].addIfNew(trait.name.vQName.ns.id, scripts.getContext(this, v));
+					namespaces[trait.name.vQName.ns.kind].addIfNew(trait.name.vQName.ns.id, scripts.getContext(this, v), ContextPriority.declaration);
 
 		foreach (id, b; possibleOrphanPrivateNamespaces)
 			if (!namespaces[ASType.PrivateNamespace].isAdded(id))
 			{
 				pushContext("orphan_namespace_" ~ to!string(id));
-				namespaces[ASType.PrivateNamespace].add(id, context);
+				namespaces[ASType.PrivateNamespace].add(id, context, ContextPriority.orphan);
 				popContext();
 			}
 
@@ -651,36 +717,59 @@ final class RefBuilder : ASTraitsVisitor
 	{
 		auto m = trait.name;
 
-		if (m.kind != ASType.QName)
-			throw new Exception("Trait name is not a QName");
+	//	if (m.kind != ASType.QName)
+	//		throw new Exception("Trait name is not a QName");
 
 		pushContext(m);
-		visitMultiname(m);
+		visitMultiname(m, ContextPriority.declaration);
 		switch (trait.kind)
 		{
+			case TraitKind.Slot:
+			case TraitKind.Const:
+				visitMultiname(trait.vSlot.typeName, ContextPriority.usage);
+
+				super.visitTrait(trait);
+				break;
 			case TraitKind.Class:
-				addClass(trait.vClass.vclass);
+				addClass(trait.vClass.vclass, ContextPriority.declaration);
+
+				pushContext("class", true);
+				visitTraits(trait.vClass.vclass.traits);
+				popContext();
+
+				pushContext("instance", true);
+				visitTraits(trait.vClass.vclass.instance.traits);
+				popContext();
+
 				break;
 			case TraitKind.Function:
-				addMethod(trait.vFunction.vfunction);
+				addMethod(trait.vFunction.vfunction, ContextPriority.declaration);
+
+				super.visitTrait(trait);
 				break;
 			case TraitKind.Method:
-				addMethod(trait.vMethod.vmethod);
+				addMethod(trait.vMethod.vmethod, ContextPriority.declaration);
+
+				super.visitTrait(trait);
 				break;
 			case TraitKind.Getter:
 				pushContext("getter");
-				addMethod(trait.vMethod.vmethod);
+				addMethod(trait.vMethod.vmethod, ContextPriority.declaration);
 				popContext();
+
+				super.visitTrait(trait);
 				break;
 			case TraitKind.Setter:
 				pushContext("setter");
-				addMethod(trait.vMethod.vmethod);
+				addMethod(trait.vMethod.vmethod, ContextPriority.declaration);
 				popContext();
+
+				super.visitTrait(trait);
 				break;
 			default:
+				super.visitTrait(trait);
 				break;
 		}
-		super.visitTrait(trait);
 		popContext();
 	}
 
@@ -716,7 +805,7 @@ final class RefBuilder : ASTraitsVisitor
 
 	bool[uint] possibleOrphanPrivateNamespaces;
 
-	void visitNamespace(ASProgram.Namespace ns)
+	void visitNamespace(ASProgram.Namespace ns, ContextPriority priority)
 	{
 		if (ns is null) return;
 
@@ -730,7 +819,7 @@ final class RefBuilder : ASTraitsVisitor
 
 		auto myPos = context.length;
 		foreach (i, ref item; context)
-			if (item.type == ContextItem.Type.Multiname && item.multiname.vQName.ns == ns)
+			if (item.type == ContextItem.Type.Multiname && item.multiname.kind == ASType.QName && item.multiname.vQName.ns == ns)
 			{
 				myPos = i;
 				break;
@@ -741,17 +830,17 @@ final class RefBuilder : ASTraitsVisitor
 			return;
 		}
 
-		auto myContext = context[0..myPos].dup;
-		namespaces[ns.kind].add(ns.id, myContext);
+		auto myContext = context[0..myPos];
+		namespaces[ns.kind].add(ns.id, myContext, priority);
 	}
 
-	void visitNamespaceSet(ASProgram.Namespace[] nsSet)
+	void visitNamespaceSet(ASProgram.Namespace[] nsSet, ContextPriority priority)
 	{
 		foreach (ns; nsSet)
-			visitNamespace(ns);
+			visitNamespace(ns, priority);
 	}
 
-	void visitMultiname(ASProgram.Multiname m)
+	void visitMultiname(ASProgram.Multiname m, ContextPriority priority)
 	{
 		if (m is null) return;
 		with (m)
@@ -759,20 +848,20 @@ final class RefBuilder : ASTraitsVisitor
 			{
 				case ASType.QName:
 				case ASType.QNameA:
-					visitNamespace(vQName.ns);
+					visitNamespace(vQName.ns, priority);
 					break;
 				case ASType.Multiname:
 				case ASType.MultinameA:
-					visitNamespaceSet(vMultiname.nsSet);
+					visitNamespaceSet(vMultiname.nsSet, priority);
 					break;
 				case ASType.MultinameL:
 				case ASType.MultinameLA:
-					visitNamespaceSet(vMultinameL.nsSet);
+					visitNamespaceSet(vMultinameL.nsSet, priority);
 					break;
 				case ASType.TypeName:
-					visitMultiname(vTypeName.name);
+					visitMultiname(vTypeName.name, priority);
 					foreach (param; vTypeName.params)
-						visitMultiname(param);
+						visitMultiname(param, priority);
 					break;
 				default:
 					break;
@@ -786,21 +875,21 @@ final class RefBuilder : ASTraitsVisitor
 				switch (type)
 				{
 					case OpcodeArgumentType.Namespace:
-						visitNamespace(instruction.arguments[i].namespacev);
+						visitNamespace(instruction.arguments[i].namespacev, ContextPriority.usage);
 						break;
 					case OpcodeArgumentType.Multiname:
-						visitMultiname(instruction.arguments[i].multinamev);
+						visitMultiname(instruction.arguments[i].multinamev, ContextPriority.usage);
 						break;
 					case OpcodeArgumentType.Class:
 						pushContext("inline_class");
 						if (isOrphan(instruction.arguments[i].classv))
-							addClass(instruction.arguments[i].classv);
+							addClass(instruction.arguments[i].classv, ContextPriority.usage);
 						popContext();
 						break;
 					case OpcodeArgumentType.Method:
 						pushContext("inline_method");
 						if (isOrphan(instruction.arguments[i].methodv))
-							addMethod(instruction.arguments[i].methodv);
+							addMethod(instruction.arguments[i].methodv, ContextPriority.usage);
 						popContext();
 						break;
 					default:
@@ -867,7 +956,7 @@ final class RefBuilder : ASTraitsVisitor
 					}
 
 				if (pathSegment.length > 240)
-					pathSegment = pathSegment[0..200] ~ '-' ~ getDigestString(pathSegment);
+					pathSegment = assumeUnique(pathSegment[0..200] ~ '-' ~ toHexString(md5Of(pathSegment)));
 			}
 
 			return arrayJoin(pathSegments, "/");
@@ -880,35 +969,38 @@ final class RefBuilder : ASTraitsVisitor
 		return arrayJoin(strings);
 	}
 
-	bool addObject(T)(T obj) { return objects.add(obj, context); }
+	bool addObject(T)(T obj, ContextPriority priority) { return objects.add(obj, context, priority); }
 
-	void addClass(ASProgram.Class vclass)
+	void addClass(ASProgram.Class vclass, ContextPriority priority)
 	{
-		addObject(vclass);
+		addObject(vclass, priority);
 
-		pushContext("cinit");
-		addMethod(vclass.cinit);
-		popContext();
+		pushContext("class", true);
+		pushContext("init", true);
+		addMethod(vclass.cinit, ContextPriority.declaration);
+		popContext(); // init
+		popContext(); // class
 
-		pushContext("iinit");
-		addMethod(vclass.instance.iinit);
-		popContext();
+		pushContext("instance", true);
+		pushContext("init", true);
+		addMethod(vclass.instance.iinit, ContextPriority.declaration);
+		popContext(); // init
 
-		pushContext("instance");
-		visitMultiname(vclass.instance.name);
-		visitMultiname(vclass.instance.superName);
+		visitMultiname(vclass.instance.name, ContextPriority.declaration);
+		visitMultiname(vclass.instance.superName, ContextPriority.usage);
+		visitNamespace(vclass.instance.protectedNs, ContextPriority.declaration);
 		foreach (iface; vclass.instance.interfaces)
-			visitMultiname(iface);
-		popContext();
+			visitMultiname(iface, ContextPriority.usage);
+		popContext(); // instance
 	}
 
-	void addMethod(ASProgram.Method method)
+	void addMethod(ASProgram.Method method, ContextPriority priority)
 	{
-		if (addObject(method))
+		if (addObject(method, priority))
 		{
 			foreach (paramType; method.paramTypes)
-				visitMultiname(paramType);
-			visitMultiname(method.returnType);
+				visitMultiname(paramType, ContextPriority.usage);
+			visitMultiname(method.returnType, ContextPriority.usage);
 			if (method.vbody)
 				visitMethodBody(method.vbody);
 		}
@@ -932,6 +1024,7 @@ final class Disassembler
 				base = dirName(base), up++;
 			string rel  = replicate("../", up) ~ full[base.length+1..$];
 
+			mainsb.flush();
 			StringBuilder sb = new StringBuilder(full);
 			callback(sb);
 			sb.save();
@@ -1020,7 +1113,7 @@ final class Disassembler
 		if (v == ABCFile.NULL_INT)
 			sb ~= "null";
 		else
-			sb ~= to!string(v);
+			sb.write(v);
 	}
 
 	void dumpUInt(StringBuilder sb, ulong v)
@@ -1028,7 +1121,15 @@ final class Disassembler
 		if (v == ABCFile.NULL_UINT)
 			sb ~= "null";
 		else
-			sb ~= to!string(v);
+			sb.write(v);
+	}
+
+	static struct StaticBuf(T, size_t size)
+	{
+		T[size] buf;
+		size_t pos;
+		void put(T v) { buf[pos++] = v; }
+		T[] data() { return buf[0..pos]; }
 	}
 
 	void dumpDouble(StringBuilder sb, double v)
@@ -1037,14 +1138,22 @@ final class Disassembler
 			sb ~= "null";
 		else
 		{
-			string s = format("%.18g", v);
+			StaticBuf!(char, 64) buf;
+			formattedWrite(&buf, "%.18g", v);
+			char[] s = buf.data();
 
 			static double forceDouble(double d) { static double n; n = d; return n; }
 			if (s != "nan" && s != "inf" && s != "-inf")
 			{
 				foreach_reverse (i; 1..s.length)
-					if (s[i]>='0' && s[i]<='8' && forceDouble(to!double(s[0..i] ~ cast(char)(s[i]+1)))==v)
-						s = s[0..i] ~ cast(char)(s[i]+1);
+					if (s[i]>='0' && s[i]<='8')
+					{
+						s[i]++;
+						if (forceDouble(to!double(s[0..i+1]))==v)
+							s = s[0..i+1];
+						else
+							s[i]--;
+					}
 				while (s.length>2 && s[$-1]!='.' && forceDouble(to!double(s[0..$-1]))==v)
 					s = s[0..$-1];
 			}
@@ -1436,7 +1545,7 @@ final class Disassembler
 	void dumpScript(StringBuilder sb, ASProgram.Script script, uint index)
 	{
 		sb ~= "script ; ";
-		sb ~= to!string(index);
+		sb.write(index);
 		sb.indent++; sb.newLine();
 		dumpMethod(sb, script.sinit, "sinit");
 		dumpTraits(sb, script.traits, true);
@@ -1454,12 +1563,12 @@ final class Disassembler
 	void dumpLabel(StringBuilder sb, ref ABCFile.Label label)
 	{
 		sb ~= 'L';
-		sb ~= to!string(label.index);
+		sb.write(label.index);
 		if (label.offset != 0)
 		{
 			if (label.offset > 0)
 				sb ~= '+';
-			sb ~= to!string(label.offset);
+			sb.write(label.offset);
 		}
 	}
 
@@ -1546,7 +1655,7 @@ final class Disassembler
 			{
 				sb.noIndent();
 				sb ~= 'L';
-				sb ~= to!string(ii);
+				sb.write(ii);
 				sb ~= ':';
 				sb.newLine();
 			}
@@ -1574,13 +1683,13 @@ final class Disassembler
 							throw new Exception("Don't know how to disassemble OP_" ~ opcodeInfo[instruction.opcode].name);
 
 						case OpcodeArgumentType.UByteLiteral:
-							sb ~= to!string(instruction.arguments[i].ubytev);
+							sb.write(instruction.arguments[i].ubytev);
 							break;
 						case OpcodeArgumentType.IntLiteral:
-							sb ~= to!string(instruction.arguments[i].intv);
+							sb.write(instruction.arguments[i].intv);
 							break;
 						case OpcodeArgumentType.UIntLiteral:
-							sb ~= to!string(instruction.arguments[i].uintv);
+							sb.write(instruction.arguments[i].uintv);
 							break;
 
 						case OpcodeArgumentType.Int:

lzma.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -59,6 +59,7 @@ ubyte[] lzmaDecompress(LZMAHeader header, in ubyte[] compressedData)
 	}
 
 	header.decompressedSize = -1; // Required as Flash uses End-of-Stream marker
+	fixDictSize(header.dictionarySize);
 	decompress(cast(ubyte[])(&header)[0..1]);
 	decompress(compressedData);
 
@@ -84,7 +85,6 @@ ubyte[] lzmaCompress(in ubyte[] decompressedData, LZMAHeader* header)
 	strm.next_in   = decompressedData.ptr;
 	strm.avail_in  = decompressedData.length;
 	lzmaEnforce(lzma_code(&strm, lzma_action.LZMA_RUN), "lzma_code (LZMA_RUN)");
-	scope(failure) { import std.stdio; writeln("avail_in=", strm.avail_in); }
 	enforce(strm.avail_in == 0, "Not all data was read");
 	enforce(strm.avail_out != 0, "Ran out of compression space");
 
@@ -99,3 +99,18 @@ private void lzmaEnforce(bool STREAM_END_OK=false)(lzma_ret v, string f)
 	if (v != lzma_ret.LZMA_OK && (!STREAM_END_OK || v != lzma_ret.LZMA_STREAM_END))
 		throw new Exception(text(f, " error: ", v));
 }
+
+/// Work around an artificial lzma_alone_decoder limitation in liblzma
+/// which prevents it from accepting any streams with a dictionary size
+/// that is not 2^n or 2^n + 2^(n-1).
+/// See xz\src\liblzma\common\alone_decoder.c (git commit e7b424d267), line 87
+private void fixDictSize(ref uint d)
+{
+	--d;
+	d |= d >> 2;
+	d |= d >> 3;
+	d |= d >> 4;
+	d |= d >> 8;
+	d |= d >> 16;
+	++d;
+}

swflzmacompress.d

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010, 2011, 2012 Vladimir Panteleev <vladimir@thecybershadow.net>
+ *  Copyright 2010, 2011, 2012, 2013 Vladimir Panteleev <vladimir@thecybershadow.net>
  *  This file is part of RABCDAsm.
  *
  *  RABCDAsm is free software: you can redistribute it and/or modify
@@ -18,18 +18,50 @@
 
 module swflzmacompress;
 
+import std.exception;
 import std.file;
+import std.getopt;
+import std.string;
 import swffile;
 
 void main(string[] args)
 {
+	bool force, updateVersion;
+	getopt(args,
+		"--force", &force,
+		"--update-version", &updateVersion,
+	);
+
 	if (args.length == 1)
 		throw new Exception("No file specified");
+	enum MIN_LZMA_VER = 13;
 	foreach (arg; args[1..$])
 	{
 		auto swf = SWFFile.read(cast(ubyte[])read(arg));
-		if (swf.header.signature[0] == cast(ubyte)'Z')
-			throw new Exception("Already LZMA-compressed");
+		enforce(swf.header.signature[0] != cast(ubyte)'Z', "Already LZMA-compressed");
+		if (swf.header.ver < MIN_LZMA_VER)
+		{
+			if (updateVersion)
+			{
+				if (swf.header.ver < 8 && !force)
+					throw new Exception(format(
+						"SWF version %d has different file format than version %d, " ~
+						"required for LZMA. Resulting file may not work. " ~
+						"Use --force to override and update version anyway.",
+						swf.header.ver, MIN_LZMA_VER
+					));
+				swf.header.ver = MIN_LZMA_VER;
+			}
+			else
+			if (!force)
+				throw new Exception(format(
+					"SWF version %d is too old to support SWF LZMA compression, " ~
+					"which requires version %d. " ~
+					"Use --update-version to update the version number, " ~
+					"or --force to compress anyway without updating it.",
+					swf.header.ver, MIN_LZMA_VER
+				));
+		}
 		swf.header.signature[0] = cast(ubyte)'Z'; // LZMA
 		write(arg, swf.write());
 	}