From f01c2e5989e36414e677e28287cff8c896aa7a09 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay.mccarthy@gmail.com>
Date: Fri, 20 Nov 2015 11:56:09 -0500
Subject: [PATCH] notes and fixup raw

---
 remix/README           |  3 ++-
 remix/raw-stx0.rkt     | 26 ++++++++++++++++++--------
 remix/tests/simple.rkt |  2 ++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/remix/README b/remix/README
index 57c02f8..6e1bfc6 100644
--- a/remix/README
+++ b/remix/README
@@ -57,6 +57,7 @@ TODO No set! (use data-structure mutation and :=)
 
 (def (var x) 5)
 {x := 6}
+{x ← 6}
 
 TODO No effects or expressions at top-level (controversial, mf says wrong) [set-once!]
 
@@ -157,7 +158,7 @@ TODO Remove multiple values?
 
 TODO Rocket-strength super cut:
 
-  λ.(+ $0 $1)
+  λ.(+ $.0 $.1)
 
 TODO Don't use English in exceptions and have more structured exns
 [demo on raco/pkg]
diff --git a/remix/raw-stx0.rkt b/remix/raw-stx0.rkt
index 68316da..d7d8f85 100644
--- a/remix/raw-stx0.rkt
+++ b/remix/raw-stx0.rkt
@@ -1,13 +1,26 @@
 #lang racket/base
 (require racket/match)
 
-(define (syntax-strings->input-port name ss)
+(define (syntax-strings->input-port name first-ss)
   (define line 1)
   (define col 0)
   (define pos 1)
   (define current-idx #f)
   (define current-bs #f)
-  (define next-ss ss)
+  (define next-ss first-ss)
+
+  (define (consume-ss!)
+    (match next-ss
+      ['() (void)]
+      [(cons ss more-ss)     
+       (set! line (syntax-line ss))
+       (set! col (syntax-column ss))
+       (set! pos (syntax-position ss))
+       (set! current-bs (string->bytes/utf-8 (syntax->datum ss)))
+       (set! current-idx 0)
+       (set! next-ss more-ss)]))
+
+  (consume-ss!)
 
   (define (read-in bs)
     (cond
@@ -15,12 +28,7 @@
        (match next-ss
          ['() eof]
          [(cons ss more-ss)
-          (set! line (syntax-line ss))
-          (set! col (syntax-column ss))
-          (set! pos (syntax-position ss))
-          (set! current-bs (string->bytes/utf-8 (syntax->datum ss)))
-          (set! current-idx 0)
-          (set! next-ss more-ss)
+          (consume-ss!)
           (read-in bs)])]
       [(< current-idx (bytes-length current-bs))
        (define how-many
@@ -32,6 +40,8 @@
        (set! current-idx end)
        (set! col (+ col how-many))
        (set! pos (+ pos how-many))
+       (unless (< current-idx (bytes-length current-bs))
+         (consume-ss!))
        how-many]
       [else
        (set! current-bs #f)
diff --git a/remix/tests/simple.rkt b/remix/tests/simple.rkt
index c451c1a..ba6aa6a 100644
--- a/remix/tests/simple.rkt
+++ b/remix/tests/simple.rkt
@@ -156,3 +156,5 @@
   x)
 (module+ test
   v64)
+
+;; (def [stx #%posn] (layout x y))