authorgravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-03-29 23:40:46+02:00
committergravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-03-29 23:40:46+02:00
logedca1739975f69a695d1ee12ba88ebca1778fefb
tree1b783e5311fd5bec4a079270e1090392ed32cb9f
parent8ada03097117cd70800f9e5e7cce97226107f79e

std.zig.parser now parses call expr

2 files changed, 79 insertions(+), 0 deletions(-)

std/zig/ast.zig+31
...@@ -22,6 +22,7 @@ pub const Node = struct {...@@ -22,6 +22,7 @@ pub const Node = struct {
22 StringLiteral,22 StringLiteral,
23 UndefinedLiteral,23 UndefinedLiteral,
24 BuiltinCall,24 BuiltinCall,
25 Call,
25 LineComment,26 LineComment,
26 TestDecl,27 TestDecl,
27 };28 };
...@@ -41,6 +42,7 @@ pub const Node = struct {...@@ -41,6 +42,7 @@ pub const Node = struct {
41 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).iterate(index),42 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).iterate(index),
42 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).iterate(index),43 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).iterate(index),
43 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).iterate(index),44 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).iterate(index),
45 Id.Call => @fieldParentPtr(NodeCall, "base", base).iterate(index),
44 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).iterate(index),46 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).iterate(index),
45 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).iterate(index),47 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).iterate(index),
46 };48 };
...@@ -61,6 +63,7 @@ pub const Node = struct {...@@ -61,6 +63,7 @@ pub const Node = struct {
61 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).firstToken(),63 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).firstToken(),
62 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).firstToken(),64 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).firstToken(),
63 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).firstToken(),65 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).firstToken(),
66 Id.Call => @fieldParentPtr(NodeCall, "base", base).firstToken(),
64 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).firstToken(),67 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).firstToken(),
65 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).firstToken(),68 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).firstToken(),
66 };69 };
...@@ -81,6 +84,7 @@ pub const Node = struct {...@@ -81,6 +84,7 @@ pub const Node = struct {
81 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).lastToken(),84 Id.StringLiteral => @fieldParentPtr(NodeStringLiteral, "base", base).lastToken(),
82 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).lastToken(),85 Id.UndefinedLiteral => @fieldParentPtr(NodeUndefinedLiteral, "base", base).lastToken(),
83 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).lastToken(),86 Id.BuiltinCall => @fieldParentPtr(NodeBuiltinCall, "base", base).lastToken(),
87 Id.Call => @fieldParentPtr(NodeCall, "base", base).lastToken(),
84 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).lastToken(),88 Id.LineComment => @fieldParentPtr(NodeLineComment, "base", base).lastToken(),
85 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).lastToken(),89 Id.TestDecl => @fieldParentPtr(NodeTestDecl, "base", base).lastToken(),
86 };90 };
...@@ -527,6 +531,33 @@ pub const NodeBuiltinCall = struct {...@@ -527,6 +531,33 @@ pub const NodeBuiltinCall = struct {
527 }531 }
528};532};
529533
534pub const NodeCall = struct {
535 base: Node,
536 callee: &Node,
537 params: ArrayList(&Node),
538 rparen_token: Token,
539
540 pub fn iterate(self: &NodeCall, index: usize) ?&Node {
541 var i = index;
542
543 if (i < 1) return self.callee;
544 i -= 1;
545
546 if (i < self.params.len) return self.params.at(i);
547 i -= self.params.len;
548
549 return null;
550 }
551
552 pub fn firstToken(self: &NodeCall) Token {
553 return self.callee.firstToken();
554 }
555
556 pub fn lastToken(self: &NodeCall) Token {
557 return self.rparen_token;
558 }
559};
560
530pub const NodeStringLiteral = struct {561pub const NodeStringLiteral = struct {
531 base: Node,562 base: Node,
532 token: Token,563 token: Token,
std/zig/parser.zig+48
...@@ -428,6 +428,29 @@ pub const Parser = struct {...@@ -428,6 +428,29 @@ pub const Parser = struct {
428 try stack.append(State.ExpectOperand);428 try stack.append(State.ExpectOperand);
429 continue;429 continue;
430430
431 } else if (token.id == Token.Id.LParen) {
432 self.putBackToken(token);
433
434 const node = try arena.create(ast.NodeCall);
435 *node = ast.NodeCall {
436 .base = self.initNode(ast.Node.Id.Call),
437 .callee = stack.pop().Operand,
438 .params = ArrayList(&ast.Node).init(arena),
439 .rparen_token = undefined,
440 };
441 try stack.append(State {
442 .Operand = &node.base
443 });
444 try stack.append(State.AfterOperand);
445 try stack.append(State {.ExprListItemOrEnd = &node.params });
446 try stack.append(State {
447 .ExpectTokenSave = ExpectTokenSave {
448 .id = Token.Id.LParen,
449 .ptr = &node.rparen_token,
450 },
451 });
452 continue;
453
431 // TODO: Parse postfix operator454 // TODO: Parse postfix operator
432 } else {455 } else {
433 // no postfix/infix operator after this operand.456 // no postfix/infix operator after this operand.
...@@ -1325,6 +1348,21 @@ pub const Parser = struct {...@@ -1325,6 +1348,21 @@ pub const Parser = struct {
1325 }1348 }
1326 }1349 }
1327 },1350 },
1351 ast.Node.Id.Call => {
1352 const call = @fieldParentPtr(ast.NodeCall, "base", base);
1353 try stack.append(RenderState { .Text = ")"});
1354 var i = call.params.len;
1355 while (i != 0) {
1356 i -= 1;
1357 const param_node = call.params.at(i);
1358 try stack.append(RenderState { .Expression = param_node});
1359 if (i != 0) {
1360 try stack.append(RenderState { .Text = ", " });
1361 }
1362 }
1363 try stack.append(RenderState { .Text = "("});
1364 try stack.append(RenderState { .Expression = call.callee });
1365 },
1328 ast.Node.Id.FnProto => @panic("TODO fn proto in an expression"),1366 ast.Node.Id.FnProto => @panic("TODO fn proto in an expression"),
1329 ast.Node.Id.LineComment => @panic("TODO render line comment in an expression"),1367 ast.Node.Id.LineComment => @panic("TODO render line comment in an expression"),
13301368
...@@ -1610,4 +1648,14 @@ test "zig fmt" {...@@ -1610,4 +1648,14 @@ test "zig fmt" {
1610 \\}1648 \\}
1611 \\1649 \\
1612 );1650 );
1651
1652 try testCanonical(
1653 \\test "test calls" {
1654 \\ a();
1655 \\ a(1);
1656 \\ a(1, 2);
1657 \\ a(1, 2) + a(1, 2);
1658 \\}
1659 \\
1660 );
1613}1661}