forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with enum parsing. Removed customization from Textadept module

This commit is contained in:
Hackerpilot 2012-11-12 14:34:17 -08:00
parent ce3ce23099
commit 688fe8b599
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autocomplete.d
View File

@ -299,7 +299,6 @@ struct AutoComplete
auto index = assumeSorted(tokens).lowerBound(cursor).length - 1; auto index = assumeSorted(tokens).lowerBound(cursor).length - 1;
Token t = tokens[index]; Token t = tokens[index];
size_t startIndex = findBeginningOfExpression(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) if (startIndex - 1 < tokens.length && tokens[startIndex - 1] == TokenType.Import)
{ {
return importComplete(splitCallChain(tokens[startIndex .. index])); return importComplete(splitCallChain(tokens[startIndex .. index]));

4
build.sh
View File

@ -1,2 +1,2 @@
#dmd *.d -release -noboundscheck -O -w -wi -m64 -property -ofdscanner #-inline #dmd *.d -release -noboundscheck -O -w -wi -m64 -property -ofdscanner #-inline
dmd *.d -g -m64 -w -wi -property -ofdscanner dmd *.d -g -m64 -w -wi -property -ofdscanner

1
editors/textadept/modules/dmd/init.lua
View File

@ -378,7 +378,6 @@ events.connect(events.CHAR_ADDED, function(ch)
local command = M.PATH_TO_DSCANNER local command = M.PATH_TO_DSCANNER
.. (character == "." and " --dotComplete " or " --parenComplete ") .. (character == "." and " --dotComplete " or " --parenComplete ")
.. fileName .. " " .. buffer.current_pos .. " -I" .. buffer.filename:match(".+[\\/]") .. fileName .. " " .. buffer.current_pos .. " -I" .. buffer.filename:match(".+[\\/]")
.. " -I ~/ludumdare24/src/Derelict3/import"
local p = io.popen(command) local p = io.popen(command)
local r = p:read("*a") local r = p:read("*a")
if r ~= "\n" then if r ~= "\n" then

4
parser.d
View File

@ -532,7 +532,7 @@ body
skipBlockStatement(tokens, index); skipBlockStatement(tokens, index);
return e; return e;
} }
else else if (index + 1 < tokens.length && tokens[index + 1] == TokenType.Assign)
{ {
// enum m = "abcd"; // enum m = "abcd";
e.name = tokens[index].value; e.name = tokens[index].value;
@ -546,6 +546,8 @@ body
} }
} }
e.name = tokens[index++].value;
if (tokens[index] == TokenType.Colon) if (tokens[index] == TokenType.Colon)
{ {
index++; index++;