Skip to content

fix: 型引数で定義された型に型引数を与えてもエラーが発生しない問題を修正 #1006

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
takejohn merged 1 commit into from
Dec 7, 2025
Merged

fix: 型引数で定義された型に型引数を与えてもエラーが発生しない問題を修正 #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export function getTypeNameBySource(typeSource: Ast.TypeSource): string {
export function getTypeBySource(typeSource: Ast.TypeSource, typeParams?: readonly Ast.TypeParam[]): Type {
if (typeSource.type === 'namedTypeSource') {
const typeParam = typeParams?.find((param) => param.name === typeSource.name);
if (typeParam != null) {
if (typeParam != null && typeSource.inner == null) {
return T_PARAM(typeParam.name);
}

Expand Down
10 changes: 8 additions & 2 deletions test/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as assert from 'assert';
import { describe, test } from 'vitest';
import { describe, expect, test } from 'vitest';
import { utils } from '../src';
import { NUM, STR, NULL, ARR, OBJ, BOOL, TRUE, FALSE, ERROR ,FN_NATIVE } from '../src/interpreter/value';
import { AiScriptRuntimeError } from '../src/error';
import { AiScriptRuntimeError, AiScriptSyntaxError } from '../src/error';
import { exe, getMeta, eq } from './testutils';

describe('function types', () => {
Expand Down Expand Up @@ -108,6 +108,12 @@ describe('generics', () => {
@f<>() {}
`));
});

test.concurrent('cannot have inner type', async () => {
await expect(() => exe(`
@f<T>(v: T<num>) {}
`)).rejects.toThrow(AiScriptSyntaxError);
});
});
});

Expand Down
1 change: 1 addition & 0 deletions unreleased/fix-type-param-inner-type-is-allowed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix: 型引数で定義された型に型引数を与えてもエラーが発生しない問題を修正
Loading