From 1b57f50136eb3f6e5bcb95c04b35c6a48c6da0ce Mon Sep 17 00:00:00 2001 From: "Jonathan (JJRcop)" Date: Sat, 4 Aug 2018 04:58:57 -0400 Subject: [PATCH] Fixes SDQL strings This is done by partially reverting commit 503a8a3557b135707b2c746e7bb5a6f023a36838 Also fixed explain not working well with goonchat --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 9 +++++---- code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index f4fda48da72..b76fae94f80 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -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]]") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 61945f1dde7..3da47673620 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -331,7 +331,7 @@ //string: ''' ''' | '"' '"' /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