Merge pull request #378 from asarhaddon/test-macro-not-changing-function

[jackhill/mal.git] / cs / reader.cs

diff --git a/cs/reader.cs b/cs/reader.cs
index dbc74af..3136b90 100644 (file)
--- a/cs/reader.cs
+++ b/cs/reader.cs
@@ -39,7 +39,7 @@ namespace Mal {
 
         public static List<string> tokenize(string str) {
             List<string> tokens = new List<string>();
-            string pattern = @"[\s ,]*(~@|[\[\]{}()'`~@]|""(?:[\\].|[^\\""])*""|;.*|[^\s \[\]{}()'""`~@,;]*)";
+            string pattern = @"[\s ,]*(~@|[\[\]{}()'`~@]|""(?:[\\].|[^\\""])*""?|;.*|[^\s \[\]{}()'""`~@,;]*)";
             Regex regex = new Regex(pattern);
             foreach (Match match in regex.Matches(str)) {
                 string token = match.Groups[1].Value;
@@ -53,7 +53,7 @@ namespace Mal {
 
         public static MalVal read_atom(Reader rdr) {
             string token = rdr.next();
-            string pattern = @"(^-?[0-9]+$)|(^-?[0-9][0-9.]*$)|(^nil$)|(^true$)|(^false$)|^("".*"")$|(^[^""]*$)";
+            string pattern = @"(^-?[0-9]+$)|(^-?[0-9][0-9.]*$)|(^nil$)|(^true$)|(^false$)|^("".*)|:(.*)|(^[^""]*$)";
             Regex regex = new Regex(pattern);
             Match match = regex.Match(token);
             //Console.WriteLine("token: ^" + token + "$");
@@ -70,12 +70,19 @@ namespace Mal {
                 return Mal.types.False;
             } else if (match.Groups[6].Value != String.Empty) {
                 string str = match.Groups[6].Value;
+                if (str[str.Length-1] != '"') {
+                    throw new ParseError("expected '\"', got EOF");
+                }
                 str = str.Substring(1, str.Length-2)
-                    .Replace("\\\"", "\"")
-                    .Replace("\\n", "\n");
+                    .Replace("\\\\",   "\u029e")
+                    .Replace("\\\"",   "\"")
+                    .Replace("\\n",    "\n")
+                    .Replace("\u029e", "\\");
                 return new Mal.types.MalString(str);
             } else if (match.Groups[7].Value != String.Empty) {
-                return new Mal.types.MalSymbol(match.Groups[7].Value);
+                return new Mal.types.MalString("\u029e" + match.Groups[7].Value);
+            } else if (match.Groups[8].Value != String.Empty) {
+                return new Mal.types.MalSymbol(match.Groups[8].Value);
             } else {
                 throw new ParseError("unrecognized '" + match.Groups[0] + "'");
             }