Skip to content

Add Number.parseInt + Number.parseFloat #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 2 commits into from
Sep 24, 2023
Merged

Add Number.parseInt + Number.parseFloat #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b22c5
Add Number.parseInt + Number.parseFloat
Z3rio Sep 24, 2023
bb7a526
Add test cases
Z3rio Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/LuaLib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ export enum LuaLibFeature {
Number = "Number",
NumberIsFinite = "NumberIsFinite",
NumberIsNaN = "NumberIsNaN",
NumberParseInt = "ParseInt",
NumberParseFloat = "ParseFloat",
NumberToString = "NumberToString",
NumberToFixed = "NumberToFixed",
ObjectAssign = "ObjectAssign",
Expand Down
4 changes: 4 additions & 0 deletions src/transformation/builtins/number.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export function transformNumberConstructorCall(
return transformLuaLibFunction(context, LuaLibFeature.NumberIsNaN, node, ...parameters);
case "isFinite":
return transformLuaLibFunction(context, LuaLibFeature.NumberIsFinite, node, ...parameters);
case "parseInt":
return transformLuaLibFunction(context, LuaLibFeature.NumberParseInt, node, ...parameters);
case "parseFloat":
return transformLuaLibFunction(context, LuaLibFeature.NumberParseFloat, node, ...parameters);
default:
context.diagnostics.push(unsupportedProperty(calledMethod.name, "Number", methodName));
}
Expand Down
69 changes: 51 additions & 18 deletions test/unit/builtins/numbers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,32 @@ test("numbers overflowing the float limit become math.huge", () => {
util.testExpression`1e309`.expectToMatchJsResult();
});

describe.each(["parseInt", "parseFloat"])("parse numbers with %s", parseFunction => {
const numberStrings = ["3", "3.0", "9", "42", "239810241", "-20391", "3.1415", "2.7182", "-34910.3"];
describe.each(["parseInt", "parseFloat", "Number.parseInt", "Number.parseFloat"])(
"parse numbers with %s",
parseFunction => {
const numberStrings = ["3", "3.0", "9", "42", "239810241", "-20391", "3.1415", "2.7182", "-34910.3"];

test.each(numberStrings)("parses (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});
test.each(numberStrings)("parses (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});

test("empty string", () => {
util.testExpression`${parseFunction}("")`.expectToMatchJsResult();
});
test("empty string", () => {
util.testExpression`${parseFunction}("")`.expectToMatchJsResult();
});

test("invalid string", () => {
util.testExpression`${parseFunction}("bla")`.expectToMatchJsResult();
});
test("invalid string", () => {
util.testExpression`${parseFunction}("bla")`.expectToMatchJsResult();
});

test.each(["1px", "2300m", "3,4", "452adkfl"])("trailing text (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});
test.each(["1px", "2300m", "3,4", "452adkfl"])("trailing text (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});

test.each([" 3", " 4", " -231", " 1px"])("leading whitespace (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});
});
test.each([" 3", " 4", " -231", " 1px"])("leading whitespace (%s)", numberString => {
util.testExpression`${parseFunction}("${numberString}")`.expectToMatchJsResult();
});
}
);

test.each(["Infinity", "-Infinity", " -Infinity"])("parseFloat handles Infinity", numberString => {
util.testExpression`parseFloat("${numberString}")`.expectToMatchJsResult();
Expand Down Expand Up @@ -162,6 +165,36 @@ test.each([
util.testExpression`parseInt("${numberString}", ${base})`.expectToMatchJsResult();
});

test.each(["Infinity", "-Infinity", " -Infinity"])("Number.parseFloat handles Infinity", numberString => {
util.testExpression`Number.parseFloat("${numberString}")`.expectToMatchJsResult();
});

test.each([
{ numberString: "36", base: 8 },
{ numberString: "-36", base: 8 },
{ numberString: "100010101101", base: 2 },
{ numberString: "-100010101101", base: 2 },
{ numberString: "3F", base: 16 },
])("Number.parseInt with base (%p)", ({ numberString, base }) => {
util.testExpression`Number.parseInt("${numberString}", ${base})`.expectToMatchJsResult();
});

test.each(["0x4A", "-0x42", "0X42", " 0x391", " -0x8F"])("Number.parseInt detects hexadecimal", numberString => {
util.testExpression`Number.parseInt("${numberString}")`.expectToMatchJsResult();
});

test.each([1, 37, -100])("Number.parseInt with invalid base (%p)", base => {
util.testExpression`Number.parseInt("11111", ${base})`.expectToMatchJsResult();
});

test.each([
{ numberString: "36px", base: 8 },
{ numberString: "10001010110231", base: 2 },
{ numberString: "3Fcolor", base: 16 },
])("Number.parseInt with base and trailing text (%p)", ({ numberString, base }) => {
util.testExpression`Number.parseInt("${numberString}", ${base})`.expectToMatchJsResult();
});

// Issue #1218: https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1218
test.each(["42", "undefined"])("prototype call on nullable number (%p)", value => {
util.testFunction`
Expand Down