--- ray/src/common/caldefn.c	1991/08/09 08:27:56	1.17
+++ ray/src/common/caldefn.c	1992/08/10 16:20:43	2.3
@@ -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,7 +215,7 @@ qualname(nam, lvl)		/* get qualified name */
 register char  *nam;
 int  lvl;
 {
-    static char  nambuf[MAXWORD];
+    static char  nambuf[MAXWORD+1];
     register char  *cp = nambuf, *cpp;
 				/* check for explicit local */
     if (*nam == CNTXMARK)
@@ -229,7 +227,7 @@ int  lvl;
 	return(lvl > 0 ? NULL : nam);
 				/* copy name to static buffer */
     while (*nam) {
-	if (cp >= nambuf+MAXWORD-1)
+	if (cp >= nambuf+MAXWORD)
 		goto toolong;
 	*cp++ = *nam++;
     }
@@ -248,17 +246,13 @@ int  lvl;
 	    ;
     }
     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 */
 }
 
 
@@ -266,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));
 }
 
@@ -341,32 +335,45 @@ varinsert(name)			/* get a link to a variable */
 char  *name;
 {
     register VARDEF  *vp;
-    LIBR  *libp;
     int  hv;
     
     if ((vp = varlookup(name)) != NULL) {
 	vp->nlinks++;
 	return(vp);
     }
+    vp = (VARDEF *)emalloc(sizeof(VARDEF));
 #ifdef  FUNCTION
-    libp = liblookup(name);
+    vp->lib = liblookup(name);
 #else
-    libp = NULL;
+    vp->lib = NULL;
 #endif
-    if (libp == NULL)			/* if name not in library */
+    if (vp->lib == NULL)		/* if name not in library */
 	name = qualname(name, 0);	/* use fully qualified version */
     hv = hash(name);
-    vp = (VARDEF *)emalloc(sizeof(VARDEF));
     vp->name = savestr(name);
     vp->nlinks = 1;
     vp->def = NULL;
-    vp->lib = libp;
     vp->next = hashtbl[hv];
     hashtbl[hv] = vp;
     return(vp);
 }
 
 
+#ifdef  FUNCTION
+libupdate(fn)			/* update library links */
+char  *fn;
+{
+    register int  i;
+    register VARDEF  *vp;
+					/* if fn is NULL then relink all */
+    for (i = 0; i < NHASH; i++)
+	for (vp = hashtbl[i]; vp != NULL; vp = vp->next)
+	    if (vp->lib != NULL || fn == NULL || !strcmp(fn, vp->name))
+		vp->lib = liblookup(vp->name);
+}
+#endif
+
+
 varfree(ln)				/* release link to variable */
 register VARDEF  *ln;
 {
@@ -406,14 +413,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);
     	}
     }
@@ -543,7 +552,7 @@ getdefn()			/* A -> SYM = E1 */
 {
     register EPNODE  *ep1, *ep2;
 
-    if (!isalpha(nextc))
+    if (!isalpha(nextc) && nextc != CNTXMARK)
 	syntax("illegal variable name");
 
     ep1 = newnode();