From 9549aa1dcaf66ff6d21d2946cea10d14d8d9be75 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 28 Aug 2008 00:02:19 +0000 Subject: got rid of this --- .../apache/bcel/generic/InstructionComparator.java | 112 --------------------- 1 file changed, 112 deletions(-) delete mode 100644 bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionComparator.java (limited to 'bcel-builder') diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionComparator.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionComparator.java deleted file mode 100644 index 1c8b5ec3e..000000000 --- a/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionComparator.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.aspectj.apache.bcel.generic; - -import org.aspectj.apache.bcel.Constants; - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache BCEL" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * "Apache BCEL", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - */ - -/** - * Equality of instructions isn't clearly to be defined. You might - * wish, for example, to compare whether instructions have the same - * meaning. E.g., whether two INVOKEVIRTUALs describe the same - * call.
The DEFAULT comparator however, considers two instructions - * to be equal if they have same opcode and point to the same indexes - * (if any) in the constant pool or the same local variable index. Branch - * instructions must have the same target. - * - * @see Instruction - * @version $Id: InstructionComparator.java,v 1.4 2008/05/28 23:52:56 aclement Exp $ - * @author M. Dahm - */ -public interface InstructionComparator { - public static final InstructionComparator DEFAULT = new InstructionComparator() { - public boolean equals(Instruction i1, Instruction i2) { - if (i1.opcode == i2.opcode) { - if (i1 instanceof InstructionSelect) { - InstructionHandle[] t1 = ((InstructionSelect) i1).getTargets(); - InstructionHandle[] t2 = ((InstructionSelect) i2).getTargets(); - - // See AspectJ bug 104957 - if (t1 == null && t2 == null) return true; - if (t1 == null || t2 == null) return false; - - if (t1.length == t2.length) { - for (int i = 0; i < t1.length; i++) { - if (t1[i] != t2[i]) { - return false; - } - } - - return true; - } - } else if (i1 instanceof InstructionBranch) { - return ((InstructionBranch) i1).targetInstruction == ((InstructionBranch) i2).targetInstruction; - } else if (i1.isConstantInstruction()) { - return i1.getValue().equals(i2.getValue()); - } else if (i1.isIndexedInstruction()) { - return i1.getIndex() == i2.getIndex(); - } else if (i1.opcode==Constants.NEWARRAY) { - return ((InstructionByte) i1).getTypecode() == ((InstructionByte) i2) - .getTypecode(); - } else { - return true; - } - } - - return false; - } - }; - - public boolean equals(Instruction i1, Instruction i2); -} -- cgit v1.2.3