Mercurial > hg > truffle

changeset 18766:a720bf2e2f43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: checkstyle fixes.
author Christian Humer <christian.humer@gmail.com>
date Tue, 30 Dec 2014 00:37:39 +0100
parents 924bf48a5d6a
children 7ff41ad072ef
files graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLOptions.java graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializationNode.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeBaseFactory.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/PolymorphicNodeFactory.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/SpecializedNodeFactory.java
diffstat 8 files changed, 19 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLOptions.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLOptions.java	Tue Dec 30 00:37:39 2014 +0100
@@ -57,7 +57,7 @@
         /** Perform no informed optimization for implicit casts. */
         NONE,
 
-        /** Duplicate specializations for each used implicit cast combination */
+        /** Duplicate specializations for each used implicit cast combination. */
         DUPLICATE_TAIL,
 
         /**
--- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java	Tue Dec 30 00:37:39 2014 +0100
@@ -126,7 +126,6 @@
 
                 oldNode.replace(polymorphic, message);
 
-                assert polymorphic.getNext0() == currentCopy;
                 assert newNode != null ? currentCopy.getNext0() == newNode : currentCopy.getNext0() == uninitialized;
                 assert uninitializedDSL.getNext0() == null;
                 return polymorphic;
--- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializationNode.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/SpecializationNode.java	Tue Dec 30 00:37:39 2014 +0100
@@ -129,7 +129,7 @@
         return getClass() == other.getClass();
     }
 
-    private final int count() {
+    private int count() {
         return next != null ? next.count() + 1 : 1;
     }
 
@@ -142,7 +142,7 @@
     }
 
     /** Find the topmost of the specialization chain. */
-    private final SpecializationNode findStart() {
+    private SpecializationNode findStart() {
         SpecializationNode node = this;
         Node parent = this.getParent();
         while (parent instanceof SpecializationNode) {
@@ -156,7 +156,7 @@
         return node;
     }
 
-    private final Node findParentNode() {
+    private Node findParentNode() {
         return findStart().getParent();
     }
 
@@ -363,7 +363,7 @@
         });
     }
 
-    private final SpecializationNode insert(final SpecializationNode generated, CharSequence message) {
+    private SpecializationNode insert(final SpecializationNode generated, CharSequence message) {
         SpecializationNode start = findStart();
         if (start == this) {
             // fast path for first insert
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeBaseFactory.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeBaseFactory.java	Tue Dec 30 00:37:39 2014 +0100
@@ -324,7 +324,7 @@
         return builder.build();
     }
 
-    private final void addInternalValueParameters(CodeExecutableElement executableMethod, TemplateMethod method, boolean forceFrame, boolean disableFrame, boolean evaluated) {
+    private void addInternalValueParameters(CodeExecutableElement executableMethod, TemplateMethod method, boolean forceFrame, boolean disableFrame, boolean evaluated) {
         if (forceFrame && !disableFrame && method.getSpecification().findParameterSpec("frame") != null) {
             executableMethod.addParameter(new CodeVariableElement(context.getTruffleTypes().getFrame(), "frameValue"));
         }
@@ -1222,7 +1222,7 @@
         return parameter;
     }
 
-    private final List<TypeData> lookupPolymorphicTargetTypes(Parameter param) {
+    private List<TypeData> lookupPolymorphicTargetTypes(Parameter param) {
         Set<TypeData> possiblePolymorphicTypes = new HashSet<>();
         for (SpecializationData otherSpecialization : specialization.getNode().getSpecializations()) {
             if (!otherSpecialization.isSpecialized()) {
@@ -1838,12 +1838,12 @@
     /**
      * <pre>
      * variant1 $condition != null
-     * 
+     *
      * $type $name = defaultValue($type);
      * if ($condition) {
      *     $name = $value;
      * }
-     * 
+     *
      * variant2 $condition != null
      * $type $name = $value;
      * </pre>
@@ -1972,4 +1972,4 @@
 
     }
 
-}
\ No newline at end of file
+}
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java	Tue Dec 30 00:37:39 2014 +0100
@@ -265,4 +265,4 @@
         body.end();
         return method;
     }
-}
\ No newline at end of file
+}
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Tue Dec 30 00:37:39 2014 +0100
@@ -1216,11 +1216,11 @@
         } else if (specialization.isUninitialized()) {
             builder.startReturn().tree(createCallDelegate("uninitialized", null, type, currentLocals)).end();
         } else {
-            final TypeData type_ = type;
+            final TypeData finalType = type;
             SpecializationGroup group = SpecializationGroup.create(specialization);
             SpecializationExecution executionFactory = new SpecializationExecution() {
                 public CodeTree createExecute(SpecializationData s, LocalContext values) {
-                    return createFastPathExecute(type_, s, values);
+                    return createFastPathExecute(finalType, s, values);
                 }
 
                 public boolean isFastPath() {
@@ -2132,7 +2132,7 @@
 
     }
 
-    public final static class LocalVariable {
+    public static final class LocalVariable {
 
         private final TypeData type;
         private final TypeMirror typeMirror;
@@ -2205,15 +2205,15 @@
             return new LocalVariable(newType, newType.getPrimitiveType(), name, accessorTree);
         }
 
-        public final LocalVariable accessWith(CodeTree tree) {
+        public LocalVariable accessWith(CodeTree tree) {
             return new LocalVariable(type, typeMirror, name, tree);
         }
 
-        public final LocalVariable nextName() {
+        public LocalVariable nextName() {
             return new LocalVariable(type, typeMirror, createNextName(name), accessorTree);
         }
 
-        public final LocalVariable makeGeneric() {
+        public LocalVariable makeGeneric() {
             return newType(type.getTypeSystem().getGenericTypeData());
         }
 
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/PolymorphicNodeFactory.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/PolymorphicNodeFactory.java	Tue Dec 30 00:37:39 2014 +0100
@@ -82,4 +82,4 @@
         return clazz;
     }
 
-}
\ No newline at end of file
+}
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/SpecializedNodeFactory.java	Mon Dec 29 23:39:12 2014 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/SpecializedNodeFactory.java	Tue Dec 30 00:37:39 2014 +0100
@@ -554,4 +554,4 @@
         builder.end().end();
         return method;
     }
-}
\ No newline at end of file
+}