M core/consts.nim → core/consts.nim

@@ -37,13 +37,13 @@ stderr.writeLine("Cannot process configuration file.")
   quit(2)
 
 
-
-when defined(windows):
-  const HOME* = getenv("USERPROFILE")
-when not defined(windows):
-  const HOME* = getenv("HOME")
+var HOME*: string
+if defined(windows):
+  HOME = getenv("USERPROFILE")
+if not defined(windows):
+  HOME = getenv("HOME")
 
-const MINIMRC* = HOME / ".minimrc"
-const MINIMSYMBOLS* = HOME / ".minim_symbols"
-const MINIMHISTORY* = HOME / ".minim_history"
+let MINIMRC* = HOME / ".minimrc"
+let MINIMSYMBOLS* = HOME / ".minim_symbols"
+let MINIMHISTORY* = HOME / ".minim_history"
 

M core/parser.nim → core/parser.nim

@@ -503,7 +503,7 @@ return $a.boolVal
     of minSymbol:
       return a.symVal
     of minString:
-      return "\""&a.strVal&"\""
+      return "\"$1\"" % a.strVal.replace("\"", "\\\"")
     of minInt:
       return $a.intVal
     of minFloat: