Mercurial > hg > truffle

changeset 7796:6ad077b60cb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cleanup.
author Christian Humer <christian.humer@gmail.com>
date Fri, 15 Feb 2013 20:04:03 +0100
parents ee84a187f84a
children b792a2f3c4da 5ecf528d4131
files graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/GenericParser.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/MethodParser.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationMethodParser.java
diffstat 3 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/GenericParser.java	Fri Feb 15 19:36:03 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/GenericParser.java	Fri Feb 15 20:04:03 2013 +0100
@@ -45,7 +45,7 @@
     }
 
     @Override
-    protected ParameterSpec createValueParameterSpec(String valueName, NodeData nodeData) {
+    protected ParameterSpec createValueParameterSpec(String valueName, NodeData nodeData, boolean optional) {
         List<ExecutableTypeData> execTypes = nodeData.findGenericExecutableTypes(getContext());
         List<TypeMirror> types = new ArrayList<>();
         for (ExecutableTypeData type : execTypes) {
@@ -57,7 +57,7 @@
 
     @Override
     protected ParameterSpec createReturnParameterSpec() {
-        return super.createValueParameterSpec("returnValue", getNode());
+        return super.createValueParameterSpec("returnValue", getNode(), false);
     }
 
     @Override
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/MethodParser.java	Fri Feb 15 19:36:03 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/MethodParser.java	Fri Feb 15 20:04:03 2013 +0100
@@ -41,12 +41,12 @@
         return template;
     }
 
-    protected ParameterSpec createValueParameterSpec(String valueName, NodeData nodeData) {
-        return new ParameterSpec(valueName, nodeData, false, Cardinality.ONE);
+    protected ParameterSpec createValueParameterSpec(String valueName, NodeData nodeData, boolean optional) {
+        return new ParameterSpec(valueName, nodeData, optional, Cardinality.ONE);
     }
 
     protected ParameterSpec createReturnParameterSpec() {
-        return createValueParameterSpec("operation", getNode());
+        return createValueParameterSpec("operation", getNode(), false);
     }
 
     @Override
@@ -65,7 +65,7 @@
             }
 
             if (field.getExecutionKind() == ExecutionKind.DEFAULT) {
-                defaultParameters.add(createValueParameterSpec(field.getName(), field.getNodeData()));
+                defaultParameters.add(createValueParameterSpec(field.getName(), field.getNodeData(), false));
             } else if (field.getExecutionKind() == ExecutionKind.SHORT_CIRCUIT) {
                 String valueName = field.getName();
                 if (shortCircuitName != null && valueName.equals(shortCircuitName)) {
@@ -73,8 +73,7 @@
                 }
 
                 defaultParameters.add(new ParameterSpec(shortCircuitValueName(valueName), getContext().getType(boolean.class), false));
-
-                defaultParameters.add(createValueParameterSpec(valueName, field.getNodeData()));
+                defaultParameters.add(createValueParameterSpec(valueName, field.getNodeData(), false));
             } else {
                 assert false;
             }
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationMethodParser.java	Fri Feb 15 19:36:03 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationMethodParser.java	Fri Feb 15 20:04:03 2013 +0100
@@ -47,10 +47,6 @@
         return specification;
     }
 
-    public MethodSpec getSpecification() {
-        return specification;
-    }
-
     @Override
     public SpecializationData create(TemplateMethod method) {
         return parseSpecialization(method);