From 2e78e94eb894e511e583db03286a3c13b9ecc780 Mon Sep 17 00:00:00 2001
From: Chouser <chouser@n01se.net>
Date: Sat, 7 Feb 2015 10:01:31 -0500
Subject: forth: Finished step 1

---
 forth/reader.fs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'forth/reader.fs')

diff --git a/forth/reader.fs b/forth/reader.fs
index 57f3e8d..7ff46fd 100644
--- a/forth/reader.fs
+++ b/forth/reader.fs
@@ -126,6 +126,7 @@ defer read-form ( str-addr str-len -- str-addr str-len mal-obj )
         dup mal-digit? if read-int else
         dup [char] ( = if [char] ) read-list else
         dup [char] [ = if [char] ] read-list MalVector new tuck MalVector/list ! else
+        dup [char] { = if [char] } read-list MalMap new tuck MalMap/list ! else
         dup [char] " = if read-string-literal else
         dup [char] ; = if read-comment else
         dup [char] @ = if drop adv-str s" deref" read-wrapped else
@@ -136,9 +137,16 @@ defer read-form ( str-addr str-len -- str-addr str-len mal-obj )
             dup [char] @ = if drop adv-str s" splice-unquote" read-wrapped
             else s" unquote" read-wrapped
             endif
+        else
+        dup [char] ^ = if
+            drop adv-str
+            read-form { meta } read-form { obj }
+            meta mal-nil conj
+            obj swap conj
+            s" with-meta" MalSymbol. swap conj
         else
             read-symbol-str MalSymbol.
-        endif endif endif endif endif endif endif endif endif
+        endif endif endif endif endif endif endif endif endif endif endif
         dup skip-elem =
     while drop repeat ;
 ' read-form2 is read-form
-- 
cgit v1.2.3