Fixes SDQL strings

This is done by partially reverting commit 503a8a3557
Also fixed explain not working well with goonchat
This commit is contained in:
Jonathan (JJRcop)
2018-08-04 04:58:57 -04:00
parent b9d0cc3abb
commit 1b57f50136
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -196,9 +196,10 @@
/proc/SDQL_testout(list/query_tree, indent = 0)
var/static/whitespace = "    "
var/spaces = ""
for(var/s = 0, s < indent, s++)
spaces += " "
spaces += whitespace
for(var/item in query_tree)
if(istype(item, /list))
@@ -212,12 +213,12 @@
if(!isnum(item) && query_tree[item])
if(istype(query_tree[item], /list))
to_chat(usr, "[spaces] (")
to_chat(usr, "[spaces][whitespace](")
SDQL_testout(query_tree[item], indent + 2)
to_chat(usr, "[spaces] )")
to_chat(usr, "[spaces][whitespace])")
else
to_chat(usr, "[spaces] [query_tree[item]]")
to_chat(usr, "[spaces][whitespace][query_tree[item]]")
@@ -331,7 +331,7 @@
//string: ''' <some text> ''' | '"' <some text > '"'
/datum/SDQL_parser/proc/string(i, list/node)
if(copytext(token(i), 1, 2) in list("'", "\""))
node += copytext(token(i),2,-1)
node += token(i)
else
parse_error("Expected string but found '[token(i)]'")
return i + 1