forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cesyms, prevent predictible conv to string

This commit is contained in:
Basile Burg 2016-06-30 01:11:53 +02:00
parent 6fb523e8b8
commit 5d36a0a821
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cesyms/cesyms.d
View File

@ -166,6 +166,17 @@ enum SymbolType
_warning _warning
} }
string makeSymbolTypeArray()
{
string result = "string[SymbolType.max + 1] symbolTypeStrings = [";
foreach(st; EnumMembers!SymbolType)
result ~= `"` ~ to!string(st) ~ `",`;
result ~= "];";
return result;
}
mixin(makeSymbolTypeArray);
// AST visitor/Symbol list ----------------------------------------------------+ // AST visitor/Symbol list ----------------------------------------------------+
class SymbolListBuilder(ListFmt Fmt): ASTVisitor class SymbolListBuilder(ListFmt Fmt): ASTVisitor
{ {
@ -199,7 +210,8 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
static void astError(string fname, size_t line, size_t col, string msg, bool isErr) static void astError(string fname, size_t line, size_t col, string msg, bool isErr)
{ {
SymbolType type = isErr ? SymbolType._error : SymbolType._warning; string type = isErr ? symbolTypeStrings[SymbolType._error] :
symbolTypeStrings[SymbolType._warning];
static if (Fmt == ListFmt.Pas) static if (Fmt == ListFmt.Pas)
{ {
pasStream.put("\ritem\r"); pasStream.put("\ritem\r");
@ -215,7 +227,7 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
item["line"] = JSONValue(line); item["line"] = JSONValue(line);
item["col"] = JSONValue(col); item["col"] = JSONValue(col);
item["name"] = JSONValue(msg); item["name"] = JSONValue(msg);
item["type"] = JSONValue(to!string(type)); item["type"] = JSONValue(type);
jarray.array ~= item; jarray.array ~= item;
} }
} }
@ -248,7 +260,7 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
pasStream.put(format("line = %d\r", dt.name.line)); pasStream.put(format("line = %d\r", dt.name.line));
pasStream.put(format("col = %d\r", dt.name.column)); pasStream.put(format("col = %d\r", dt.name.column));
pasStream.put(format("name = '%s'\r", dt.name.text)); pasStream.put(format("name = '%s'\r", dt.name.text));
pasStream.put(format("symType = %s\r", st)); pasStream.put("symType = " ~ symbolTypeStrings[st] ~ "\r");
static if (dig) if (deep) static if (dig) if (deep)
{ {
pasStream.put("subs = <"); pasStream.put("subs = <");
@ -263,7 +275,7 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
item["line"] = JSONValue(dt.name.line); item["line"] = JSONValue(dt.name.line);
item["col"] = JSONValue(dt.name.column); item["col"] = JSONValue(dt.name.column);
item["name"] = JSONValue(dt.name.text); item["name"] = JSONValue(dt.name.text);
item["type"] = JSONValue(to!string(st)); item["type"] = JSONValue(symbolTypeStrings[st]);
static if (dig) if (deep) static if (dig) if (deep)
{ {
JSONValue subs = parseJSON("[]"); JSONValue subs = parseJSON("[]");
@ -287,7 +299,7 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
pasStream.put(format("line = %d\r", line)); pasStream.put(format("line = %d\r", line));
pasStream.put(format("col = %d\r", col)); pasStream.put(format("col = %d\r", col));
pasStream.put(format("name = '%s'\r", name)); pasStream.put(format("name = '%s'\r", name));
pasStream.put(format("symType = %s\r", st)); pasStream.put("symType = " ~ symbolTypeStrings[st] ~ "\r");
static if (dig) static if (dig)
{ {
pasStream.put("subs = <"); pasStream.put("subs = <");
@ -302,7 +314,7 @@ class SymbolListBuilder(ListFmt Fmt): ASTVisitor
item["line"] = JSONValue(line); item["line"] = JSONValue(line);
item["col"] = JSONValue(col); item["col"] = JSONValue(col);
item["name"] = JSONValue(name); item["name"] = JSONValue(name);
item["type"] = JSONValue(to!string(st)); item["type"] = JSONValue(symbolTypeStrings[st]);
static if (dig) static if (dig)
{ {
JSONValue subs = parseJSON("[]"); JSONValue subs = parseJSON("[]");