--- ray/src/common/caldefn.c	1991/08/08 14:38:00	1.16
+++ ray/src/common/caldefn.c	1991/11/12 16:55:27	2.1
@@ -38,11 +38,13 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern char  *ecalloc(), *savestr(), *strcpy();
 
+static int  hash();
+
 static double  dvalue();
 
 long  eclock = -1;			/* value storage timer */
 
-static char  context[MAXWORD];		/* current context path */
+static char  context[MAXWORD+1];	/* current context path */
 
 static VARDEF  *hashtbl[NHASH];		/* definition list */
 static int  htndx;			/* index for */		
@@ -195,12 +197,8 @@ register char  *ctx;
     if (*ctx != CNTXMARK)
 	*cpp++ = CNTXMARK;		/* make sure there's a mark */
     do {
-	if (cpp >= context+MAXWORD-1) {
-	    *cpp = '\0';
-	    wputs(context);
-	    wputs(": context path too long\n");
-	    return(NULL);
-	}
+	if (cpp >= context+MAXWORD)
+	    break;			/* just copy what we can */
 	if (isid(*ctx))
 	    *cpp++ = *ctx++;
 	else {
@@ -217,47 +215,44 @@ qualname(nam, lvl)		/* get qualified name */
 register char  *nam;
 int  lvl;
 {
-    static char  nambuf[MAXWORD];
-    register char  *cp = nambuf, *cpp = context;
-				/* check for explicit global */
+    static char  nambuf[MAXWORD+1];
+    register char  *cp = nambuf, *cpp;
+				/* check for explicit local */
     if (*nam == CNTXMARK)
-	return(lvl > 0 ? NULL : nam+1);
-				/* check for repeat call */
-    if (nam == nambuf)
-	return(lvl > 0 ? NULL : nambuf);
+	if (lvl > 0)		/* only action is to refuse search */
+	    return(NULL);
+	else
+	    nam++;
+    else if (nam == nambuf)	/* check for repeat call */
+	return(lvl > 0 ? NULL : nam);
 				/* copy name to static buffer */
     while (*nam) {
-	if (cp >= nambuf+MAXWORD-1)
+	if (cp >= nambuf+MAXWORD)
 		goto toolong;
-	if ((*cp++ = *nam++) == CNTXMARK)
-	    cpp = NULL;		/* flag a qualified name */
+	*cp++ = *nam++;
     }
-    if (cpp == NULL) {
+				/* check for explicit global */
+    if (cp > nambuf && cp[-1] == CNTXMARK) {
 	if (lvl > 0)
-	    return(NULL);		/* no higher level */
-	if (cp[-1] == CNTXMARK) {
-	    cp--; cpp = context;	/* current context explicitly */
-	} else
-	    cpp = "";			/* else fully qualified */
-    } else			/* else skip the requested levels */
-	while (lvl-- > 0) {
-	    if (!*cpp)
-		return(NULL);	/* return NULL if past global level */
-	    while (*++cpp && *cpp != CNTXMARK)
-		;
-	}
+	    return(NULL);
+	*--cp = '\0';
+	return(nambuf);		/* already qualified */
+    }
+    cpp = context;		/* else skip the requested levels */
+    while (lvl-- > 0) {
+	if (!*cpp)
+	    return(NULL);	/* return NULL if past global level */
+	while (*++cpp && *cpp != CNTXMARK)
+	    ;
+    }
     while (*cpp) {		/* copy context to static buffer */
-	if (cp >= nambuf+MAXWORD-1)
+	if (cp >= nambuf+MAXWORD)
 	    goto toolong;
 	*cp++ = *cpp++;
     }
-    *cp = '\0';
-    return(nambuf);		/* return qualified name */
 toolong:
     *cp = '\0';
-    eputs(nambuf);
-    eputs(": name too long\n");
-    quit(1);
+    return(nambuf);		/* return qualified name */
 }
 
 
@@ -265,7 +260,7 @@ incontext(qn)			/* is qualified name in current contex
 register char  *qn;
 {
     while (*qn && *qn != CNTXMARK)	/* find context mark */
-	;
+	qn++;
     return(!strcmp(qn, context));
 }
 
@@ -405,14 +400,16 @@ EPNODE *
 dnext()				/* return pointer to next definition */
 {
     register EPNODE  *ep;
+    register char  *nm;
 
     while (htndx < NHASH) {
     	if (htpos == NULL)
     		htpos = hashtbl[htndx++];
     	while (htpos != NULL) {
     	    ep = htpos->def;
+	    nm = htpos->name;
     	    htpos = htpos->next;
-    	    if (ep != NULL)
+    	    if (ep != NULL && incontext(nm))
     	    	return(ep);
     	}
     }
@@ -542,7 +539,7 @@ getdefn()			/* A -> SYM = E1 */
 {
     register EPNODE  *ep1, *ep2;
 
-    if (!isalpha(nextc))
+    if (!isalpha(nextc) && nextc != CNTXMARK)
 	syntax("illegal variable name");
 
     ep1 = newnode();