Changeset 3634

Timestamp:

09/09/03 12:51:36 (19 years ago)

Author:

piso

Message:

PACKAGE_INTERNAL_SYMBOLS(), PACKAGE_EXTERNAL_SYMBOLS(), PACKAGE_INHERITED_SYMBOLS()

File:

• trunk/j/src/org/armedbear/lisp/Package.java (modified) (5 diffs)

trunk/j/src/org/armedbear/lisp/Package.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Package.java,v 1.40 2003-08-15 17:18:02 piso Exp $
+ * $Id: Package.java,v 1.41 2003-09-09 12:51:36 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -31 +31 @@
     private String name;
 
-    private final HashMap internalSymbols;
-    private final HashMap externalSymbols;
+    private final HashMap internalSymbols = new HashMap();
+    private final HashMap externalSymbols = new HashMap();
     private HashMap shadowingSymbols;
     private ArrayList nicknames;
@@ -41 +41 @@
     {
         this.name = name;
-        internalSymbols = new HashMap();
-        externalSymbols = new HashMap();
     }
 
@@ -48 +46 @@
     {
         this.name = name;
-        internalSymbols = new HashMap();
-        externalSymbols = new HashMap();
     }
 
@@ -608 +604 @@
     }
 
+    public synchronized LispObject PACKAGE_INTERNAL_SYMBOLS()
+    {
+        LispObject list = NIL;
+        for (Iterator it = internalSymbols.values().iterator(); it.hasNext();) {
+            Symbol symbol = (Symbol) it.next();
+            list = new Cons(symbol, list);
+        }
+        return list;
+    }
+
+    public synchronized LispObject PACKAGE_EXTERNAL_SYMBOLS()
+    {
+        LispObject list = NIL;
+        for (Iterator it = externalSymbols.values().iterator(); it.hasNext();) {
+            Symbol symbol = (Symbol) it.next();
+            list = new Cons(symbol, list);
+        }
+        return list;
+    }
+
+    public synchronized LispObject PACKAGE_INHERITED_SYMBOLS()
+    {
+        LispObject list = NIL;
+        for (Iterator packageIter = useList.iterator(); packageIter.hasNext();) {
+            Package pkg = (Package) packageIter.next();
+            for (Iterator it = pkg.externalSymbols.values().iterator(); it.hasNext();) {
+                Symbol symbol = (Symbol) it.next();
+                if (shadowingSymbols != null && shadowingSymbols.get(symbol.getName()) != null)
+                    continue;
+                if (externalSymbols.get(symbol.getName()) == symbol)
+                    continue;
+                list = new Cons(symbol, list);
+            }
+        }
+        return list;
+    }
+
     public synchronized LispObject getSymbols()
     {