From 688fe8b599d89e7497f640580f7bab9c6f579b65 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 12 Nov 2012 14:34:17 -0800
Subject: [PATCH] Fixed issue with enum parsing. Removed customization from
 Textadept module

---
 autocomplete.d                         | 1 -
 build.sh                               | 4 ++--
 editors/textadept/modules/dmd/init.lua | 1 -
 parser.d                               | 4 +++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/autocomplete.d b/autocomplete.d
index 0af3f62..03fe180 100644
--- a/autocomplete.d
+++ b/autocomplete.d
@@ -299,7 +299,6 @@ struct AutoComplete
 		auto index = assumeSorted(tokens).lowerBound(cursor).length - 1;
 		Token t = tokens[index];
 		size_t startIndex = findBeginningOfExpression(tokens, index);
-		stderr.writeln("Token before startIndex is ", tokens[startIndex - 1]);
 		if (startIndex - 1 < tokens.length && tokens[startIndex - 1] == TokenType.Import)
 		{
 			return importComplete(splitCallChain(tokens[startIndex .. index]));
diff --git a/build.sh b/build.sh
index da0e8a0..5fd70fa 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
-#dmd *.d -release -noboundscheck -O -w -wi -m64 -property -ofdscanner #-inline 
-dmd *.d -g -m64 -w -wi -property -ofdscanner 
+#dmd *.d -release -noboundscheck -O -w -wi -m64 -property -ofdscanner #-inline
+dmd *.d -g -m64 -w -wi -property -ofdscanner
diff --git a/editors/textadept/modules/dmd/init.lua b/editors/textadept/modules/dmd/init.lua
index 7b0c432..a7e54c5 100755
--- a/editors/textadept/modules/dmd/init.lua
+++ b/editors/textadept/modules/dmd/init.lua
@@ -378,7 +378,6 @@ events.connect(events.CHAR_ADDED, function(ch)
 		local command = M.PATH_TO_DSCANNER
 			.. (character == "." and " --dotComplete " or " --parenComplete ")
 			.. fileName .. " " .. buffer.current_pos .. " -I" .. buffer.filename:match(".+[\\/]")
-			.. " -I ~/ludumdare24/src/Derelict3/import"
 		local p = io.popen(command)
 		local r = p:read("*a")
 		if r ~= "\n" then
diff --git a/parser.d b/parser.d
index 82bcd77..1b62fc7 100644
--- a/parser.d
+++ b/parser.d
@@ -532,7 +532,7 @@ body
 			skipBlockStatement(tokens, index);
 			return e;
 		}
-		else
+		else if (index + 1 < tokens.length && tokens[index + 1] == TokenType.Assign)
 		{
 			// enum m = "abcd";
 			e.name = tokens[index].value;
@@ -546,6 +546,8 @@ body
 		}
 	}
 
+	e.name = tokens[index++].value;
+
 	if (tokens[index] == TokenType.Colon)
 	{
 		index++;