diff --git a/tconfpy.py b/tconfpy.py index eba3679..60e578f 100755 --- a/tconfpy.py +++ b/tconfpy.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "tconfpy" -RCSID = "$Id: tconfpy.py,v 1.138 2004/03/24 23:11:42 tundra Exp $" +RCSID = "$Id: tconfpy.py,v 1.139 2004/03/24 23:34:59 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -809,18 +809,17 @@ # Load variable into the symbol table else: - # Munge the variable name to incoroprate + # Munge the variable name to incorporate # the current namespace - # Handle absolute variable references - - if l.startswith(NSSEP): - l = l[1:] - # The NAMESPACE variable is special - It is presumed to reset # the top level namespace. - elif l == NAMESPACE: + if l in (NAMESPACE, NSSEP+NAMESPACE): + + if l == NSSEP + NAMESPACE: + l=NAMESPACE + # Save the new namespace SymTable[NAMESPACE].Value = r @@ -828,6 +827,11 @@ if r not in SymTable[NAMESPACE].LegalVals: SymTable[NAMESPACE].LegalVals.append(r) + # Handle absolute variable references + + elif l.startswith(NSSEP): + l = l[1:] + # In all other cases prepend current namespace else: ns = SymTable[NAMESPACE].Value