archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8029332: Do not require nasgen-generated functions to return Object

Browse source 
Reviewed-by: lagergren, jlaskey, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2014-01-13 18:13:55 +05:30
parent 305de05b44
commit fee7c642da
2 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
View file

@ -279,10 +279,6 @@ public final class MemberInfo implements Cloneable {
} }
} }
} else if (kind == Kind.FUNCTION) { } else if (kind == Kind.FUNCTION) {
final Type returnType = Type.getReturnType(javaDesc);
if (! returnType.toString().equals(OBJECT_DESC)) {
error("return value should be of Object type, found" + returnType);
}
final Type[] argTypes = Type.getArgumentTypes(javaDesc); final Type[] argTypes = Type.getArgumentTypes(javaDesc);
if (argTypes.length < 1) { if (argTypes.length < 1) {
error("function methods should have at least 1 arg"); error("function methods should have at least 1 arg");

36
nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
View file

@ -92,7 +92,7 @@ public final class NativeMath extends ScriptObject {
* @return abs of value * @return abs of value
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object abs(final Object self, final Object x) { public static double abs(final Object self, final Object x) {
return Math.abs(JSType.toNumber(x)); return Math.abs(JSType.toNumber(x));
} }
@ -144,7 +144,7 @@ public final class NativeMath extends ScriptObject {
* @return acos of argument * @return acos of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object acos(final Object self, final Object x) { public static double acos(final Object self, final Object x) {
return Math.acos(JSType.toNumber(x)); return Math.acos(JSType.toNumber(x));
} }
@ -170,7 +170,7 @@ public final class NativeMath extends ScriptObject {
* @return asin of argument * @return asin of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object asin(final Object self, final Object x) { public static double asin(final Object self, final Object x) {
return Math.asin(JSType.toNumber(x)); return Math.asin(JSType.toNumber(x));
} }
@ -196,7 +196,7 @@ public final class NativeMath extends ScriptObject {
* @return atan of argument * @return atan of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object atan(final Object self, final Object x) { public static double atan(final Object self, final Object x) {
return Math.atan(JSType.toNumber(x)); return Math.atan(JSType.toNumber(x));
} }
@ -223,7 +223,7 @@ public final class NativeMath extends ScriptObject {
* @return atan2 of x and y * @return atan2 of x and y
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object atan2(final Object self, final Object y, final Object x) { public static double atan2(final Object self, final Object y, final Object x) {
return Math.atan2(JSType.toNumber(y), JSType.toNumber(x)); return Math.atan2(JSType.toNumber(y), JSType.toNumber(x));
} }
@ -250,7 +250,7 @@ public final class NativeMath extends ScriptObject {
* @return ceil of argument * @return ceil of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object ceil(final Object self, final Object x) { public static double ceil(final Object self, final Object x) {
return Math.ceil(JSType.toNumber(x)); return Math.ceil(JSType.toNumber(x));
} }
@ -302,7 +302,7 @@ public final class NativeMath extends ScriptObject {
* @return cos of argument * @return cos of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object cos(final Object self, final Object x) { public static double cos(final Object self, final Object x) {
return Math.cos(JSType.toNumber(x)); return Math.cos(JSType.toNumber(x));
} }
@ -328,7 +328,7 @@ public final class NativeMath extends ScriptObject {
* @return exp of argument * @return exp of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object exp(final Object self, final Object x) { public static double exp(final Object self, final Object x) {
return Math.exp(JSType.toNumber(x)); return Math.exp(JSType.toNumber(x));
} }
@ -341,7 +341,7 @@ public final class NativeMath extends ScriptObject {
* @return floor of argument * @return floor of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object floor(final Object self, final Object x) { public static double floor(final Object self, final Object x) {
return Math.floor(JSType.toNumber(x)); return Math.floor(JSType.toNumber(x));
} }
@ -393,7 +393,7 @@ public final class NativeMath extends ScriptObject {
* @return log of argument * @return log of argument
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object log(final Object self, final Object x) { public static double log(final Object self, final Object x) {
return Math.log(JSType.toNumber(x)); return Math.log(JSType.toNumber(x));
} }
@ -419,7 +419,7 @@ public final class NativeMath extends ScriptObject {
* @return the largest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given * @return the largest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given
*/ */
@Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object max(final Object self, final Object... args) { public static double max(final Object self, final Object... args) {
switch (args.length) { switch (args.length) {
case 0: case 0:
return Double.NEGATIVE_INFINITY; return Double.NEGATIVE_INFINITY;
@ -497,7 +497,7 @@ public final class NativeMath extends ScriptObject {
* @return the smallest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given * @return the smallest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given
*/ */
@Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object min(final Object self, final Object... args) { public static double min(final Object self, final Object... args) {
switch (args.length) { switch (args.length) {
case 0: case 0:
return Double.POSITIVE_INFINITY; return Double.POSITIVE_INFINITY;
@ -576,7 +576,7 @@ public final class NativeMath extends ScriptObject {
* @return x raised to the power of y * @return x raised to the power of y
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object pow(final Object self, final Object x, final Object y) { public static double pow(final Object self, final Object x, final Object y) {
return Math.pow(JSType.toNumber(x), JSType.toNumber(y)); return Math.pow(JSType.toNumber(x), JSType.toNumber(y));
} }
@ -602,7 +602,7 @@ public final class NativeMath extends ScriptObject {
* @return random number in the range [0..1) * @return random number in the range [0..1)
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object random(final Object self) { public static double random(final Object self) {
return Math.random(); return Math.random();
} }
@ -615,7 +615,7 @@ public final class NativeMath extends ScriptObject {
* @return x rounded * @return x rounded
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object round(final Object self, final Object x) { public static double round(final Object self, final Object x) {
final double d = JSType.toNumber(x); final double d = JSType.toNumber(x);
if (Math.getExponent(d) >= 52) { if (Math.getExponent(d) >= 52) {
return d; return d;
@ -632,7 +632,7 @@ public final class NativeMath extends ScriptObject {
* @return sin of x * @return sin of x
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object sin(final Object self, final Object x) { public static double sin(final Object self, final Object x) {
return Math.sin(JSType.toNumber(x)); return Math.sin(JSType.toNumber(x));
} }
@ -658,7 +658,7 @@ public final class NativeMath extends ScriptObject {
* @return sqrt of x * @return sqrt of x
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object sqrt(final Object self, final Object x) { public static double sqrt(final Object self, final Object x) {
return Math.sqrt(JSType.toNumber(x)); return Math.sqrt(JSType.toNumber(x));
} }
@ -684,7 +684,7 @@ public final class NativeMath extends ScriptObject {
* @return tan of x * @return tan of x
*/ */
@Function(attributes = Attribute.NOT_ENUMERABLE, where=Where.CONSTRUCTOR) @Function(attributes = Attribute.NOT_ENUMERABLE, where=Where.CONSTRUCTOR)
public static Object tan(final Object self, final Object x) { public static double tan(final Object self, final Object x) {
return Math.tan(JSType.toNumber(x)); return Math.tan(JSType.toNumber(x));
} }