Support dotted lists in reader

1 files changed, 13 insertions, 4 deletions

@@ -121,6 +121,7 @@ read.readtable = {
         ["'"] = function(chars) return pop(chars), "quote", chars end,
         ["`"] = function(chars) return pop(chars), "quote", chars end,
         [","] = function(chars) return pop(chars), "quote", chars end,
+        ["."] = function(chars) return pop(chars), "dot", chars end,
         ["\""] = consume_string,
         [";"] = consume_comment,
         -- ["#"] =
@@ -161,12 +162,20 @@ end
 read.readmacros = {
         open =
                 function (token, tokens)
-                        local L = {}
+                        local L, lt = {}, nil
                         while tokens[1].type ~= "close" do
-                                table.insert(L, read.parse(tokens))
+                                local nt = read.parse(tokens)
+                                -- this isn't .. my /favorite/ implementation,
+                                -- but it works
+                                if nt == "." then
+                                        lt = read.parse(tokens)
+                                        break
+                                else
+                                        table.insert(L, nt)
+                                end
                         end
-                        pop(tokens) -- remove final ")"
-                        return type.List(L)
+                        pop(tokens)     -- remove final ")"
+                        return type.List(L, lt)
                 end,
         close =
                 function (token, tokens)