名前空間下の変数定義に属性を付与できるように (#892)

Author: takejohn

src/parser/syntaxes/statements.ts

@@ -379,7 +379,7 @@ function parseReturn(s: ITokenStream): Ast.Return {
  * StatementWithAttr = *Attr Statement
  * ```
 */
-function parseStatementWithAttr(s: ITokenStream): Ast.Definition {
+export function parseStatementWithAttr(s: ITokenStream): Ast.Definition {
 	const attrs: Ast.Attribute[] = [];
 	while (s.is(TokenKind.OpenSharpBracket)) {
 		attrs.push(parseAttr(s) as Ast.Attribute);

src/parser/syntaxes/toplevel.ts

@@ -1,7 +1,7 @@
 import { NODE } from '../utils.js';
 import { TokenKind } from '../token.js';
 import { AiScriptSyntaxError, AiScriptUnexpectedEOFError } from '../../error.js';
-import { parseDefStatement, parseStatement } from './statements.js';
+import { parseDefStatement, parseStatement, parseStatementWithAttr } from './statements.js';
 import { parseExpr } from './expressions.js';
 
 import type * as Ast from '../../node.js';
@@ -91,6 +91,10 @@ export function parseNamespace(s: ITokenStream): Ast.Namespace {
 				members.push(parseNamespace(s));
 				break;
 			}
+			case TokenKind.OpenSharpBracket: {
+				members.push(parseStatementWithAttr(s));
+				break;
+			}
 		}
 
 		// terminator

test/index.ts

@@ -929,6 +929,25 @@ describe('Attribute', () => {
 		if (attr.value.type !== 'bool') assert.fail();
 		assert.equal(attr.value.value, true);
 	});
+
+	test.concurrent('attribute with statement under namespace', async () => {
+		const parser = new Parser();
+		const nodes = parser.parse(`
+		:: Tests {
+			#[test]
+			@assert_success() {
+				<: "Hello, world!"
+			}
+		}
+		`);
+		assert.equal(nodes.length, 1);
+		const ns = nodes[0];
+		assert.ok(ns.type === 'ns');
+		const member = ns.members[0];
+		assert.ok(member.type === 'def');
+		const attr = member.attr[0];
+		assert.equal(attr.name, 'test');
+	});
 });
 
 describe('Location', () => {

unreleased/attr-under-ns.md

@@ -0,0 +1 @@
+- 名前空間下の変数定義に属性を付与できるようになりました。