Commit 2bb2e61ee288a02e184e5b8422859a4afcbb4813 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-01-28 18:58:28-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-01-28 18:58:28-07:00
log	2bb2e61ee288a02e184e5b8422859a4afcbb4813
tree	f7b77f8ce8837d9909250b9dec3326d963976d6d
parent	ff028525e5421ee93182bbf19102d34d434286f3

parser: allow missing fn name and missing param names

now these problems are caught in analyzer

this is for purpose of function type, see #14

4 files changed, 138 insertions(+), 97 deletions(-)

doc
- langref.md
src
- analyze.cpp
- parser.cpp
test
- run_tests.cpp

doc/langref.md+90-74

...	...	@@ -3,153 +3,153 @@
3	3	## Grammar
4	4
5	5	```
6		Root : many(TopLevelDecl) "EOF"
	6	Root = many(TopLevelDecl) "EOF"
7	7
8		TopLevelDecl : many(Directive) option(VisibleMod) (FnDef \| ExternDecl \| RootExportDecl \| Import \| ContainerDecl \| GlobalVarDecl \| ErrorValueDecl \| CImportDecl)
	8	TopLevelDecl = many(Directive) option(VisibleMod) (FnDef \| ExternDecl \| RootExportDecl \| Import \| ContainerDecl \| GlobalVarDecl \| ErrorValueDecl \| CImportDecl)
9	9
10		CImportDecl : "c_import" Block
	10	CImportDecl = "c_import" Block
11	11
12		ErrorValueDecl : "error" "Symbol" ";"
	12	ErrorValueDecl = "error" "Symbol" ";"
13	13
14		GlobalVarDecl : VariableDeclaration ";"
	14	GlobalVarDecl = VariableDeclaration ";"
15	15
16		VariableDeclaration : ("var" \| "const") "Symbol" option(":" PrefixOpExpression) "=" Expression
	16	VariableDeclaration = ("var" \| "const") "Symbol" option(":" PrefixOpExpression) "=" Expression
17	17
18		ContainerDecl : ("struct" \| "enum") "Symbol" "{" many(StructMember) "}"
	18	ContainerDecl = ("struct" \| "enum") "Symbol" "{" many(StructMember) "}"
19	19
20		StructMember: many(Directive) option(VisibleMod) (StructField \| FnDef)
	20	StructMember = many(Directive) option(VisibleMod) (StructField \| FnDef)
21	21
22		StructField : "Symbol" option(":" Expression) ",")
	22	StructField = "Symbol" option(":" Expression) ",")
23	23
24		Import : "import" "String" ";"
	24	Import = "import" "String" ";"
25	25
26		RootExportDecl : "export" "Symbol" "String" ";"
	26	RootExportDecl = "export" "Symbol" "String" ";"
27	27
28		ExternDecl : "extern" FnProto ";"
	28	ExternDecl = "extern" FnProto ";"
29	29
30		FnProto : "fn" "Symbol" ParamDeclList option("->" PrefixOpExpression)
	30	FnProto = "fn" option("Symbol") ParamDeclList option("->" PrefixOpExpression)
31	31
32		Directive : "#" "Symbol" "(" "String" ")"
	32	Directive = "#" "Symbol" "(" "String" ")"
33	33
34		VisibleMod : "pub" \| "export"
	34	VisibleMod = "pub" \| "export"
35	35
36		FnDef : FnProto Block
	36	FnDef = FnProto Block
37	37
38		ParamDeclList : "(" list(ParamDecl, ",") ")"
	38	ParamDeclList = "(" list(ParamDecl, ",") ")"
39	39
40		ParamDecl : option("noalias") "Symbol" ":" PrefixOpExpression \| "..."
	40	ParamDecl = option("noalias") option("Symbol" ":") PrefixOpExpression \| "..."
41	41
42		Block : "{" list(option(Statement), ";") "}"
	42	Block = "{" list(option(Statement), ";") "}"
43	43
44		Statement : Label \| VariableDeclaration ";" \| NonBlockExpression ";" \| BlockExpression
	44	Statement = Label \| VariableDeclaration ";" \| NonBlockExpression ";" \| BlockExpression
45	45
46		Label: "Symbol" ":"
	46	Label = "Symbol" ":"
47	47
48		Expression : BlockExpression \| NonBlockExpression
	48	Expression = BlockExpression \| NonBlockExpression
49	49
50		NonBlockExpression : ReturnExpression \| AssignmentExpression
	50	NonBlockExpression = ReturnExpression \| AssignmentExpression
51	51
52		AsmExpression : "asm" option("volatile") "(" "String" option(AsmOutput) ")"
	52	AsmExpression = "asm" option("volatile") "(" "String" option(AsmOutput) ")"
53	53
54		AsmOutput : ":" list(AsmOutputItem, ",") option(AsmInput)
	54	AsmOutput = ":" list(AsmOutputItem, ",") option(AsmInput)
55	55
56		AsmInput : ":" list(AsmInputItem, ",") option(AsmClobbers)
	56	AsmInput = ":" list(AsmInputItem, ",") option(AsmClobbers)
57	57
58		AsmOutputItem : "[" "Symbol" "]" "String" "(" ("Symbol" \| "->" PrefixOpExpression) ")"
	58	AsmOutputItem = "[" "Symbol" "]" "String" "(" ("Symbol" \| "->" PrefixOpExpression) ")"
59	59
60		AsmInputItem : "[" "Symbol" "]" "String" "(" Expression ")"
	60	AsmInputItem = "[" "Symbol" "]" "String" "(" Expression ")"
61	61
62		AsmClobbers: ":" list("String", ",")
	62	AsmClobbers= ":" list("String", ",")
63	63
64		UnwrapExpression : BoolOrExpression (UnwrapMaybe \| UnwrapError) \| BoolOrExpression
	64	UnwrapExpression = BoolOrExpression (UnwrapMaybe \| UnwrapError) \| BoolOrExpression
65	65
66		UnwrapMaybe : "??" BoolOrExpression
	66	UnwrapMaybe = "??" BoolOrExpression
67	67
68		UnwrapError : "%%" option("\|" "Symbol" "\|") BoolOrExpression
	68	UnwrapError = "%%" option("\|" "Symbol" "\|") BoolOrExpression
69	69
70		AssignmentExpression : UnwrapExpression AssignmentOperator UnwrapExpression \| UnwrapExpression
	70	AssignmentExpression = UnwrapExpression AssignmentOperator UnwrapExpression \| UnwrapExpression
71	71
72		AssignmentOperator : "=" \| "*=" \| "/=" \| "%=" \| "+=" \| "-=" \| "<<=" \| ">>=" \| "&=" \| "^=" \| "\|=" \| "&&=" \| "\|\|="
	72	AssignmentOperator = "=" \| "*=" \| "/=" \| "%=" \| "+=" \| "-=" \| "<<=" \| ">>=" \| "&=" \| "^=" \| "\|=" \| "&&=" \| "\|\|="
73	73
74		BlockExpression : IfExpression \| Block \| WhileExpression \| ForExpression \| SwitchExpression
	74	BlockExpression = IfExpression \| Block \| WhileExpression \| ForExpression \| SwitchExpression
75	75
76		SwitchExpression : "switch" "(" Expression ")" "{" many(SwitchProng) "}"
	76	SwitchExpression = "switch" "(" Expression ")" "{" many(SwitchProng) "}"
77	77
78		SwitchProng : (list(SwitchItem, ",") \| "else") option(":" "(" "Symbol" ")") "=>" Expression ","
	78	SwitchProng = (list(SwitchItem, ",") \| "else") option(":" "(" "Symbol" ")") "=>" Expression ","
79	79
80		SwitchItem : Expression \| (Expression "..." Expression)
	80	SwitchItem = Expression \| (Expression "..." Expression)
81	81
82		WhileExpression : "while" "(" Expression ")" Expression
	82	WhileExpression = "while" "(" Expression ")" Expression
83	83
84		ForExpression : "for" "(" "Symbol" "," Expression option("," "Symbol") ")" Expression
	84	ForExpression = "for" "(" "Symbol" "," Expression option("," "Symbol") ")" Expression
85	85
86		BoolOrExpression : BoolAndExpression "\|\|" BoolOrExpression \| BoolAndExpression
	86	BoolOrExpression = BoolAndExpression "\|\|" BoolOrExpression \| BoolAndExpression
87	87
88		ReturnExpression : option("%" \| "?") "return" option(Expression)
	88	ReturnExpression = option("%" \| "?") "return" option(Expression)
89	89
90		IfExpression : IfVarExpression \| IfBoolExpression
	90	IfExpression = IfVarExpression \| IfBoolExpression
91	91
92		IfBoolExpression : "if" "(" Expression ")" Expression option(Else)
	92	IfBoolExpression = "if" "(" Expression ")" Expression option(Else)
93	93
94		IfVarExpression : "if" "(" ("const" \| "var") "Symbol" option(":" PrefixOpExpression) "?=" Expression ")" Expression Option(Else)
	94	IfVarExpression = "if" "(" ("const" \| "var") "Symbol" option(":" PrefixOpExpression) "?=" Expression ")" Expression Option(Else)
95	95
96		Else : "else" Expression
	96	Else = "else" Expression
97	97
98		BoolAndExpression : ComparisonExpression "&&" BoolAndExpression \| ComparisonExpression
	98	BoolAndExpression = ComparisonExpression "&&" BoolAndExpression \| ComparisonExpression
99	99
100		ComparisonExpression : BinaryOrExpression ComparisonOperator BinaryOrExpression \| BinaryOrExpression
	100	ComparisonExpression = BinaryOrExpression ComparisonOperator BinaryOrExpression \| BinaryOrExpression
101	101
102		ComparisonOperator : "==" \| "!=" \| "<" \| ">" \| "<=" \| ">="
	102	ComparisonOperator = "==" \| "!=" \| "<" \| ">" \| "<=" \| ">="
103	103
104		BinaryOrExpression : BinaryXorExpression "\|" BinaryOrExpression \| BinaryXorExpression
	104	BinaryOrExpression = BinaryXorExpression "\|" BinaryOrExpression \| BinaryXorExpression
105	105
106		BinaryXorExpression : BinaryAndExpression "^" BinaryXorExpression \| BinaryAndExpression
	106	BinaryXorExpression = BinaryAndExpression "^" BinaryXorExpression \| BinaryAndExpression
107	107
108		BinaryAndExpression : BitShiftExpression "&" BinaryAndExpression \| BitShiftExpression
	108	BinaryAndExpression = BitShiftExpression "&" BinaryAndExpression \| BitShiftExpression
109	109
110		BitShiftExpression : AdditionExpression BitShiftOperator BitShiftExpression \| AdditionExpression
	110	BitShiftExpression = AdditionExpression BitShiftOperator BitShiftExpression \| AdditionExpression
111	111
112		BitShiftOperator : "<<" \| ">>"
	112	BitShiftOperator = "<<" \| ">>"
113	113
114		AdditionExpression : MultiplyExpression AdditionOperator AdditionExpression \| MultiplyExpression
	114	AdditionExpression = MultiplyExpression AdditionOperator AdditionExpression \| MultiplyExpression
115	115
116		AdditionOperator : "+" \| "-" \| "++"
	116	AdditionOperator = "+" \| "-" \| "++"
117	117
118		MultiplyExpression : CurlySuffixExpression MultiplyOperator MultiplyExpression \| CurlySuffixExpression
	118	MultiplyExpression = CurlySuffixExpression MultiplyOperator MultiplyExpression \| CurlySuffixExpression
119	119
120		CurlySuffixExpression : PrefixOpExpression option(ContainerInitExpression)
	120	CurlySuffixExpression = PrefixOpExpression option(ContainerInitExpression)
121	121
122		MultiplyOperator : "*" \| "/" \| "%"
	122	MultiplyOperator = "*" \| "/" \| "%"
123	123
124		PrefixOpExpression : PrefixOp PrefixOpExpression \| SuffixOpExpression
	124	PrefixOpExpression = PrefixOp PrefixOpExpression \| SuffixOpExpression
125	125
126		SuffixOpExpression : PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| SliceExpression)
	126	SuffixOpExpression = PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| SliceExpression)
127	127
128		FieldAccessExpression : "." "Symbol"
	128	FieldAccessExpression = "." "Symbol"
129	129
130		FnCallExpression : "(" list(Expression, ",") ")"
	130	FnCallExpression = "(" list(Expression, ",") ")"
131	131
132		ArrayAccessExpression : "[" Expression "]"
	132	ArrayAccessExpression = "[" Expression "]"
133	133
134		SliceExpression : "[" Expression "..." option(Expression) "]" option("const")
	134	SliceExpression = "[" Expression "..." option(Expression) "]" option("const")
135	135
136		ContainerInitExpression : "{" ContainerInitBody "}"
	136	ContainerInitExpression = "{" ContainerInitBody "}"
137	137
138		ContainerInitBody : list(StructLiteralField, ",") \| list(Expression, ",")
	138	ContainerInitBody = list(StructLiteralField, ",") \| list(Expression, ",")
139	139
140		StructLiteralField : "." "Symbol" "=" Expression
	140	StructLiteralField = "." "Symbol" "=" Expression
141	141
142		PrefixOp : "!" \| "-" \| "~" \| "*" \| ("&" option("const")) \| "?" \| "%" \| "%%"
	142	PrefixOp = "!" \| "-" \| "~" \| "*" \| ("&" option("const")) \| "?" \| "%" \| "%%"
143	143
144		PrimaryExpression : "Number" \| "String" \| "CharLiteral" \| KeywordLiteral \| GroupedExpression \| GotoExpression \| BlockExpression \| "Symbol" \| ("@" "Symbol" FnCallExpression) \| ArrayType \| AsmExpression \| ("error" "." "Symbol")
	144	PrimaryExpression = "Number" \| "String" \| "CharLiteral" \| KeywordLiteral \| GroupedExpression \| GotoExpression \| BlockExpression \| "Symbol" \| ("@" "Symbol" FnCallExpression) \| ArrayType \| FnProto \| AsmExpression \| ("error" "." "Symbol")
145	145
146		ArrayType : "[" option(Expression) "]" option("const") PrefixOpExpression
	146	ArrayType = "[" option(Expression) "]" option("const") PrefixOpExpression
147	147
148		GotoExpression: "goto" "Symbol"
	148	GotoExpression = "goto" "Symbol"
149	149
150		GroupedExpression : "(" Expression ")"
	150	GroupedExpression = "(" Expression ")"
151	151
152		KeywordLiteral : "true" \| "false" \| "null" \| "break" \| "continue" \| "undefined" \| "error"
	152	KeywordLiteral = "true" \| "false" \| "null" \| "break" \| "continue" \| "undefined" \| "error"
153	153	```
154	154
155	155	## Operator Precedence
...	...	@@ -204,9 +204,11 @@ c_ulonglong unsigned long long for ABI compatibility with C
204	204	```
205	205
206	206	### Boolean Type
	207
207	208	The boolean type has the name `bool` and represents either true or false.
208	209
209	210	### Function Type
	211
210	212	TODO
211	213
212	214	### Fixed-Size Array Type
...	...	@@ -222,6 +224,7 @@ A slice can be obtained with the slicing syntax: `array[start...end]`
222	224	Example: `"aoeu"[0...2]` has type `[]u8`.
223	225
224	226	### Struct Type
	227
225	228	TODO
226	229
227	230	### Enum Type
...	...	@@ -296,34 +299,44 @@ Hex floating point TODO TODO
296	299	```
297	300
298	301	### Identifiers
	302
299	303	TODO
300	304
301	305	### Declarations
	306
302	307	Declarations have type `void`.
303	308
304	309	#### Function Declarations
	310
305	311	TODO
306	312
307	313	#### Variable Declarations
	314
308	315	TODO
309	316
310	317	#### Struct Declarations
	318
311	319	TODO
312	320
313	321	#### Enum Declarations
	322
314	323	TODO
315	324
316	325
317	326	## Built-in Functions
	327
318	328	Built-in functions are prefixed with `@`.
319	329
320	330	### Typeof
	331
321	332	TODO
322	333
323	334	### Sizeof
	335
324	336	TODO
325	337
326	338	### Overflow Arithmetic
	339
327	340	Overflow arithmetic functions have defined behavior on overflow or underflow. TODO what is that behaviour?
328	341
329	342	The functions take an integer (TODO float?) type, two variables of the specified type, and a pointer to a variable of the specified type where the result is stored. The functions return a boolean value: true of overflow/underflow occurred, false otherwise.
...	...	@@ -336,10 +349,13 @@ bool mul_with_overflow(type, a: type, b: type, x: &type) x = a b
336	349	```
337	350
338	351	### Memory Operations
	352
339	353	TODO memset and memcpy
340	354
341	355	### Value Count
	356
342	357	TODO
343	358
344	359	### Max and Min Value
	360
345	361	TODO

src/analyze.cpp+20-1

...	...	@@ -457,6 +457,10 @@ static void resolve_function_proto(CodeGen g, AstNode node, FnTableEntry *fn_t
457	457	assert(node->type == NodeTypeFnProto);
458	458	AstNodeFnProto *fn_proto = &node->data.fn_proto;
459	459
	460	if (fn_proto->skip) {
	461	return;
	462	}
	463
460	464	TypeTableEntry *fn_type = new_type_table_entry(TypeTableEntryIdFn);
461	465	fn_table_entry->type_entry = fn_type;
462	466	fn_type->data.fn.calling_convention = fn_table_entry->internal_linkage ? LLVMFastCallConv : LLVMCCallConv;
...	...	@@ -932,6 +936,9 @@ static void resolve_struct_type(CodeGen g, ImportTableEntry import, TypeTableE
932	936	static void preview_fn_proto(CodeGen g, ImportTableEntry import,
933	937	AstNode *proto_node)
934	938	{
	939	if (proto_node->data.fn_proto.skip) {
	940	return;
	941	}
935	942	AstNode *fn_def_node = proto_node->data.fn_proto.fn_def_node;
936	943	AstNode *struct_node = proto_node->data.fn_proto.struct_node;
937	944	bool is_extern = proto_node->data.fn_proto.is_extern;
...	...	@@ -4307,6 +4314,10 @@ static void analyze_top_level_fn_def(CodeGen g, ImportTableEntry import, AstNo
4307	4314	buf_sprintf("byvalue struct parameters not yet supported on exported functions"));
4308	4315	}
4309	4316
	4317	if (buf_len(&param_decl->name) == 0) {
	4318	add_node_error(g, param_decl_node, buf_sprintf("missing parameter name"));
	4319	}
	4320
4310	4321	VariableTableEntry *var = add_local_var(g, param_decl_node, context, &param_decl->name, type, true);
4311	4322	var->src_arg_index = i;
4312	4323	param_decl_node->data.param_decl.variable = var;
...	...	@@ -4682,6 +4693,15 @@ static void detect_top_level_decl_deps(CodeGen g, ImportTableEntry import, Ast
4682	4693	}
4683	4694	case NodeTypeFnProto:
4684	4695	{
	4696	// if the name is missing, we immediately announce an error
	4697	Buf *name = &node->data.fn_proto.name;
	4698	if (buf_len(name) == 0) {
	4699	node->data.fn_proto.skip = true;
	4700	add_node_error(g, node, buf_sprintf("missing function name"));
	4701	break;
	4702	}
	4703
	4704
4685	4705	// determine which other top level declarations this function prototype depends on.
4686	4706	TopLevelDecl *decl_node = &node->data.fn_proto.top_level_decl;
4687	4707	decl_node->deps.init(1);
...	...	@@ -4692,7 +4712,6 @@ static void detect_top_level_decl_deps(CodeGen g, ImportTableEntry import, Ast
4692	4712	}
4693	4713	collect_expr_decl_deps(g, import, node->data.fn_proto.return_type, decl_node);
4694	4714
4695		Buf *name = &node->data.fn_proto.name;
4696	4715	decl_node->name = name;
4697	4716	decl_node->import = import;
4698	4717	if (decl_node->deps.size() > 0) {

src/parser.cpp+21-22

...	...	@@ -569,35 +569,33 @@ static void ast_parse_directives(ParseContext pc, int token_index,
569	569	}
570	570
571	571	/*
572		ParamDecl : option("noalias") "Symbol" ":" PrefixOpExpression \| "..."
	572	ParamDecl = option("noalias") option("Symbol" ":") PrefixOpExpression \| "..."
573	573	*/
574	574	static AstNode ast_parse_param_decl(ParseContext pc, int *token_index) {
575		Token first_token = &pc->tokens->at(token_index);
	575	Token token = &pc->tokens->at(token_index);
576	576
577		if (first_token->id == TokenIdEllipsis) {
	577	if (token->id == TokenIdEllipsis) {
578	578	*token_index += 1;
579	579	return nullptr;
580	580	}
581	581
582		AstNode *node = ast_create_node(pc, NodeTypeParamDecl, first_token);
583		Token *name_token;
	582	AstNode *node = ast_create_node(pc, NodeTypeParamDecl, token);
584	583
585		if (first_token->id == TokenIdKeywordNoAlias) {
	584	if (token->id == TokenIdKeywordNoAlias) {
586	585	node->data.param_decl.is_noalias = true;
587	586	*token_index += 1;
588		name_token = ast_eat_token(pc, token_index, TokenIdSymbol);
589		} else if (first_token->id == TokenIdSymbol) {
590		name_token = first_token;
591		*token_index += 1;
592		} else {
593		ast_invalid_token_error(pc, first_token);
	587	token = &pc->tokens->at(*token_index);
594	588	}
595	589
596		ast_buf_from_token(pc, name_token, &node->data.param_decl.name);
	590	buf_resize(&node->data.param_decl.name, 0);
597	591
598		Token colon = &pc->tokens->at(token_index);
599		*token_index += 1;
600		ast_expect_token(pc, colon, TokenIdColon);
	592	if (token->id == TokenIdSymbol) {
	593	Token next_token = &pc->tokens->at(token_index + 1);
	594	if (next_token->id == TokenIdColon) {
	595	ast_buf_from_token(pc, token, &node->data.param_decl.name);
	596	*token_index += 2;
	597	}
	598	}
601	599
602	600	node->data.param_decl.type = ast_parse_prefix_op_expr(pc, token_index, true);
603	601
...	...	@@ -2179,7 +2177,7 @@ static AstNode ast_parse_block(ParseContext pc, int *token_index, bool mandato
2179	2177	}
2180	2178
2181	2179	/*
2182		FnProto : "fn" "Symbol" ParamDeclList option("->" PrefixOpExpression)
	2180	FnProto : "fn" option("Symbol") ParamDeclList option("->" PrefixOpExpression)
2183	2181	*/
2184	2182	static AstNode ast_parse_fn_proto(ParseContext pc, int *token_index, bool mandatory,
2185	2183	ZigList<AstNode> directives, VisibMod visib_mod)
...	...	@@ -2200,11 +2198,12 @@ static AstNode ast_parse_fn_proto(ParseContext pc, int *token_index, bool mand
2200	2198	node->data.fn_proto.directives = directives;
2201	2199
2202	2200	Token fn_name = &pc->tokens->at(token_index);
2203		*token_index += 1;
2204		ast_expect_token(pc, fn_name, TokenIdSymbol);
2205
2206		ast_buf_from_token(pc, fn_name, &node->data.fn_proto.name);
2207
	2201	if (fn_name->id == TokenIdSymbol) {
	2202	*token_index += 1;
	2203	ast_buf_from_token(pc, fn_name, &node->data.fn_proto.name);
	2204	} else {
	2205	buf_resize(&node->data.fn_proto.name, 0);
	2206	}
2208	2207
2209	2208	ast_parse_param_decl_list(pc, token_index, &node->data.fn_proto.params, &node->data.fn_proto.is_var_args);
2210	2209

test/run_tests.cpp+7

...	...	@@ -1859,6 +1859,13 @@ fn f(foo: Foo, index: i32) {
1859	1859	const result = members[index]();
1860	1860	}
1861	1861	)SOURCE", 1, ".tmp_source.zig:21:34: error: expected 1 arguments, got 0");
	1862
	1863	add_compile_fail_case("missing function name and param name", R"SOURCE(
	1864	fn () {}
	1865	fn f(i32) {}
	1866	)SOURCE", 2,
	1867	".tmp_source.zig:2:1: error: missing function name",
	1868	".tmp_source.zig:3:6: error: missing parameter name");
1862	1869	}
1863	1870
1864	1871	//////////////////////////////////////////////////////////////////////////////