Mercurial > hg > truffle
changeset 22088:22ce537a52fd
remove ShapeVisitor from the API
| author | Andreas Woess <andreas.woess@oracle.com> |
|---|---|
| date | Mon, 17 Aug 2015 15:37:26 +0200 |
| parents | 5d9e5f866821 |
| children | 476b483c8be2 |
| files | truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ShapeVisitor.java truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeVisitor.java truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/GraphvizShapeVisitor.java |
| diffstat | 5 files changed, 34 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java Mon Aug 17 14:58:34 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java Mon Aug 17 15:37:26 2015 +0200 @@ -249,10 +249,6 @@ public abstract Shape tryMerge(Shape other); - public <R> R accept(ShapeVisitor<R> visitor) { - return visitor.visitShape(this); - } - public abstract static class Allocator { protected abstract Location locationForValue(Object value, boolean useFinal, boolean nonNull);
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/ShapeVisitor.java Mon Aug 17 14:58:34 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2014, 2014, 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 - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.truffle.api.object; - -public interface ShapeVisitor<R> { - R visitShape(Shape shape); -}
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Mon Aug 17 14:58:34 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Mon Aug 17 15:37:26 2015 +0200 @@ -910,6 +910,10 @@ return null; } + public <R> R accept(ShapeVisitor<R> visitor) { + return visitor.visitShape(this); + } + public abstract static class BaseAllocator extends Allocator implements LocationVisitor, Cloneable { protected final LayoutImpl layout; protected int objectArraySize;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeVisitor.java Mon Aug 17 15:37:26 2015 +0200 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014, 2014, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.object; + +import com.oracle.truffle.api.object.*; + +public interface ShapeVisitor<R> { + R visitShape(Shape shape); +}
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/GraphvizShapeVisitor.java Mon Aug 17 14:58:34 2015 +0200 +++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/debug/GraphvizShapeVisitor.java Mon Aug 17 15:37:26 2015 +0200 @@ -59,7 +59,7 @@ for (Entry<? extends Transition, ? extends Shape> entry : transitions.entrySet()) { Shape dst = entry.getValue(); - dst.accept(this); + ((ShapeImpl) dst).accept(this); assert drawn.contains(dst); sb.append(prefix).append(getId(shape)).append("->").append(prefix).append(getId(dst));