ti/optimization: reuse RSimpleType for some predefined types

Author: panchenko

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ConstantValue.java

@@ -57,7 +57,7 @@ public String toString() {
 		return getClass().getSimpleName() + value.getTypes();
 	}
 
-	public static IValueReference valueOf(IRType type) {
+	public static IValueReference of(IRType type) {
 		return type != null ? new ConstantValue(type) : null;
 	}
 

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/IValueTypeFactory.java

@@ -19,24 +19,13 @@ public interface IValueTypeFactory {
 
 	IValueReference create(IValueParent parent, IRType type);
 
-	IValueReference createObject(IValueParent parent);
-
-	@Deprecated
-	IValueReference createString(IValueParent parent);
-
 	@Deprecated
 	IValueReference createRegExp(IValueParent parent);
 
-	@Deprecated
-	IValueReference createNumber(IValueParent parent);
-
 	IValueReference createXML(IValueParent parent);
 
 	IValueReference createXMLList(IValueParent parent);
 
-	@Deprecated
-	IValueReference createBoolean(IValueParent parent);
-
 	@Deprecated
 	IValueReference createArray(IValueParent parent);
 

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java

@@ -269,16 +269,16 @@ public IValueReference visitBinaryOperation(BinaryOperation node) {
 				|| op == JSParser.LTE || op == JSParser.NSAME
 				|| op == JSParser.SAME || op == JSParser.NEQ
 				|| op == JSParser.EQ) {
-			return context.getFactory().createBoolean(peekContext());
+			return ConstantValue.of(RTypes.BOOLEAN);
 		} else if (isNumber(left) && isNumber(right)) {
-			return context.getFactory().createNumber(peekContext());
+			return ConstantValue.of(RTypes.NUMBER);
 		} else if (op == JSParser.ADD) {
 			if (isString(left) || isString(right)) {
-				return context.getFactory().createString(peekContext());
+				return ConstantValue.of(RTypes.STRING);
 			}
 			return left;
 		} else if (JSParser.INSTANCEOF == op) {
-			return context.getFactory().createBoolean(peekContext());
+			return ConstantValue.of(RTypes.BOOLEAN);
 		} else if (JSParser.LOR == op) {
 			final JSTypeSet typeSet = JSTypeSet.create();
 			if (left != null) {
@@ -372,7 +372,7 @@ private boolean hasUnknowParentFunctionCall(IValueReference reference) {
 
 	@Override
 	public IValueReference visitBooleanLiteral(BooleanLiteral node) {
-		return context.getFactory().createBoolean(peekContext());
+		return ConstantValue.of(RTypes.BOOLEAN);
 	}
 
 	@Override
@@ -400,15 +400,15 @@ public IValueReference visitCallExpression(CallExpression node) {
 						return new ConstantValue(type);
 					}
 				} else {
-					return ConstantValue.valueOf(method.getType());
+					return ConstantValue.of(method.getType());
 				}
 			} else {
 				final IRType expressionType = JavaScriptValidations
 						.typeOf(reference);
 				if (expressionType != null) {
 					if (expressionType instanceof IRFunctionType) {
 						return ConstantValue
-								.valueOf(((IRFunctionType) expressionType)
+								.of(((IRFunctionType) expressionType)
 										.getReturnType());
 					} else if (expressionType instanceof IRClassType) {
 						final IRTypeDeclaration target = ((IRClassType) expressionType)
@@ -713,7 +713,7 @@ public IValueReference visitContinueStatement(ContinueStatement node) {
 
 	@Override
 	public IValueReference visitDecimalLiteral(DecimalLiteral node) {
-		return context.getFactory().createNumber(peekContext());
+		return ConstantValue.of(RTypes.NUMBER);
 	}
 
 	@Override
@@ -786,7 +786,7 @@ public IValueReference visitForEachInStatement(ForEachInStatement node) {
 	public IValueReference visitForInStatement(ForInStatement node) {
 		final IValueReference item = visit(node.getItem());
 		if (item != null) {
-			assign(item, context.getFactory().createString(peekContext()));
+			assign(item, ConstantValue.of(RTypes.STRING));
 		}
 		visit(node.getIterator());
 		visit(node.getBody());
@@ -1166,8 +1166,7 @@ protected VisitNewResult visitNew(NewExpression node) {
 				}
 			} else {
 				result.value = new AnonymousNewValue();
-				result.value.setValue(context.getFactory().createObject(
-						contextValueCollection));
+				result.value.setValue(ConstantValue.of(RTypes.OBJECT));
 			}
 		}
 		return result;
@@ -1314,7 +1313,7 @@ public IValueReference visitStatementBlock(StatementBlock node) {
 
 	@Override
 	public IValueReference visitStringLiteral(StringLiteral node) {
-		return context.getFactory().createString(peekContext());
+		return ConstantValue.of(RTypes.STRING);
 	}
 
 	@Override
@@ -1368,16 +1367,16 @@ public IValueReference visitTryStatement(TryStatement node) {
 	public IValueReference visitUnaryOperation(UnaryOperation node) {
 		if (node.getOperation() == JSParser.NOT) {
 			visit(node.getExpression());
-			return context.getFactory().createBoolean(peekContext());
+			return ConstantValue.of(RTypes.BOOLEAN);
 		} else if (node.getOperation() == JSParser.DELETE) {
 			final IValueReference value = visit(node.getExpression());
 			if (value != null) {
 				value.delete();
 			}
-			return context.getFactory().createBoolean(peekContext());
+			return ConstantValue.of(RTypes.BOOLEAN);
 		} else if (node.getOperation() == JSParser.TYPEOF) {
 			visit(node.getExpression());
-			return context.getFactory().createString(peekContext());
+			return ConstantValue.of(RTypes.STRING);
 		} else if (node.getOperation() == JSParser.VOID) {
 			visit(node.getExpression());
 			return null;

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/ValueTypeFactoryImpl.java

@@ -34,30 +34,14 @@ public IValueReference create(IValueParent parent, final IRType type) {
 		return new ConstantValue(type);
 	}
 
-	public IValueReference createObject(IValueParent parent) {
-		return create(parent, OBJECT);
-	}
-
 	public IValueReference createArray(IValueParent parent) {
 		return create(parent, ARRAY);
 	}
 
-	public IValueReference createBoolean(IValueParent parent) {
-		return create(parent, BOOLEAN);
-	}
-
-	public IValueReference createNumber(IValueParent parent) {
-		return create(parent, NUMBER);
-	}
-
 	public IValueReference createRegExp(IValueParent parent) {
 		return create(parent, REGEXP);
 	}
 
-	public IValueReference createString(IValueParent parent) {
-		return create(parent, STRING);
-	}
-
 	public IValueReference createXML(IValueParent parent) {
 		return create(parent, XML);
 	}

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/validation/TypeInfoValidator.java

@@ -869,7 +869,7 @@ public IValueReference visitCallExpression(CallExpression node) {
 					pushExpressionValidator(new CallExpressionValidator(
 							peekFunctionScope(), node, reference, arguments,
 							methods));
-					return ConstantValue.valueOf(method.getType());
+					return ConstantValue.of(method.getType());
 				}
 			} else {
 				pushExpressionValidator(new CallExpressionValidator(
@@ -880,7 +880,7 @@ public IValueReference visitCallExpression(CallExpression node) {
 				if (expressionType != null) {
 					if (expressionType instanceof IRFunctionType) {
 						return ConstantValue
-								.valueOf(((IRFunctionType) expressionType)
+								.of(((IRFunctionType) expressionType)
 										.getReturnType());
 					} else if (expressionType instanceof IRClassType) {
 						final IRTypeDeclaration target = ((IRClassType) expressionType)