Version 0.8.10.1

dart/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/ObjectSemanticProcessor.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 24 matching lines @@
 import com.google.dart.engine.ast.StringInterpolation;
 import com.google.dart.engine.ast.SuperConstructorInvocation;
 import com.google.dart.engine.ast.TypeName;
 import com.google.dart.engine.ast.VariableDeclaration;
 import com.google.dart.engine.ast.visitor.GeneralizingASTVisitor;
 import com.google.dart.engine.scanner.Keyword;
 import com.google.dart.engine.scanner.TokenType;
 import com.google.dart.java2dart.Context;
 import com.google.dart.java2dart.util.JavaUtils;
 
+import static com.google.dart.java2dart.util.ASTFactory.argumentList;
 import static com.google.dart.java2dart.util.ASTFactory.assignmentExpression;
 import static com.google.dart.java2dart.util.ASTFactory.binaryExpression;
 import static com.google.dart.java2dart.util.ASTFactory.booleanLiteral;
 import static com.google.dart.java2dart.util.ASTFactory.identifier;
 import static com.google.dart.java2dart.util.ASTFactory.instanceCreationExpression;
 import static com.google.dart.java2dart.util.ASTFactory.integer;
 import static com.google.dart.java2dart.util.ASTFactory.interpolationExpression;
 import static com.google.dart.java2dart.util.ASTFactory.interpolationString;
 import static com.google.dart.java2dart.util.ASTFactory.methodInvocation;
 import static com.google.dart.java2dart.util.ASTFactory.namedExpression;
@@ skipping 94 matching lines @@
             Expression rightExpr = node.getRightHandSide();
             replaceNode(
                 node,
                 assignmentExpression(
                     leftExpr,
                     TokenType.EQ,
                     methodInvocation("javaBooleanOr", leftExpr, rightExpr)));
             return null;
           }
         }
+        // Dart has no "bool &=" operator
+        if (node.getOperator().getType() == TokenType.AMPERSAND_EQ) {
+          Expression leftExpr = node.getLeftHandSide();
+          ITypeBinding argTypeBinding = context.getNodeTypeBinding(leftExpr);
+          if (JavaUtils.isTypeNamed(argTypeBinding, "boolean")) {
+            Expression rightExpr = node.getRightHandSide();
+            replaceNode(
+                node,
+                assignmentExpression(
+                    leftExpr,
+                    TokenType.EQ,
+                    methodInvocation("javaBooleanAnd", leftExpr, rightExpr)));
+            return null;
+          }
+        }
         // String += 'c'
         if (node.getOperator().getType() == TokenType.PLUS_EQ) {
           Expression leftExpr = node.getLeftHandSide();
           ITypeBinding argTypeBinding = context.getNodeTypeBinding(leftExpr);
           if (JavaUtils.isTypeNamed(argTypeBinding, "java.lang.String")) {
             Expression rightExpr = node.getRightHandSide();
             replaceCharWithString(rightExpr);
             return null;
           }
         }
@@ skipping 26 matching lines @@
               } else {
                 elements.add(interpolationExpression(expression));
               }
             }
             elements.add(interpolationString("\"", ""));
             StringInterpolation interpolation = string(elements);
             replaceNode(node, interpolation);
             return null;
           }
         }
+        // in Java "true | false" will compute both operands
+        if (node.getOperator().getType() == TokenType.BAR) {
+          ITypeBinding argTypeBinding = context.getNodeTypeBinding(node.getLeftOperand());
+          super.visitBinaryExpression(node);
+          if (JavaUtils.isTypeNamed(argTypeBinding, "boolean")) {
+            replaceNode(
+                node,
+                methodInvocation("javaBooleanOr", node.getLeftOperand(), node.getRightOperand()));
+            return null;
+          }
+        }
+        // in Java "true & false" will compute both operands
+        if (node.getOperator().getType() == TokenType.AMPERSAND) {
+          ITypeBinding argTypeBinding = context.getNodeTypeBinding(node.getLeftOperand());
+          super.visitBinaryExpression(node);
+          if (JavaUtils.isTypeNamed(argTypeBinding, "boolean")) {
+            replaceNode(
+                node,
+                methodInvocation("javaBooleanAnd", node.getLeftOperand(), node.getRightOperand()));
+            return null;
+          }
+        }
         // super
         super.visitBinaryExpression(node);
-        // in Java "true | false" will compute both operands
-        if (node.getOperator().getType() == TokenType.BAR) {
-          Expression leftOperand = node.getLeftOperand();
-          ITypeBinding argTypeBinding = context.getNodeTypeBinding(leftOperand);
-          if (JavaUtils.isTypeNamed(argTypeBinding, "boolean")) {
-            replaceNode(
-                node,
-                methodInvocation("javaBooleanOr", leftOperand, node.getRightOperand()));
-            return null;
-          }
-        }
         // done
         return null;
       }
 
       @Override
       public Void visitInstanceCreationExpression(InstanceCreationExpression node) {
         super.visitInstanceCreationExpression(node);
         ITypeBinding typeBinding = context.getNodeTypeBinding(node);
         IMethodBinding binding = (IMethodBinding) context.getNodeBinding(node);
         List<Expression> args = node.getArgumentList().getArguments();
@@ skipping 348 matching lines @@
               return null;
             }
           }
         }
         return super.visitPropertyAccess(node);
       }
 
       @Override
       public Void visitSuperConstructorInvocation(SuperConstructorInvocation node) {
         super.visitSuperConstructorInvocation(node);
+        NodeList<Expression> args = node.getArgumentList().getArguments();
         IMethodBinding binding = (IMethodBinding) context.getNodeBinding(node);
-        if (isMethodInClass2(binding, "<init>(java.lang.Throwable)", "java.lang.Exception")) {
+        if (isMethodInExactClass(binding, "<init>(java.lang.Throwable)", "java.lang.Exception")) {
           node.setConstructorName(identifier("withCause"));
         }
+        if (isMethodInExactClass(
+            binding,
+            "<init>(java.lang.Throwable)",
+            "java.lang.RuntimeException")) {
+          node.setArgumentList(argumentList(namedExpression("cause", args.get(0))));
+        }
+        if (isMethodInExactClass(binding, "<init>(java.lang.String)", "java.lang.RuntimeException")) {
+          node.setArgumentList(argumentList(namedExpression("message", args.get(0))));
+        }
+        if (isMethodInExactClass(
+            binding,
+            "<init>(java.lang.String,java.lang.Throwable)",
+            "java.lang.RuntimeException")) {
+          node.setArgumentList(argumentList(
+              namedExpression("message", args.get(0)),
+              namedExpression("cause", args.get(0))));
+        }
         return null;
       }
 
       @Override
       public Void visitTypeName(TypeName node) {
         ITypeBinding typeBinding = (ITypeBinding) context.getNodeBinding(node);
         // replace by name
         if (node.getName() instanceof SimpleIdentifier) {
           SimpleIdentifier nameNode = (SimpleIdentifier) node.getName();
           String name = nameNode.getName();
@@ skipping 83 matching lines @@
       ITypeBinding leftBinding = parameterType;
       ITypeBinding rightBinding = context.getNodeTypeBinding(arg);
       if (JavaUtils.isTypeNamed(leftBinding, "java.lang.CharSequence")
           && JavaUtils.isTypeNamed(rightBinding, "java.lang.String")) {
         arg = instanceCreationExpression(Keyword.NEW, typeName("CharSequence"), arg);
         args.set(i, arg);
       }
     }
   }
 }