-
Notifications
You must be signed in to change notification settings - Fork 4
overloads array constructors to accept another array. #95
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3faa8e3
Fix safe_value_to_intarray() to respect nullable parameter.
chibash 102d990
supports new Array<T>(src: any[])
chibash f4b4922
Accepts GitHub Copilot's review comments, including a fix of memory l…
chibash 707a81c
fixes try_and_catch() to avoid memory leak
chibash File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1192,6 +1192,36 @@ export default class TypeChecker<Info extends NameInfo> extends visitor.NodeVisi | |||||
| arg) | ||||||
| } | ||||||
|
|
||||||
| // call-expression's overloaded (OL) arguments | ||||||
| private callExpressionOLArg(arg: AST.Node, paramTypes: StaticType[], names: NameTable<Info>, wrongType?: StaticType) { | ||||||
| this.visit(arg, names) | ||||||
| const argType = this.result | ||||||
| for (const t of paramTypes) | ||||||
| if (isConsistent(argType, t) || this.isConsistentOnFirstPass(argType, t) || isSubtype(argType, t)) { | ||||||
| this.addStaticType(arg, argType) | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| this.assert(argType !== wrongType, 'wrong number of arguments', arg) | ||||||
| this.assert(false, | ||||||
| `passing an incompatible argument (${typeToString(argType)} to ${paramTypes.map(t => typeToString(t)).join(' | ')})`, | ||||||
| arg) | ||||||
| } | ||||||
|
|
||||||
| private callExpressionArgOrArray(arg: AST.Node, paramType: StaticType, names: NameTable<Info>) { | ||||||
| this.visit(arg, names) | ||||||
| const argType = this.result | ||||||
| if (isConsistent(argType, paramType) || this.isConsistentOnFirstPass(argType, paramType) | ||||||
| || isSubtype(argType, paramType) || argType instanceof ArrayType) { | ||||||
| this.addStaticType(arg, argType) | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| this.assert(false, | ||||||
| `passing an incompatible argument (${typeToString(argType)} to ${typeToString(paramType)} or an array type)`, | ||||||
| arg) | ||||||
| } | ||||||
|
|
||||||
| protected superConstructorCall(type: StaticType, node: AST.CallExpression, names: NameTable<Info>): void { | ||||||
| const args = node.arguments | ||||||
| if (type instanceof InstanceType) { | ||||||
|
|
@@ -1250,16 +1280,25 @@ export default class TypeChecker<Info extends NameInfo> extends visitor.NodeVisi | |||||
| if (this.assert(typeParams.length === 1, 'wrong numberr of type parameters', node)) | ||||||
|
||||||
| if (this.assert(typeParams.length === 1, 'wrong numberr of type parameters', node)) | |
| if (this.assert(typeParams.length === 1, 'wrong number of type parameters', node)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -601,6 +601,7 @@ test('object array', () => { | |||||
| value: integer | ||||||
| constructor(n) { this.value = n } | ||||||
| } | ||||||
| const n = 3 | ||||||
| ` | ||||||
| const src2 = ` | ||||||
| const a = new Array<Foo>(n) | ||||||
|
|
@@ -1818,3 +1819,156 @@ test('any parameter and integer return type', () => { | |||||
|
|
||||||
| expect(compileAndRun(src, destFile)).toBe('7\n7\n7\n7\n') | ||||||
| }) | ||||||
|
|
||||||
| test('array initialization with another array', () => { | ||||||
| const src = ` | ||||||
| function foo() { | ||||||
| let a = new Array<integer>([1, 2, 3]) | ||||||
| let a2: any = a | ||||||
| print(a.length) | ||||||
| let b = new Array<integer>(a) | ||||||
| print(b.length) | ||||||
| let b2 = new Array<integer>(a2) | ||||||
| print(b2.length) | ||||||
| let size: any = 4 | ||||||
| let c = new Array<integer>(size) | ||||||
| print(c.length) | ||||||
| let c2 = new Array<integer>(5) | ||||||
| print(c2.length) | ||||||
| let d = new Array<integer>([1, size]) // any[] is given as an initial value | ||||||
| print(d.length) | ||||||
| let e = new Array<any>([1, 2, 3, 4]) | ||||||
| let e2 = new Array<integer>(e) | ||||||
| print(e2.length) | ||||||
| } | ||||||
|
|
||||||
| function bar() { | ||||||
| let a = new Array<float>([1, 2, 3]) | ||||||
| let a2: any = a | ||||||
| print(a.length) | ||||||
| let b = new Array<float>(a) | ||||||
| print(b.length) | ||||||
| let b2 = new Array<float>(a2) | ||||||
| print(b2.length) | ||||||
| let size: any = 4 | ||||||
| let c = new Array<float>(size) | ||||||
| print(c.length) | ||||||
| let c2 = new Array<float>(5) | ||||||
| print(c2.length) | ||||||
| let d = new Array<float>([1, size]) // any[] is given as an initial value | ||||||
| print(d.length) | ||||||
| let e = new Array<any>([1, 2, 3, 4]) | ||||||
| let e2 = new Array<float>(e) | ||||||
| print(e2.length) | ||||||
| } | ||||||
|
|
||||||
| function baz() { | ||||||
| let a = new Array<boolean>([false, true, true]) | ||||||
| print(a.length) | ||||||
| print(a[0]) | ||||||
| print(a[2]) | ||||||
| let a2: any = a | ||||||
| let b = new Array<boolean>(a) | ||||||
| print(b.length) | ||||||
| let b2 = new Array<boolean>(a2) | ||||||
| print(b2.length) | ||||||
| let size: any = 4 | ||||||
| let c = new Array<boolean>(size) | ||||||
| print(c.length) | ||||||
| let c2 = new Array<boolean>(5) | ||||||
| print(c2.length) | ||||||
| let d2: any = false | ||||||
| let d = new Array<boolean>([true, d2]) // any[] is given as an initial value | ||||||
| print(d.length) | ||||||
| let e = new Array<any>([1, 2, false, 4]) | ||||||
| let e2 = new Array<boolean>(e) | ||||||
| print(e2.length) | ||||||
| print(e2[2]) | ||||||
| } | ||||||
|
|
||||||
| foo() | ||||||
| bar() | ||||||
| baz() | ||||||
| ` | ||||||
|
|
||||||
| expect(compileAndRun(src, destFile)).toBe(['3', '3', '3', '4', '5', '2', '4', | ||||||
| '3', '3', '3', '4', '5', '2', '4', | ||||||
| '3', 'false', 'true', '3', '3', '4', '5', '2', '4', 'false' | ||||||
| ].join('\n') + '\n') | ||||||
| }) | ||||||
|
|
||||||
| test('array initialization with another object array', () => { | ||||||
| const src = ` | ||||||
| class Foo { | ||||||
| value: integer | ||||||
| constructor(i: integer) { this.value = i } | ||||||
| } | ||||||
|
|
||||||
| function foo() { | ||||||
| let a = new Array<Foo>([new Foo(1), new Foo(2), new Foo(3)]) | ||||||
| let a2: any = a | ||||||
| print(a.length) | ||||||
| let b = new Array<Foo>(a) | ||||||
| print(b.length) | ||||||
| let b2 = new Array<Foo>(a2) | ||||||
| print(b2.length) | ||||||
| let size: any = 4 | ||||||
| let c = new Array<Foo>(size, new Foo(0)) | ||||||
| print(c.length) | ||||||
| let c2 = new Array<Foo>(5, new Foo(0)) | ||||||
| print(c2.length) | ||||||
| let d = new Array<any>([new Foo(1), new Foo(2), new Foo(3), new Foo(4)]) | ||||||
| let d2 = new Array<Foo>(d) | ||||||
| print(d2.length) | ||||||
| } | ||||||
|
|
||||||
| function bar() { | ||||||
| let a = new Array<any>([1, true, 'foo']) | ||||||
| let a2: any = a | ||||||
| print(a.length) | ||||||
| let b = new Array<any>(a) | ||||||
| print(b.length) | ||||||
| let b2 = new Array<any>(a2) | ||||||
| print(b2.length) | ||||||
| let size: any = 4 | ||||||
| let c = new Array<any>(size) | ||||||
| print(c.length) | ||||||
| let c2 = new Array<any>(5) | ||||||
| print(c2.length) | ||||||
| } | ||||||
|
|
||||||
| foo() | ||||||
| bar() | ||||||
| ` | ||||||
|
|
||||||
| expect(compileAndRun(src, destFile)).toBe(['3', '3', '3', '4', '5', '4', | ||||||
| '3', '3', '3', '4', '5' | ||||||
| ].join('\n') + '\n') | ||||||
| }) | ||||||
|
|
||||||
| test('wrong array construction', () => { | ||||||
| let src = ` | ||||||
| let a = ['one', 2] | ||||||
| let b = new Array<string>(a) | ||||||
| ` | ||||||
| expect(() => { compileAndRun(src, destFile) }).toThrow(/runtime type error:.*element type mismatch/) | ||||||
|
|
||||||
| src = ` | ||||||
| let s: any = 'two' | ||||||
| let a = new Array<string>(s) | ||||||
| ` | ||||||
| expect(() => { compileAndRun(src, destFile) }).toThrow(/runtime type error:.*new Array/) | ||||||
|
|
||||||
| src = ` | ||||||
| let s: any = 2 | ||||||
| let a = new Array<string>(s) | ||||||
| ` | ||||||
| expect(() => { compileAndRun(src, destFile) }).toThrow(/runtime error:.*wrong number of arguments/) | ||||||
|
|
||||||
| src = ` | ||||||
| let a = new Array<string>(['foo', 'bar', 3]) | ||||||
| let b = new Array<integer>([1, 2, true]) | ||||||
| let c = new Array<boolean>([true, false, 'baz']) | ||||||
| ` | ||||||
| expect(() => { compileAndRun(src, destFile) }).toThrow(/string.*line 2.*\n.*integer.*line 3.*\n.*boolean.*line 4.*\n/) | ||||||
|
||||||
| expect(() => { compileAndRun(src, destFile) }).toThrow(/string.*line 2.*\n.*integer.*line 3.*\n.*boolean.*line 4.*\n/) | |
| expect(() => { compileAndRun(src, destFile) }).toThrow(/string.*line \d+.*\n.*integer.*line \d+.*\n.*boolean.*line \d+.*\n/) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing coercion handling: Unlike callExpressionArg which calls addCoercion at line 1188, this method only calls addStaticType without considering if coercion is needed. When a type is consistent but requires coercion (e.g., converting Any to a specific type), this might not be handled correctly. Consider calling addCoercion similar to how it's done in the original callExpressionArg method.