* lib.c (intern): fix the previous diagnostic bug once more with more

feeling.

* parser.l (grammar): Recognize package prefixes in symbol tokens.
Got rid of special rule for handling lone colon.

* parser.y (sym_helper): Catch undefined package as a parsing
error rather allowing intern function to throw exception.

1 files changed, 4 insertions, 3 deletions

diff --git a/lib.c b/lib.c
index e95d72f8..0939bd9a 100644
--- a/lib.c
+++ b/lib.c
@@ -2561,9 +2561,10 @@ val intern(val str, val package)
   if (nullp(package)) {
     package = user_package;
   } else if (stringp(package)) {
-    package = find_package(str);
-    if (!package)
-      uw_throwf(error_s, lit("intern: ~s no such package"), str, nao);
+    val p = find_package(package);
+    if (!p)
+      uw_throwf(error_s, lit("intern: ~s no such package"), package, nao);
+    package = p;
   }
 
   type_check (package, PKG);