Support variables and headers in echo

vicampo · Nov 14, 2018 · e52a4c0 · e52a4c0
1 parent 8ac84d7
commit e52a4c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/echo.rkt b/echo.rkt
@@ -45,7 +45,8 @@
                [else
                 (displayln "# (empty response)")])]
         [(? expression?)
-         (render-commented-out (send expr evalutate env))])
+         (displayln (format "# ~a = " (send expr render)))
+         (render-commented-out (send expr evaluate env))])
       env)
     (define/override (render)
       (cond [(eq? #f expr)

diff --git a/grammar.rkt b/grammar.rkt
@@ -11,7 +11,7 @@ program-step: assignment
 
 import: IMPORT URI
 
-echo: "echo" [ JSON-POINTER | NORMAL-IDENTIFIER | HEADER-REF ]
+echo: "echo" [ JSON-POINTER | normal-identifier | head-id ]
 
 unset: "unset" HEADER-IDENTIFIER
 

diff --git a/program.rkt b/program.rkt
@@ -321,6 +321,10 @@
   (match to-be-echoed
     [#f
      (make-echo-step #f)]
+    [(list 'normal-identifier id)
+     (make-echo-step (parse-tree->identifier to-be-echoed))]
+    [(list 'head-id id)
+     (make-echo-step (parse-tree->identifier to-be-echoed))]
     [else
      (error (format "parse-tree->echo: Cannot make sense of ~a" to-be-echoed))]))