Changeset 11278
- Timestamp:
- 08/12/08 21:59:13 (15 years ago)
- Location:
- trunk/j/src/org/armedbear/lisp
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/j/src/org/armedbear/lisp/Closure.java
r11272 r11278 3 3 * 4 4 * Copyright (C) 2002-2008 Peter Graves 5 * $Id: Closure.java,v 1.11 2 2008-02-20 18:30:25 pisoExp $5 * $Id: Closure.java,v 1.113 2008-08-12 21:59:05 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 81 81 { 82 82 final int length = lambdaList.length(); 83 ArrayList required = null;84 ArrayList optional = null;85 ArrayList keywords = null;86 ArrayList aux = null;83 ArrayList<Parameter> required = null; 84 ArrayList<Parameter> optional = null; 85 ArrayList<Parameter> keywords = null; 86 ArrayList<Parameter> aux = null; 87 87 int state = STATE_REQUIRED; 88 88 LispObject remaining = lambdaList; … … 95 95 { 96 96 if (aux == null) 97 aux = new ArrayList ();97 aux = new ArrayList<Parameter>(); 98 98 aux.add(new Parameter((Symbol)obj, NIL, AUX)); 99 99 } … … 153 153 { 154 154 if (optional == null) 155 optional = new ArrayList ();155 optional = new ArrayList<Parameter>(); 156 156 optional.add(new Parameter((Symbol)obj, NIL, OPTIONAL)); 157 157 if (maxArgs >= 0) … … 161 161 { 162 162 if (keywords == null) 163 keywords = new ArrayList ();163 keywords = new ArrayList<Parameter>(); 164 164 keywords.add(new Parameter((Symbol)obj, NIL, KEYWORD)); 165 165 if (maxArgs >= 0) … … 170 170 Debug.assertTrue(state == STATE_REQUIRED); 171 171 if (required == null) 172 required = new ArrayList ();172 required = new ArrayList<Parameter>(); 173 173 required.add(new Parameter((Symbol)obj)); 174 174 if (maxArgs >= 0) … … 185 185 Debug.assertTrue(initForm != null); 186 186 if (aux == null) 187 aux = new ArrayList ();187 aux = new ArrayList<Parameter>(); 188 188 aux.add(new Parameter(sym, initForm, AUX)); 189 189 } … … 194 194 LispObject svar = obj.cdr().cdr().car(); 195 195 if (optional == null) 196 optional = new ArrayList ();196 optional = new ArrayList<Parameter>(); 197 197 optional.add(new Parameter(sym, initForm, svar, OPTIONAL)); 198 198 if (maxArgs >= 0) … … 226 226 } 227 227 if (keywords == null) 228 keywords = new ArrayList ();228 keywords = new ArrayList<Parameter>(); 229 229 keywords.add(new Parameter(keyword, var, initForm, svar)); 230 230 if (maxArgs >= 0) … … 294 294 private final Symbol[] processVariables() 295 295 { 296 ArrayList vars = new ArrayList();296 ArrayList<Symbol> vars = new ArrayList<Symbol>(); 297 297 if (requiredParameters != null) 298 298 { … … 306 306 vars.add(optionalParameters[i].var); 307 307 if (optionalParameters[i].svar != NIL) 308 vars.add( optionalParameters[i].svar);308 vars.add((Symbol)optionalParameters[i].svar); 309 309 if (!bindInitForms) 310 310 if (!optionalParameters[i].initForm.constantp()) … … 322 322 vars.add(keywordParameters[i].var); 323 323 if (keywordParameters[i].svar != NIL) 324 vars.add( keywordParameters[i].svar);324 vars.add((Symbol)keywordParameters[i].svar); 325 325 if (!bindInitForms) 326 326 if (!keywordParameters[i].initForm.constantp()) … … 335 335 private final Symbol[] processDeclarations() throws ConditionThrowable 336 336 { 337 ArrayList arrayList = null;337 ArrayList<Symbol> arrayList = null; 338 338 LispObject forms = body; 339 339 while (forms != NIL) … … 353 353 Symbol var = checkSymbol(vars.car()); 354 354 if (arrayList == null) 355 arrayList = new ArrayList ();355 arrayList = new ArrayList<Symbol>(); 356 356 arrayList.add(var); 357 357 vars = vars.cdr(); -
trunk/j/src/org/armedbear/lisp/JavaClassLoader.java
r10111 r11278 3 3 * 4 4 * Copyright (C) 2003-2005 Peter Graves 5 * $Id: JavaClassLoader.java,v 1.1 3 2005-10-15 16:13:20 pisoExp $5 * $Id: JavaClassLoader.java,v 1.14 2008-08-12 21:59:07 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 40 40 private static JavaClassLoader persistentInstance; 41 41 42 private static Set packages = Collections.synchronizedSet(new HashSet ());42 private static Set packages = Collections.synchronizedSet(new HashSet<String>()); 43 43 44 44 public JavaClassLoader() -
trunk/j/src/org/armedbear/lisp/Lisp.java
r11247 r11278 3 3 * 4 4 * Copyright (C) 2002-2007 Peter Graves <peter@armedbear.org> 5 * $Id: Lisp.java,v 1.4 49 2007-10-03 12:11:52 pisoExp $5 * $Id: Lisp.java,v 1.450 2008-08-12 21:59:07 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 1130 1130 Debug.trace("bytesRemaining = " + bytesRemaining); 1131 1131 1132 JavaClassLoader loader = new JavaClassLoader();1132 //JavaClassLoader loader = new JavaClassLoader(); 1133 1133 Class c = 1134 loader.loadClassFromByteArray(null, bytes, 0, bytes.length);1134 (new JavaClassLoader()).loadClassFromByteArray(null, bytes, 0, bytes.length); 1135 1135 if (c != null) 1136 1136 { … … 1912 1912 1913 1913 // The compiler's object table. 1914 private static final Hashtable objectTable = new Hashtable(); 1914 private static final Hashtable<String,LispObject> objectTable = 1915 new Hashtable<String,LispObject>(); 1915 1916 1916 1917 public static final LispObject recall(SimpleString key) -
trunk/j/src/org/armedbear/lisp/LispThread.java
r11158 r11278 3 3 * 4 4 * Copyright (C) 2003-2007 Peter Graves 5 * $Id: LispThread.java,v 1.9 2 2007-02-23 21:17:33 pisoExp $5 * $Id: LispThread.java,v 1.93 2008-08-12 21:59:11 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 22 22 package org.armedbear.lisp; 23 23 24 import java.util. HashMap;24 import java.util.WeakHashMap; 25 25 import java.util.Iterator; 26 26 … … 31 31 private static final Object lock = new Object(); 32 32 33 private static HashMap map = new HashMap(); 33 private static WeakHashMap<Thread,LispThread> map = 34 new WeakHashMap<Thread,LispThread>(); 34 35 35 36 private static Thread currentJavaThread; … … 58 59 { 59 60 synchronized (lock) { 60 HashMap m = (HashMap) map.clone();61 WeakHashMap<Thread,LispThread> m = new WeakHashMap<Thread,LispThread>(map); 61 62 m.put(javaThread, lispThread); 62 63 map = m; … … 67 68 { 68 69 synchronized (lock) { 69 HashMap m = (HashMap) map.clone();70 WeakHashMap<Thread,LispThread> m = new WeakHashMap<Thread,LispThread>(map); 70 71 m.remove(javaThread); 71 72 map = m; -
trunk/j/src/org/armedbear/lisp/Package.java
r11219 r11278 3 3 * 4 4 * Copyright (C) 2002-2007 Peter Graves <peter@armedbear.org> 5 * $Id: Package.java,v 1.7 5 2007-05-11 00:26:15 pisoExp $5 * $Id: Package.java,v 1.76 2008-08-12 21:59:11 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 37 37 private final SymbolHashTable externalSymbols = new SymbolHashTable(16); 38 38 39 private HashMap shadowingSymbols;40 private ArrayList nicknames;39 private HashMap<String,Symbol> shadowingSymbols; 40 private ArrayList<String> nicknames; 41 41 private LispObject useList = null; 42 private ArrayList usedByList = null;42 private ArrayList<Package> usedByList = null; 43 43 44 44 // Anonymous package. … … 147 147 throws ConditionThrowable 148 148 { 149 ArrayList arrayList = null;149 ArrayList<String> arrayList = null; 150 150 while (newNicks != NIL) { 151 151 if (arrayList == null) 152 arrayList = new ArrayList ();152 arrayList = new ArrayList<String>(); 153 153 arrayList.add(javaString(newNicks.car())); 154 154 newNicks = newNicks.cdr(); … … 556 556 { 557 557 if (shadowingSymbols == null) 558 shadowingSymbols = new HashMap ();558 shadowingSymbols = new HashMap<String,Symbol>(); 559 559 final SimpleString s = new SimpleString(symbolName); 560 560 Symbol symbol = externalSymbols.get(s); … … 613 613 internalSymbols.put(symbol.name, symbol); 614 614 if (shadowingSymbols == null) 615 shadowingSymbols = new HashMap ();615 shadowingSymbols = new HashMap<String,Symbol>(); 616 616 Debug.assertTrue(shadowingSymbols.get(symbolName) == null); 617 617 shadowingSymbols.put(symbolName, symbol); … … 648 648 Debug.assertTrue(!pkg.usedByList.contains(this)); 649 649 if (pkg.usedByList == null) 650 pkg.usedByList = new ArrayList ();650 pkg.usedByList = new ArrayList<Package>(); 651 651 pkg.usedByList.add(this); 652 652 } … … 682 682 return; // Nothing to do. 683 683 } else 684 nicknames = new ArrayList ();684 nicknames = new ArrayList<String>(); 685 685 686 686 nicknames.add(s); … … 747 747 } 748 748 749 public synchronized List getAccessibleSymbols()750 { 751 ArrayList list = new ArrayList();749 public synchronized List<Symbol> getAccessibleSymbols() 750 { 751 ArrayList<Symbol> list = new ArrayList<Symbol>(); 752 752 list.addAll(internalSymbols.getSymbols()); 753 753 list.addAll(externalSymbols.getSymbols()); … … 757 757 while (usedPackages != NIL) { 758 758 Package pkg = (Package) usedPackages.car(); 759 List symbols = pkg.externalSymbols.getSymbols();759 List<Symbol> symbols = pkg.externalSymbols.getSymbols(); 760 760 for (int i = 0; i < symbols.size(); i++) { 761 761 Symbol symbol = (Symbol) symbols.get(i); -
trunk/j/src/org/armedbear/lisp/SymbolHashTable.java
r10405 r11278 3 3 * 4 4 * Copyright (C) 2004-2005 Peter Graves 5 * $Id: SymbolHashTable.java,v 1. 3 2005-11-07 02:29:50 pisoExp $5 * $Id: SymbolHashTable.java,v 1.4 2008-08-12 21:59:13 ehuelsmann Exp $ 6 6 * 7 7 * This program is free software; you can redistribute it and/or … … 197 197 } 198 198 199 public List getSymbols()200 { 201 ArrayList list = new ArrayList();199 public List<Symbol> getSymbols() 200 { 201 ArrayList<Symbol> list = new ArrayList<Symbol>(); 202 202 for (int i = 0; i < buckets.length; i++) { 203 203 HashEntry e = buckets[i];
Note: See TracChangeset
for help on using the changeset viewer.