From 524e3627fb243a03cd12aab4bce9dac6bbd3b7b2 Mon Sep 17 00:00:00 2001
From: Scott Richmond <kredati@users.noreply.github.com>
Date: Thu, 30 May 2024 19:38:00 -0400
Subject: [PATCH] get pkg validation access working for root pkg access, e.g.
 `Foo :bar` and `Foo :bar`

---
 janet/parser.janet   |  7 +++----
 janet/scanner.janet  |  2 ++
 janet/validate.janet | 11 +++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/janet/parser.janet b/janet/parser.janet
index 3950f25..92f1996 100644
--- a/janet/parser.janet
+++ b/janet/parser.janet
@@ -1127,10 +1127,10 @@
 )
 
 
-# (do
-(comment
+(do
+# (comment
 (def source `
-pkg Baz {Foo, Bar}
+print! ("hello")
 `)
 (def scanned (s/scan source))
 (print "\n***NEW PARSE***\n")
@@ -1140,7 +1140,6 @@ pkg Baz {Foo, Bar}
 # (print (pp-ast parsed))
 # (pp scanned)
 (pp parsed)
-(pp (a-parser :errors))
 # (def cleaned (get-in parsed [:data 2]))
 # (pp cleaned)
 )
diff --git a/janet/scanner.janet b/janet/scanner.janet
index ae585ad..cd886bf 100644
--- a/janet/scanner.janet
+++ b/janet/scanner.janet
@@ -341,3 +341,5 @@
       (recur (-> scanner (scan-token) (next-token)))))
   (recur (new-scanner source input)))
 
+(def source `print! ("hello")`)
+(pp ((scan source) :tokens))
diff --git a/janet/validate.janet b/janet/validate.janet
index 701af02..96097e5 100644
--- a/janet/validate.janet
+++ b/janet/validate.janet
@@ -513,8 +513,10 @@ Deferred until a later iteration of Ludus:
  (set (validator :ast) value)
  (validate validator)
  (def entry (if (= :pkg-name (value :type))
-  (resolve-name (value :name) (validator :ctx))
+  (resolve-name (validator :ctx) (string (value :data)))
   value))
+ (print "entry at " (key :data))
+ (pp entry)
  (set (status :pkg-access?) nil)
  (def kw (key :data))
  (pp kw)
@@ -724,10 +726,11 @@ Deferred until a later iteration of Ludus:
 (def source `
 let foo = 1
 pkg Foo {foo}
-pkg Baz {Foo}
-Foo :Baz
+pkg Baz {Foo, foo}
+Baz :Foo :bar
 `)
 (def scanned (s/scan source))
 (def parsed (p/parse scanned))
-(def validated (valid parsed b/ctx))
+(def validated (valid parsed))
+# (validated :ctx)
 )