jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/code/Scope.java

equal deleted inserted replaced

-:d5fe2c1cecfc
+:e1aa25ccdabb
 /*
-* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 /** Construct a new scope, within scope next, with given owner, using
 *  given table. The table's length must be an exponent of 2.
 */
 private Scope(Scope next, Symbol owner, Entry[] table, ScopeCounter scopeCounter) {
 this.next = next;
-assert emptyScope == null || owner != null;
+Assert.check(emptyScope == null || owner != null);
 this.owner = owner;
 this.table = table;
 this.hashMask = table.length - 1;
 this.scopeCounter = scopeCounter;
 }
 /** Remove all entries of this scope from its table, if shared
 *  with next.
 */
 public Scope leave() {
-assert shared == 0;
+Assert.check(shared == 0);
 if (table != next.table) return next;
 while (elems != null) {
 int hash = getIndex(elems.sym.name);
 Entry e = table[hash];
-assert e == elems : elems.sym;
+Assert.check(e == elems, elems.sym);
 table[hash] = elems.shadowed;
 elems = elems.sibling;
 }
-assert next.shared > 0;
+Assert.check(next.shared > 0);
 next.shared--;
 next.nelems = nelems;
 // System.out.println("====> leaving scope " + this.hashCode() + " owned by " + this.owner + " to " + next.hashCode());
 // new Error().printStackTrace(System.out);
 return next;
 }
 /** Double size of hash table.
 */
 private void dble() {
-assert shared == 0;
+Assert.check(shared == 0);
 Entry[] oldtable = table;
 Entry[] newtable = new Entry[oldtable.length * 2];
 for (Scope s = this; s != null; s = s.next) {
 if (s.table == oldtable) {
-assert s == this || s.shared != 0;
+Assert.check(s == this || s.shared != 0);
 s.table = newtable;
 s.hashMask = newtable.length - 1;
 }
 }
 int n = 0;
 }
 /** Enter symbol sym in this scope.
 */
 public void enter(Symbol sym) {
-assert shared == 0;
+Assert.check(shared == 0);
 enter(sym, this);
 }
 public void enter(Symbol sym, Scope s) {
 enter(sym, s, s);
 * Enter symbol sym in this scope, but mark that it comes from
 * given scope `s' accessed through `origin'.  The last two
 * arguments are only used in import scopes.
 */
 public void enter(Symbol sym, Scope s, Scope origin) {
-assert shared == 0;
+Assert.check(shared == 0);
 if (nelems * 3 >= hashMask * 2)
 dble();
 int hash = getIndex(sym.name);
 Entry old = table[hash];
 if (old == null) {
 /** Remove symbol from this scope.  Used when an inner class
 *  attribute tells us that the class isn't a package member.
 */
 public void remove(Symbol sym) {
-assert shared == 0;
+Assert.check(shared == 0);
 Entry e = lookup(sym.name);
 if (e.scope == null) return;
 scopeCounter.inc();
 }
 /** Enter symbol sym in this scope if not already there.
 */
 public void enterIfAbsent(Symbol sym) {
-assert shared == 0;
+Assert.check(shared == 0);
 Entry e = lookup(sym.name);
 while (e.scope == this && e.sym.kind != sym.kind) e = e.next();
 if (e.scope != this) enter(sym);
 }

changeset 8032	e1aa25ccdabb
parent 7628	e7baeb97d164
child 8242	3873b4aaf4a8