summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndy Davidoff <disruptek@users.noreply.github.com>2019-11-06 15:26:03 -0500
committerAndreas Rumpf <rumpf_a@web.de>2019-11-06 21:26:03 +0100
commit5544a13236b9131b4d2737045e505d4bbf5a98a2 (patch)
tree47dab4e877097e6925dc37d6582b6e0a7298521c
parent738c957e94636d28e161bc37a440523e74758fae (diff)
downloadNim-5544a13236b9131b4d2737045e505d4bbf5a98a2.tar.gz
restore --define:key:val in nim.cfg and fix #12367 (#12611)
-rw-r--r--compiler/nimconf.nim6
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index 7c0f6ea27..63cad46af 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -190,6 +190,12 @@ proc parseAssignment(L: var TLexer, tok: var TToken;
     checkSymbol(L, tok)
     add(val, $tok)
     confTok(L, tok, config, condStack)           # skip symbol
+    if tok.tokType in {tkColon, tkEquals}:
+      add(val, $tok) # add the :
+      confTok(L, tok, config, condStack)           # skip symbol
+      checkSymbol(L, tok)
+      add(val, $tok) # add the token after it
+      confTok(L, tok, config, condStack)           # skip symbol
     while tok.ident != nil and tok.ident.s == "&":
       confTok(L, tok, config, condStack)
       checkSymbol(L, tok)