Changeset 4956


Ignore:
Timestamp:
12/04/03 03:17:58 (17 years ago)
Author:
piso
Message:

toString()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/Symbol.java

    r4825 r4956  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Symbol.java,v 1.91 2003-11-18 13:54:09 piso Exp $
     5 * $Id: Symbol.java,v 1.92 2003-12-04 03:17:58 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    427427                return s;
    428428        }
    429         final Package currentPackage = (Package) _PACKAGE_.getSymbolValue();
     429        // "Package prefixes are printed if necessary." (22.1.3.3.1)
     430        final Package currentPackage = (Package) _PACKAGE_.symbolValueNoThrow();
    430431        if (pkg == currentPackage)
    431432            return s;
    432         if (currentPackage.uses(pkg)) {
     433        if (currentPackage != null && currentPackage.uses(pkg)) {
    433434            if (((Package)pkg).findExternalSymbol(name) != null)
    434435                return s;
    435436        }
     437        // Package prefix is necessary.
    436438        StringBuffer sb = new StringBuffer(pkg.getName());
    437439        if (((Package)pkg).findExternalSymbol(name) != null)
Note: See TracChangeset for help on using the changeset viewer.