authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-16 12:18:56+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-12-16 12:45:00+02:00
log04dc0bd0e4f7bc7c23e9d0e30b5d2b6153e2c0d5
tree519b41d69c3df12801f6616481f71ed7497d262a
parenta37caaa5285ed6c040675a94dbd639e881ad72b6
signature Commit is signed but in an unrecognized format.

translate-c-2 variable aliasing

3 files changed, 178 insertions(+), 261 deletions(-)

src-self-hosted/c_tokenizer.zig+1-1
...@@ -6,7 +6,7 @@ pub const TokenList = std.SegmentedList(CToken, 32);...@@ -6,7 +6,7 @@ pub const TokenList = std.SegmentedList(CToken, 32);
6pub const CToken = struct {6pub const CToken = struct {
7 id: Id,7 id: Id,
8 bytes: []const u8,8 bytes: []const u8,
9 num_lit_suffix: NumLitSuffix = undefined,9 num_lit_suffix: NumLitSuffix = .None,
1010
11 pub const Id = enum {11 pub const Id = enum {
12 CharLit,12 CharLit,
src-self-hosted/translate_c.zig+147-257
...@@ -45,26 +45,26 @@ const Scope = struct {...@@ -45,26 +45,26 @@ const Scope = struct {
4545
46 const Id = enum {46 const Id = enum {
47 Switch,47 Switch,
48 Var,
49 Block,48 Block,
50 Root,49 Root,
51 While,50 While,
52 FnDef,51 FnDef,
52 Ref,
53 };53 };
5454
55 const Switch = struct {55 const Switch = struct {
56 base: Scope,56 base: Scope,
57 };57 };
5858
59 const Var = struct {59 /// used when getting a member `a.b`
60 const Ref = struct {
60 base: Scope,61 base: Scope,
61 c_name: []const u8,
62 zig_name: []const u8,
63 };62 };
6463
65 const Block = struct {64 const Block = struct {
66 base: Scope,65 base: Scope,
67 block_node: *ast.Node.Block,66 block_node: *ast.Node.Block,
67 variables: AliasList,
6868
69 /// Don't forget to set rbrace token later69 /// Don't forget to set rbrace token later
70 fn init(c: *Context, parent: *Scope, block_node: *ast.Node.Block) !*Block {70 fn init(c: *Context, parent: *Scope, block_node: *ast.Node.Block) !*Block {
...@@ -75,9 +75,28 @@ const Scope = struct {...@@ -75,9 +75,28 @@ const Scope = struct {
75 .parent = parent,75 .parent = parent,
76 },76 },
77 .block_node = block_node,77 .block_node = block_node,
78 .variables = AliasList.init(c.a()),
78 };79 };
79 return block;80 return block;
80 }81 }
82
83 fn getAlias(scope: *Block, name: []const u8) ?[]const u8 {
84 var it = scope.variables.iterator(0);
85 while (it.next()) |p| {
86 if (std.mem.eql(u8, p.name, name))
87 return p.alias;
88 }
89 return scope.base.parent.?.getAlias(name);
90 }
91
92 fn contains(scope: *Block, name: []const u8) bool {
93 var it = scope.variables.iterator(0);
94 while (it.next()) |p| {
95 if (std.mem.eql(u8, p.name, name))
96 return true;
97 }
98 return scope.base.parent.?.contains(name);
99 }
81 };100 };
82101
83 const Root = struct {102 const Root = struct {
...@@ -155,26 +174,24 @@ const Scope = struct {...@@ -155,26 +174,24 @@ const Scope = struct {
155 fn getAlias(scope: *Scope, name: []const u8) ?[]const u8 {174 fn getAlias(scope: *Scope, name: []const u8) ?[]const u8 {
156 return switch (scope.id) {175 return switch (scope.id) {
157 .Root => null,176 .Root => null,
177 .Ref => null,
158 .FnDef => @fieldParentPtr(FnDef, "base", scope).getAlias(name),178 .FnDef => @fieldParentPtr(FnDef, "base", scope).getAlias(name),
179 .Block => @fieldParentPtr(Block, "base", scope).getAlias(name),
159 else => @panic("TODO Scope.getAlias"),180 else => @panic("TODO Scope.getAlias"),
160 };181 };
161 }182 }
162183
163 fn contains(scope: *Scope, name: []const u8) bool {184 fn contains(scope: *Scope, name: []const u8) bool {
164 return switch (scope.id) {185 return switch (scope.id) {
186 .Ref => false,
165 .Root => @fieldParentPtr(Root, "base", scope).contains(name),187 .Root => @fieldParentPtr(Root, "base", scope).contains(name),
166 .FnDef => @fieldParentPtr(FnDef, "base", scope).contains(name),188 .FnDef => @fieldParentPtr(FnDef, "base", scope).contains(name),
189 .Block => @fieldParentPtr(Block, "base", scope).contains(name),
167 else => @panic("TODO Scope.contains"),190 else => @panic("TODO Scope.contains"),
168 };191 };
169 }192 }
170};193};
171194
172const TransResult = struct {
173 node: *ast.Node,
174 node_scope: *Scope,
175 child_scope: *Scope,
176};
177
178const Context = struct {195const Context = struct {
179 tree: *ast.Tree,196 tree: *ast.Tree,
180 source_buffer: *std.Buffer,197 source_buffer: *std.Buffer,
...@@ -388,14 +405,14 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {...@@ -388,14 +405,14 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
388405
389 // actual function definition with body406 // actual function definition with body
390 const body_stmt = ZigClangFunctionDecl_getBody(fn_decl);407 const body_stmt = ZigClangFunctionDecl_getBody(fn_decl);
391 const result = transStmt(rp, scope, body_stmt, .unused, .r_value) catch |err| switch (err) {408 const body_node = transStmt(rp, scope, body_stmt, .unused, .r_value) catch |err| switch (err) {
392 error.OutOfMemory => |e| return e,409 error.OutOfMemory => |e| return e,
393 error.UnsupportedTranslation,410 error.UnsupportedTranslation,
394 error.UnsupportedType,411 error.UnsupportedType,
395 => return failDecl(c, fn_decl_loc, fn_name, "unable to translate function", .{}),412 => return failDecl(c, fn_decl_loc, fn_name, "unable to translate function", .{}),
396 };413 };
397 assert(result.node.id == ast.Node.Id.Block);414 assert(body_node.id == .Block);
398 proto_node.body_node = result.node;415 proto_node.body_node = body_node;
399416
400 return addTopLevelDecl(c, fn_name, &proto_node.base);417 return addTopLevelDecl(c, fn_name, &proto_node.base);
401}418}
...@@ -431,7 +448,7 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {...@@ -431,7 +448,7 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
431 else448 else
432 try appendToken(c, .Keyword_var, "var");449 try appendToken(c, .Keyword_var, "var");
433450
434 const name_tok = try appendIdentifier(c, var_name, null);451 const name_tok = try appendIdentifier(c, var_name);
435452
436 _ = try appendToken(c, .Colon, ":");453 _ = try appendToken(c, .Colon, ":");
437 const type_node = transQualType(rp, qual_type, var_decl_loc) catch |err| switch (err) {454 const type_node = transQualType(rp, qual_type, var_decl_loc) catch |err| switch (err) {
...@@ -446,17 +463,16 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {...@@ -446,17 +463,16 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
446463
447 if (ZigClangVarDecl_hasInit(var_decl)) {464 if (ZigClangVarDecl_hasInit(var_decl)) {
448 eq_tok = try appendToken(c, .Equal, "=");465 eq_tok = try appendToken(c, .Equal, "=");
449 init_node = if (ZigClangVarDecl_getInit(var_decl)) |expr| blk: {466 init_node = if (ZigClangVarDecl_getInit(var_decl)) |expr|
450 var res = transExpr(rp, &c.global_scope.base, expr, .used, .r_value) catch |err| switch (err) {467 transExpr(rp, &c.global_scope.base, expr, .used, .r_value) catch |err| switch (err) {
451 error.UnsupportedTranslation,468 error.UnsupportedTranslation,
452 error.UnsupportedType,469 error.UnsupportedType,
453 => {470 => {
454 return failDecl(c, var_decl_loc, var_name, "unable to translate initializer", .{});471 return failDecl(c, var_decl_loc, var_name, "unable to translate initializer", .{});
455 },472 },
456 error.OutOfMemory => |e| return e,473 error.OutOfMemory => |e| return e,
457 };474 }
458 break :blk res.node;475 else
459 } else
460 try transCreateNodeUndefinedLiteral(c);476 try transCreateNodeUndefinedLiteral(c);
461 } else if (storage_class != .Extern) {477 } else if (storage_class != .Extern) {
462 return failDecl(c, var_decl_loc, var_name, "non-extern variable has no initializer", .{});478 return failDecl(c, var_decl_loc, var_name, "non-extern variable has no initializer", .{});
...@@ -492,7 +508,7 @@ fn resolveTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl) Err...@@ -492,7 +508,7 @@ fn resolveTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl) Err
492508
493 const typedef_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, typedef_decl)));509 const typedef_name = try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, typedef_decl)));
494 _ = try c.decl_table.put(@ptrToInt(ZigClangTypedefNameDecl_getCanonicalDecl(typedef_decl)), typedef_name);510 _ = try c.decl_table.put(@ptrToInt(ZigClangTypedefNameDecl_getCanonicalDecl(typedef_decl)), typedef_name);
495 const name_tok = try appendIdentifier(c, typedef_name, null);511 const name_tok = try appendIdentifier(c, typedef_name);
496 const eq_tok = try appendToken(c, .Equal, "=");512 const eq_tok = try appendToken(c, .Equal, "=");
497513
498 const child_qt = ZigClangTypedefNameDecl_getUnderlyingType(typedef_decl);514 const child_qt = ZigClangTypedefNameDecl_getUnderlyingType(typedef_decl);
...@@ -545,7 +561,7 @@ fn resolveRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!...@@ -545,7 +561,7 @@ fn resolveRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!
545561
546 const name = try std.fmt.allocPrint(c.a(), "{}_{}", .{ container_kind_name, bare_name });562 const name = try std.fmt.allocPrint(c.a(), "{}_{}", .{ container_kind_name, bare_name });
547 _ = try c.decl_table.put(@ptrToInt(ZigClangRecordDecl_getCanonicalDecl(record_decl)), name);563 _ = try c.decl_table.put(@ptrToInt(ZigClangRecordDecl_getCanonicalDecl(record_decl)), name);
548 const name_tok = try appendIdentifier(c, name, null);564 const name_tok = try appendIdentifier(c, name);
549565
550 const eq_tok = try appendToken(c, .Equal, "=");566 const eq_tok = try appendToken(c, .Equal, "=");
551 const init_node = transRecordDecl(c, record_decl) catch |err| switch (err) {567 const init_node = transRecordDecl(c, record_decl) catch |err| switch (err) {
...@@ -581,10 +597,10 @@ fn resolveRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!...@@ -581,10 +597,10 @@ fn resolveRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!
581fn createAlias(c: *Context, alias: var) !void {597fn createAlias(c: *Context, alias: var) !void {
582 const visib_tok = try appendToken(c, .Keyword_pub, "pub");598 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
583 const mut_tok = try appendToken(c, .Keyword_const, "const");599 const mut_tok = try appendToken(c, .Keyword_const, "const");
584 const name_tok = try appendIdentifier(c, alias.alias, null);600 const name_tok = try appendIdentifier(c, alias.alias);
585601
586 const eq_tok = try appendToken(c, .Equal, "=");602 const eq_tok = try appendToken(c, .Equal, "=");
587 const init_node = try transCreateNodeIdentifier(c, alias.name, null);603 const init_node = try transCreateNodeIdentifier(c, alias.name);
588604
589 const node = try c.a().create(ast.Node.VarDecl);605 const node = try c.a().create(ast.Node.VarDecl);
590 node.* = ast.Node.VarDecl{606 node.* = ast.Node.VarDecl{
...@@ -622,7 +638,7 @@ fn transStmt(...@@ -622,7 +638,7 @@ fn transStmt(
622 stmt: *const ZigClangStmt,638 stmt: *const ZigClangStmt,
623 result_used: ResultUsed,639 result_used: ResultUsed,
624 lrvalue: LRValue,640 lrvalue: LRValue,
625) TransError!TransResult {641) TransError!*ast.Node {
626 const sc = ZigClangStmt_getStmtClass(stmt);642 const sc = ZigClangStmt_getStmtClass(stmt);
627 switch (sc) {643 switch (sc) {
628 .BinaryOperatorClass => return transBinaryOperator(rp, scope, @ptrCast(*const ZigClangBinaryOperator, stmt), result_used),644 .BinaryOperatorClass => return transBinaryOperator(rp, scope, @ptrCast(*const ZigClangBinaryOperator, stmt), result_used),
...@@ -654,7 +670,7 @@ fn transBinaryOperator(...@@ -654,7 +670,7 @@ fn transBinaryOperator(
654 scope: *Scope,670 scope: *Scope,
655 stmt: *const ZigClangBinaryOperator,671 stmt: *const ZigClangBinaryOperator,
656 result_used: ResultUsed,672 result_used: ResultUsed,
657) TransError!TransResult {673) TransError!*ast.Node {
658 const op = ZigClangBinaryOperator_getOpcode(stmt);674 const op = ZigClangBinaryOperator_getOpcode(stmt);
659 const qt = ZigClangBinaryOperator_getType(stmt);675 const qt = ZigClangBinaryOperator_getType(stmt);
660 switch (op) {676 switch (op) {
...@@ -665,67 +681,43 @@ fn transBinaryOperator(...@@ -665,67 +681,43 @@ fn transBinaryOperator(
665 "TODO: handle more C binary operators: {}",681 "TODO: handle more C binary operators: {}",
666 .{op},682 .{op},
667 ),683 ),
668 .Assign => return TransResult{684 .Assign => return &(try transCreateNodeAssign(rp, scope, result_used, ZigClangBinaryOperator_getLHS(stmt), ZigClangBinaryOperator_getRHS(stmt))).base,
669 .node = &(try transCreateNodeAssign(rp, scope, result_used, ZigClangBinaryOperator_getLHS(stmt), ZigClangBinaryOperator_getRHS(stmt))).base,
670 .child_scope = scope,
671 .node_scope = scope,
672 },
673 .Add => {685 .Add => {
674 const node = if (cIsUnsignedInteger(qt))686 const node = if (cIsUnsignedInteger(qt))
675 try transCreateNodeInfixOp(rp, scope, stmt, .AddWrap, .PlusPercent, "+%", true)687 try transCreateNodeInfixOp(rp, scope, stmt, .AddWrap, .PlusPercent, "+%", true)
676 else688 else
677 try transCreateNodeInfixOp(rp, scope, stmt, .Add, .Plus, "+", true);689 try transCreateNodeInfixOp(rp, scope, stmt, .Add, .Plus, "+", true);
678 return maybeSuppressResult(rp, scope, result_used, TransResult{690 return maybeSuppressResult(rp, scope, result_used, node);
679 .node = node,
680 .child_scope = scope,
681 .node_scope = scope,
682 });
683 },691 },
684 .Sub => {692 .Sub => {
685 const node = if (cIsUnsignedInteger(qt))693 const node = if (cIsUnsignedInteger(qt))
686 try transCreateNodeInfixOp(rp, scope, stmt, .SubWrap, .MinusPercent, "-%", true)694 try transCreateNodeInfixOp(rp, scope, stmt, .SubWrap, .MinusPercent, "-%", true)
687 else695 else
688 try transCreateNodeInfixOp(rp, scope, stmt, .Sub, .Minus, "-", true);696 try transCreateNodeInfixOp(rp, scope, stmt, .Sub, .Minus, "-", true);
689 return maybeSuppressResult(rp, scope, result_used, TransResult{697 return maybeSuppressResult(rp, scope, result_used, node);
690 .node = node,
691 .child_scope = scope,
692 .node_scope = scope,
693 });
694 },698 },
695 .Mul => {699 .Mul => {
696 const node = if (cIsUnsignedInteger(qt))700 const node = if (cIsUnsignedInteger(qt))
697 try transCreateNodeInfixOp(rp, scope, stmt, .MultWrap, .AsteriskPercent, "*%", true)701 try transCreateNodeInfixOp(rp, scope, stmt, .MultWrap, .AsteriskPercent, "*%", true)
698 else702 else
699 try transCreateNodeInfixOp(rp, scope, stmt, .Mult, .Asterisk, "*", true);703 try transCreateNodeInfixOp(rp, scope, stmt, .Mult, .Asterisk, "*", true);
700 return maybeSuppressResult(rp, scope, result_used, TransResult{704 return maybeSuppressResult(rp, scope, result_used, node);
701 .node = node,
702 .child_scope = scope,
703 .node_scope = scope,
704 });
705 },705 },
706 .Div => {706 .Div => {
707 if (!cIsUnsignedInteger(qt)) {707 if (!cIsUnsignedInteger(qt)) {
708 // signed integer division uses @divTrunc708 // signed integer division uses @divTrunc
709 const div_trunc_node = try transCreateNodeBuiltinFnCall(rp.c, "@divTrunc");709 const div_trunc_node = try transCreateNodeBuiltinFnCall(rp.c, "@divTrunc");
710 const lhs = try transExpr(rp, scope, ZigClangBinaryOperator_getLHS(stmt), .used, .l_value);710 const lhs = try transExpr(rp, scope, ZigClangBinaryOperator_getLHS(stmt), .used, .l_value);
711 try div_trunc_node.params.push(lhs.node);711 try div_trunc_node.params.push(lhs);
712 _ = try appendToken(rp.c, .Comma, ",");712 _ = try appendToken(rp.c, .Comma, ",");
713 const rhs = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value);713 const rhs = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value);
714 try div_trunc_node.params.push(rhs.node);714 try div_trunc_node.params.push(rhs);
715 div_trunc_node.rparen_token = try appendToken(rp.c, .RParen, ")");715 div_trunc_node.rparen_token = try appendToken(rp.c, .RParen, ")");
716 return maybeSuppressResult(rp, scope, result_used, TransResult{716 return maybeSuppressResult(rp, scope, result_used, &div_trunc_node.base);
717 .node = &div_trunc_node.base,
718 .child_scope = scope,
719 .node_scope = scope,
720 });
721 } else {717 } else {
722 // unsigned/float division uses the operator718 // unsigned/float division uses the operator
723 const node = try transCreateNodeInfixOp(rp, scope, stmt, .Div, .Slash, "/", true);719 const node = try transCreateNodeInfixOp(rp, scope, stmt, .Div, .Slash, "/", true);
724 return maybeSuppressResult(rp, scope, result_used, TransResult{720 return maybeSuppressResult(rp, scope, result_used, node);
725 .node = node,
726 .child_scope = scope,
727 .node_scope = scope,
728 });
729 }721 }
730 },722 },
731 .Rem => {723 .Rem => {
...@@ -733,24 +725,16 @@ fn transBinaryOperator(...@@ -733,24 +725,16 @@ fn transBinaryOperator(
733 // signed integer division uses @rem725 // signed integer division uses @rem
734 const rem_node = try transCreateNodeBuiltinFnCall(rp.c, "@rem");726 const rem_node = try transCreateNodeBuiltinFnCall(rp.c, "@rem");
735 const lhs = try transExpr(rp, scope, ZigClangBinaryOperator_getLHS(stmt), .used, .l_value);727 const lhs = try transExpr(rp, scope, ZigClangBinaryOperator_getLHS(stmt), .used, .l_value);
736 try rem_node.params.push(lhs.node);728 try rem_node.params.push(lhs);
737 _ = try appendToken(rp.c, .Comma, ",");729 _ = try appendToken(rp.c, .Comma, ",");
738 const rhs = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value);730 const rhs = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value);
739 try rem_node.params.push(rhs.node);731 try rem_node.params.push(rhs);
740 rem_node.rparen_token = try appendToken(rp.c, .RParen, ")");732 rem_node.rparen_token = try appendToken(rp.c, .RParen, ")");
741 return maybeSuppressResult(rp, scope, result_used, TransResult{733 return maybeSuppressResult(rp, scope, result_used, &rem_node.base);
742 .node = &rem_node.base,
743 .child_scope = scope,
744 .node_scope = scope,
745 });
746 } else {734 } else {
747 // unsigned/float division uses the operator735 // unsigned/float division uses the operator
748 const node = try transCreateNodeInfixOp(rp, scope, stmt, .Mod, .Percent, "%", true);736 const node = try transCreateNodeInfixOp(rp, scope, stmt, .Mod, .Percent, "%", true);
749 return maybeSuppressResult(rp, scope, result_used, TransResult{737 return maybeSuppressResult(rp, scope, result_used, node);
750 .node = node,
751 .child_scope = scope,
752 .node_scope = scope,
753 });
754 }738 }
755 },739 },
756 .Shl,740 .Shl,
...@@ -793,33 +777,22 @@ fn transCompoundStmtInline(...@@ -793,33 +777,22 @@ fn transCompoundStmtInline(
793 parent_scope: *Scope,777 parent_scope: *Scope,
794 stmt: *const ZigClangCompoundStmt,778 stmt: *const ZigClangCompoundStmt,
795 block_node: *ast.Node.Block,779 block_node: *ast.Node.Block,
796) TransError!TransResult {780) TransError!void {
797 var it = ZigClangCompoundStmt_body_begin(stmt);781 var it = ZigClangCompoundStmt_body_begin(stmt);
798 const end_it = ZigClangCompoundStmt_body_end(stmt);782 const end_it = ZigClangCompoundStmt_body_end(stmt);
799 var scope = parent_scope;
800 while (it != end_it) : (it += 1) {783 while (it != end_it) : (it += 1) {
801 const result = try transStmt(rp, parent_scope, it[0], .unused, .r_value);784 const result = try transStmt(rp, parent_scope, it[0], .unused, .r_value);
802 scope = result.child_scope;785 if (result != &block_node.base)
803 if (result.node != &block_node.base)786 try block_node.statements.push(result);
804 try block_node.statements.push(result.node);
805 }787 }
806 return TransResult{
807 .node = &block_node.base,
808 .child_scope = scope,
809 .node_scope = scope,
810 };
811}788}
812789
813fn transCompoundStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCompoundStmt) TransError!TransResult {790fn transCompoundStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCompoundStmt) TransError!*ast.Node {
814 const block_node = try transCreateNodeBlock(rp.c, null, null);791 const block_node = try transCreateNodeBlock(rp.c, null);
815 const block_scope = try Scope.Block.init(rp.c, scope, block_node);792 const block_scope = try Scope.Block.init(rp.c, scope, block_node);
816 const inline_result = try transCompoundStmtInline(rp, &block_scope.base, stmt, block_node);793 try transCompoundStmtInline(rp, &block_scope.base, stmt, block_node);
817 block_node.rbrace = try appendToken(rp.c, .RBrace, "}");794 block_node.rbrace = try appendToken(rp.c, .RBrace, "}");
818 return TransResult{795 return &block_node.base;
819 .node = &block_node.base,
820 .node_scope = inline_result.node_scope,
821 .child_scope = inline_result.child_scope,
822 };
823}796}
824797
825fn transCStyleCastExprClass(798fn transCStyleCastExprClass(
...@@ -828,7 +801,7 @@ fn transCStyleCastExprClass(...@@ -828,7 +801,7 @@ fn transCStyleCastExprClass(
828 stmt: *const ZigClangCStyleCastExpr,801 stmt: *const ZigClangCStyleCastExpr,
829 result_used: ResultUsed,802 result_used: ResultUsed,
830 lrvalue: LRValue,803 lrvalue: LRValue,
831) !TransResult {804) TransError!*ast.Node {
832 const sub_expr = ZigClangCStyleCastExpr_getSubExpr(stmt);805 const sub_expr = ZigClangCStyleCastExpr_getSubExpr(stmt);
833 const cast_node = (try transCCast(806 const cast_node = (try transCCast(
834 rp,807 rp,
...@@ -836,20 +809,14 @@ fn transCStyleCastExprClass(...@@ -836,20 +809,14 @@ fn transCStyleCastExprClass(
836 ZigClangCStyleCastExpr_getBeginLoc(stmt),809 ZigClangCStyleCastExpr_getBeginLoc(stmt),
837 ZigClangCStyleCastExpr_getType(stmt),810 ZigClangCStyleCastExpr_getType(stmt),
838 ZigClangExpr_getType(sub_expr),811 ZigClangExpr_getType(sub_expr),
839 (try transExpr(rp, scope, sub_expr, .used, lrvalue)).node,812 try transExpr(rp, scope, sub_expr, .used, lrvalue),
840 ));813 ));
841 const cast_res = TransResult{814 return maybeSuppressResult(rp, scope, result_used, cast_node);
842 .node = cast_node,
843 .child_scope = scope,
844 .node_scope = scope,
845 };
846 return maybeSuppressResult(rp, scope, result_used, cast_res);
847}815}
848816
849fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDeclStmt) TransError!TransResult {817fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt) TransError!*ast.Node {
850 const c = rp.c;818 const c = rp.c;
851 const block_scope = parent_scope.findBlockScope();819 const block_scope = scope.findBlockScope();
852 var scope = parent_scope;
853820
854 var it = ZigClangDeclStmt_decl_begin(stmt);821 var it = ZigClangDeclStmt_decl_begin(stmt);
855 const end_it = ZigClangDeclStmt_decl_end(stmt);822 const end_it = ZigClangDeclStmt_decl_end(stmt);
...@@ -867,18 +834,14 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe...@@ -867,18 +834,14 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe
867 try appendToken(c, .Keyword_const, "const")834 try appendToken(c, .Keyword_const, "const")
868 else835 else
869 try appendToken(c, .Keyword_var, "var");836 try appendToken(c, .Keyword_var, "var");
870 const c_name = try c.str(ZigClangDecl_getName_bytes_begin(837 const name = try c.str(ZigClangDecl_getName_bytes_begin(
871 @ptrCast(*const ZigClangDecl, var_decl),838 @ptrCast(*const ZigClangDecl, var_decl),
872 ));839 ));
873 const name_token = try appendIdentifier(c, c_name, null); // TODO parent_scope);840 const checked_name = if (try scope.createAlias(c, name)) |a| blk: {
874841 try block_scope.variables.push(.{ .name = name, .alias = a });
875 const var_scope = try c.a().create(Scope.Var);842 break :blk a;
876 var_scope.* = Scope.Var{843 } else name;
877 .base = Scope{ .id = .Var, .parent = scope },844 const name_token = try appendIdentifier(c, checked_name);
878 .c_name = c_name,
879 .zig_name = c_name, // TODO: getWantedName
880 };
881 scope = &var_scope.base;
882845
883 const colon_token = try appendToken(c, .Colon, ":");846 const colon_token = try appendToken(c, .Colon, ":");
884 const loc = ZigClangStmt_getBeginLoc(@ptrCast(*const ZigClangStmt, stmt));847 const loc = ZigClangStmt_getBeginLoc(@ptrCast(*const ZigClangStmt, stmt));
...@@ -886,7 +849,7 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe...@@ -886,7 +849,7 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe
886849
887 const eq_token = try appendToken(c, .Equal, "=");850 const eq_token = try appendToken(c, .Equal, "=");
888 const init_node = if (ZigClangVarDecl_getInit(var_decl)) |expr|851 const init_node = if (ZigClangVarDecl_getInit(var_decl)) |expr|
889 (try transExpr(rp, scope, expr, .used, .r_value)).node852 try transExpr(rp, scope, expr, .used, .r_value)
890 else853 else
891 try transCreateNodeUndefinedLiteral(c);854 try transCreateNodeUndefinedLiteral(c);
892 const semicolon_token = try appendToken(c, .Semicolon, ";");855 const semicolon_token = try appendToken(c, .Semicolon, ";");
...@@ -910,7 +873,6 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe...@@ -910,7 +873,6 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe
910 };873 };
911 try block_scope.block_node.statements.push(&node.base);874 try block_scope.block_node.statements.push(&node.base);
912 },875 },
913
914 else => |kind| return revertAndWarn(876 else => |kind| return revertAndWarn(
915 rp,877 rp,
916 error.UnsupportedTranslation,878 error.UnsupportedTranslation,
...@@ -920,12 +882,7 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe...@@ -920,12 +882,7 @@ fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDe
920 ),882 ),
921 }883 }
922 }884 }
923885 return &block_scope.block_node.base;
924 return TransResult{
925 .node = &block_scope.block_node.base,
926 .node_scope = scope,
927 .child_scope = scope,
928 };
929}886}
930887
931fn transDeclRefExpr(888fn transDeclRefExpr(
...@@ -933,17 +890,12 @@ fn transDeclRefExpr(...@@ -933,17 +890,12 @@ fn transDeclRefExpr(
933 scope: *Scope,890 scope: *Scope,
934 expr: *const ZigClangDeclRefExpr,891 expr: *const ZigClangDeclRefExpr,
935 lrvalue: LRValue,892 lrvalue: LRValue,
936) !TransResult {893) TransError!*ast.Node {
937 const value_decl = ZigClangDeclRefExpr_getDecl(expr);894 const value_decl = ZigClangDeclRefExpr_getDecl(expr);
938 const c_name = try rp.c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, value_decl)));895 const name = try rp.c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, value_decl)));
939 const zig_name = transLookupZigIdentifier(scope, c_name);896 const checked_name = if (scope.getAlias(name)) |a| a else name;
940 if (lrvalue == .l_value) try rp.c.ptr_params.put(zig_name);897 if (lrvalue == .l_value) try rp.c.ptr_params.put(checked_name);
941 const node = try transCreateNodeIdentifier(rp.c, zig_name, null); // TODO scope);898 return transCreateNodeIdentifier(rp.c, checked_name);
942 return TransResult{
943 .node = node,
944 .node_scope = scope,
945 .child_scope = scope,
946 };
947}899}
948900
949fn transImplicitCastExpr(901fn transImplicitCastExpr(
...@@ -951,7 +903,7 @@ fn transImplicitCastExpr(...@@ -951,7 +903,7 @@ fn transImplicitCastExpr(
951 scope: *Scope,903 scope: *Scope,
952 expr: *const ZigClangImplicitCastExpr,904 expr: *const ZigClangImplicitCastExpr,
953 result_used: ResultUsed,905 result_used: ResultUsed,
954) !TransResult {906) TransError!*ast.Node {
955 const c = rp.c;907 const c = rp.c;
956 const sub_expr = ZigClangImplicitCastExpr_getSubExpr(expr);908 const sub_expr = ZigClangImplicitCastExpr_getSubExpr(expr);
957 const sub_expr_node = try transExpr(rp, scope, @ptrCast(*const ZigClangExpr, sub_expr), .used, .r_value);909 const sub_expr_node = try transExpr(rp, scope, @ptrCast(*const ZigClangExpr, sub_expr), .used, .r_value);
...@@ -959,20 +911,12 @@ fn transImplicitCastExpr(...@@ -959,20 +911,12 @@ fn transImplicitCastExpr(
959 .BitCast => {911 .BitCast => {
960 const dest_type = getExprQualType(c, @ptrCast(*const ZigClangExpr, expr));912 const dest_type = getExprQualType(c, @ptrCast(*const ZigClangExpr, expr));
961 const src_type = getExprQualType(c, sub_expr);913 const src_type = getExprQualType(c, sub_expr);
962 return TransResult{914 return transCCast(rp, scope, ZigClangImplicitCastExpr_getBeginLoc(expr), dest_type, src_type, sub_expr_node);
963 .node = try transCCast(rp, scope, ZigClangImplicitCastExpr_getBeginLoc(expr), dest_type, src_type, sub_expr_node.node),
964 .node_scope = scope,
965 .child_scope = scope,
966 };
967 },915 },
968 .IntegralCast => {916 .IntegralCast => {
969 const dest_type = ZigClangExpr_getType(@ptrCast(*const ZigClangExpr, expr));917 const dest_type = ZigClangExpr_getType(@ptrCast(*const ZigClangExpr, expr));
970 const src_type = ZigClangExpr_getType(sub_expr);918 const src_type = ZigClangExpr_getType(sub_expr);
971 return TransResult{919 return transCCast(rp, scope, ZigClangImplicitCastExpr_getBeginLoc(expr), dest_type, src_type, sub_expr_node);
972 .node = try transCCast(rp, scope, ZigClangImplicitCastExpr_getBeginLoc(expr), dest_type, src_type, sub_expr_node.node),
973 .node_scope = scope,
974 .child_scope = scope,
975 };
976 },920 },
977 .FunctionToPointerDecay, .ArrayToPointerDecay => {921 .FunctionToPointerDecay, .ArrayToPointerDecay => {
978 return maybeSuppressResult(rp, scope, result_used, sub_expr_node);922 return maybeSuppressResult(rp, scope, result_used, sub_expr_node);
...@@ -981,11 +925,7 @@ fn transImplicitCastExpr(...@@ -981,11 +925,7 @@ fn transImplicitCastExpr(
981 return transExpr(rp, scope, sub_expr, .used, .r_value);925 return transExpr(rp, scope, sub_expr, .used, .r_value);
982 },926 },
983 .NullToPointer => {927 .NullToPointer => {
984 return TransResult{928 return transCreateNodeNullLiteral(rp.c);
985 .node = try transCreateNodeNullLiteral(rp.c),
986 .node_scope = scope,
987 .child_scope = scope,
988 };
989 },929 },
990 else => |kind| return revertAndWarn(930 else => |kind| return revertAndWarn(
991 rp,931 rp,
...@@ -1002,36 +942,27 @@ fn transIntegerLiteral(...@@ -1002,36 +942,27 @@ fn transIntegerLiteral(
1002 scope: *Scope,942 scope: *Scope,
1003 expr: *const ZigClangIntegerLiteral,943 expr: *const ZigClangIntegerLiteral,
1004 result_used: ResultUsed,944 result_used: ResultUsed,
1005) !TransResult {945) TransError!*ast.Node {
1006 var eval_result: ZigClangExprEvalResult = undefined;946 var eval_result: ZigClangExprEvalResult = undefined;
1007 if (!ZigClangIntegerLiteral_EvaluateAsInt(expr, &eval_result, rp.c.clang_context)) {947 if (!ZigClangIntegerLiteral_EvaluateAsInt(expr, &eval_result, rp.c.clang_context)) {
1008 const loc = ZigClangIntegerLiteral_getBeginLoc(expr);948 const loc = ZigClangIntegerLiteral_getBeginLoc(expr);
1009 return revertAndWarn(rp, error.UnsupportedTranslation, loc, "invalid integer literal", .{});949 return revertAndWarn(rp, error.UnsupportedTranslation, loc, "invalid integer literal", .{});
1010 }950 }
1011 const node = try transCreateNodeAPInt(rp.c, ZigClangAPValue_getInt(&eval_result.Val));951 const node = try transCreateNodeAPInt(rp.c, ZigClangAPValue_getInt(&eval_result.Val));
1012 const res = TransResult{952 return maybeSuppressResult(rp, scope, result_used, node);
1013 .node = node,
1014 .child_scope = scope,
1015 .node_scope = scope,
1016 };
1017 return maybeSuppressResult(rp, scope, result_used, res);
1018}953}
1019954
1020fn transReturnStmt(955fn transReturnStmt(
1021 rp: RestorePoint,956 rp: RestorePoint,
1022 scope: *Scope,957 scope: *Scope,
1023 expr: *const ZigClangReturnStmt,958 expr: *const ZigClangReturnStmt,
1024) !TransResult {959) TransError!*ast.Node {
1025 const node = try transCreateNodeReturnExpr(rp.c);960 const node = try transCreateNodeReturnExpr(rp.c);
1026 if (ZigClangReturnStmt_getRetValue(expr)) |val_expr| {961 if (ZigClangReturnStmt_getRetValue(expr)) |val_expr| {
1027 node.rhs = (try transExpr(rp, scope, val_expr, .used, .r_value)).node;962 node.rhs = try transExpr(rp, scope, val_expr, .used, .r_value);
1028 }963 }
1029 _ = try appendToken(rp.c, .Semicolon, ";");964 _ = try appendToken(rp.c, .Semicolon, ";");
1030 return TransResult{965 return &node.base;
1031 .node = &node.base,
1032 .child_scope = scope,
1033 .node_scope = scope,
1034 };
1035}966}
1036967
1037fn transStringLiteral(968fn transStringLiteral(
...@@ -1039,7 +970,7 @@ fn transStringLiteral(...@@ -1039,7 +970,7 @@ fn transStringLiteral(
1039 scope: *Scope,970 scope: *Scope,
1040 stmt: *const ZigClangStringLiteral,971 stmt: *const ZigClangStringLiteral,
1041 result_used: ResultUsed,972 result_used: ResultUsed,
1042) !TransResult {973) TransError!*ast.Node {
1043 const kind = ZigClangStringLiteral_getKind(stmt);974 const kind = ZigClangStringLiteral_getKind(stmt);
1044 switch (kind) {975 switch (kind) {
1045 .Ascii, .UTF8 => {976 .Ascii, .UTF8 => {
...@@ -1061,12 +992,7 @@ fn transStringLiteral(...@@ -1061,12 +992,7 @@ fn transStringLiteral(
1061 node.* = ast.Node.StringLiteral{992 node.* = ast.Node.StringLiteral{
1062 .token = token,993 .token = token,
1063 };994 };
1064 const res = TransResult{995 return maybeSuppressResult(rp, scope, result_used, &node.base);
1065 .node = &node.base,
1066 .child_scope = scope,
1067 .node_scope = scope,
1068 };
1069 return maybeSuppressResult(rp, scope, result_used, res);
1070 },996 },
1071 .UTF16, .UTF32, .Wide => return revertAndWarn(997 .UTF16, .UTF32, .Wide => return revertAndWarn(
1072 rp,998 rp,
...@@ -1159,7 +1085,7 @@ fn transExpr(...@@ -1159,7 +1085,7 @@ fn transExpr(
1159 expr: *const ZigClangExpr,1085 expr: *const ZigClangExpr,
1160 used: ResultUsed,1086 used: ResultUsed,
1161 lrvalue: LRValue,1087 lrvalue: LRValue,
1162) TransError!TransResult {1088) TransError!*ast.Node {
1163 return transStmt(rp, scope, @ptrCast(*const ZigClangStmt, expr), used, lrvalue);1089 return transStmt(rp, scope, @ptrCast(*const ZigClangStmt, expr), used, lrvalue);
1164}1090}
11651091
...@@ -1168,7 +1094,7 @@ fn transInitListExpr(...@@ -1168,7 +1094,7 @@ fn transInitListExpr(
1168 scope: *Scope,1094 scope: *Scope,
1169 expr: *const ZigClangInitListExpr,1095 expr: *const ZigClangInitListExpr,
1170 used: ResultUsed,1096 used: ResultUsed,
1171) TransError!TransResult {1097) TransError!*ast.Node {
1172 const qt = getExprQualType(rp.c, @ptrCast(*const ZigClangExpr, expr));1098 const qt = getExprQualType(rp.c, @ptrCast(*const ZigClangExpr, expr));
1173 const qual_type = ZigClangQualType_getTypePtr(qt);1099 const qual_type = ZigClangQualType_getTypePtr(qt);
1174 const source_loc = ZigClangExpr_getBeginLoc(@ptrCast(*const ZigClangExpr, expr));1100 const source_loc = ZigClangExpr_getBeginLoc(@ptrCast(*const ZigClangExpr, expr));
...@@ -1199,16 +1125,12 @@ fn transInitListExpr(...@@ -1199,16 +1125,12 @@ fn transInitListExpr(
1199 var i: c_uint = 0;1125 var i: c_uint = 0;
1200 while (i < init_count) : (i += 1) {1126 while (i < init_count) : (i += 1) {
1201 const elem_expr = ZigClangInitListExpr_getInit(expr, i);1127 const elem_expr = ZigClangInitListExpr_getInit(expr, i);
1202 try init_node.op.ArrayInitializer.push((try transExpr(rp, scope, elem_expr, .used, .r_value)).node);1128 try init_node.op.ArrayInitializer.push(try transExpr(rp, scope, elem_expr, .used, .r_value));
1203 _ = try appendToken(rp.c, .Comma, ",");1129 _ = try appendToken(rp.c, .Comma, ",");
1204 }1130 }
1205 init_node.rtoken = try appendToken(rp.c, .RBrace, "}");1131 init_node.rtoken = try appendToken(rp.c, .RBrace, "}");
1206 if (leftover_count == 0) {1132 if (leftover_count == 0) {
1207 return TransResult{1133 return &init_node.base;
1208 .node = &init_node.base,
1209 .child_scope = scope,
1210 .node_scope = scope,
1211 };
1212 }1134 }
1213 cat_tok = try appendToken(rp.c, .PlusPlus, "++");1135 cat_tok = try appendToken(rp.c, .PlusPlus, "++");
1214 }1136 }
...@@ -1216,7 +1138,7 @@ fn transInitListExpr(...@@ -1216,7 +1138,7 @@ fn transInitListExpr(
1216 const dot_tok = try appendToken(rp.c, .Period, ".");1138 const dot_tok = try appendToken(rp.c, .Period, ".");
1217 var filler_init_node = try transCreateNodeArrayInitializer(rp.c, dot_tok);1139 var filler_init_node = try transCreateNodeArrayInitializer(rp.c, dot_tok);
1218 const filler_val_expr = ZigClangInitListExpr_getArrayFiller(expr);1140 const filler_val_expr = ZigClangInitListExpr_getArrayFiller(expr);
1219 try filler_init_node.op.ArrayInitializer.push((try transExpr(rp, scope, filler_val_expr, .used, .r_value)).node);1141 try filler_init_node.op.ArrayInitializer.push(try transExpr(rp, scope, filler_val_expr, .used, .r_value));
1220 filler_init_node.rtoken = try appendToken(rp.c, .RBrace, "}");1142 filler_init_node.rtoken = try appendToken(rp.c, .RBrace, "}");
12211143
1222 const rhs_node = if (leftover_count == 1)1144 const rhs_node = if (leftover_count == 1)
...@@ -1234,11 +1156,7 @@ fn transInitListExpr(...@@ -1234,11 +1156,7 @@ fn transInitListExpr(
1234 };1156 };
12351157
1236 if (init_count == 0) {1158 if (init_count == 0) {
1237 return TransResult{1159 return rhs_node;
1238 .node = rhs_node,
1239 .child_scope = scope,
1240 .node_scope = scope,
1241 };
1242 }1160 }
12431161
1244 const cat_node = try rp.c.a().create(ast.Node.InfixOp);1162 const cat_node = try rp.c.a().create(ast.Node.InfixOp);
...@@ -1248,11 +1166,7 @@ fn transInitListExpr(...@@ -1248,11 +1166,7 @@ fn transInitListExpr(
1248 .op = .ArrayCat,1166 .op = .ArrayCat,
1249 .rhs = rhs_node,1167 .rhs = rhs_node,
1250 };1168 };
1251 return TransResult{1169 return &cat_node.base;
1252 .node = &cat_node.base,
1253 .child_scope = scope,
1254 .node_scope = scope,
1255 };
1256}1170}
12571171
1258fn transImplicitValueInitExpr(1172fn transImplicitValueInitExpr(
...@@ -1260,7 +1174,7 @@ fn transImplicitValueInitExpr(...@@ -1260,7 +1174,7 @@ fn transImplicitValueInitExpr(
1260 scope: *Scope,1174 scope: *Scope,
1261 expr: *const ZigClangExpr,1175 expr: *const ZigClangExpr,
1262 used: ResultUsed,1176 used: ResultUsed,
1263) TransError!TransResult {1177) TransError!*ast.Node {
1264 const source_loc = ZigClangExpr_getBeginLoc(expr);1178 const source_loc = ZigClangExpr_getBeginLoc(expr);
1265 const qt = getExprQualType(rp.c, expr);1179 const qt = getExprQualType(rp.c, expr);
1266 const ty = ZigClangQualType_getTypePtr(qt);1180 const ty = ZigClangQualType_getTypePtr(qt);
...@@ -1268,9 +1182,7 @@ fn transImplicitValueInitExpr(...@@ -1268,9 +1182,7 @@ fn transImplicitValueInitExpr(
1268 .Builtin => blk: {1182 .Builtin => blk: {
1269 const builtin_ty = @ptrCast(*const ZigClangBuiltinType, ty);1183 const builtin_ty = @ptrCast(*const ZigClangBuiltinType, ty);
1270 switch (ZigClangBuiltinType_getKind(builtin_ty)) {1184 switch (ZigClangBuiltinType_getKind(builtin_ty)) {
1271 .Bool => {1185 .Bool => return transCreateNodeBoolLiteral(rp.c, false),
1272 break :blk try transCreateNodeBoolLiteral(rp.c, false);
1273 },
1274 .Char_U,1186 .Char_U,
1275 .UChar,1187 .UChar,
1276 .Char_S,1188 .Char_S,
...@@ -1291,30 +1203,13 @@ fn transImplicitValueInitExpr(...@@ -1291,30 +1203,13 @@ fn transImplicitValueInitExpr(
1291 .Float128,1203 .Float128,
1292 .Float16,1204 .Float16,
1293 .LongDouble,1205 .LongDouble,
1294 => {1206 => return transCreateNodeInt(rp.c, 0),
1295 break :blk try transCreateNodeInt(rp.c, 0);
1296 },
1297 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "unsupported builtin type", .{}),1207 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "unsupported builtin type", .{}),
1298 }1208 }
1299 },1209 },
1300 .Pointer => try transCreateNodeNullLiteral(rp.c),1210 .Pointer => return transCreateNodeNullLiteral(rp.c),
1301 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "type does not have an implicit init value", .{}),1211 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "type does not have an implicit init value", .{}),
1302 };1212 };
1303 return TransResult{
1304 .node = node,
1305 .child_scope = scope,
1306 .node_scope = scope,
1307 };
1308}
1309
1310fn transLookupZigIdentifier(inner: *Scope, c_name: []const u8) []const u8 {
1311 var scope = inner;
1312 while (true) : (scope = scope.parent orelse return c_name) {
1313 if (scope.id == .Var) {
1314 const var_scope = @ptrCast(*const Scope.Var, scope);
1315 if (std.mem.eql(u8, var_scope.c_name, c_name)) return var_scope.zig_name;
1316 }
1317 }
1318}1213}
13191214
1320fn transCPtrCast(1215fn transCPtrCast(
...@@ -1358,25 +1253,21 @@ fn maybeSuppressResult(...@@ -1358,25 +1253,21 @@ fn maybeSuppressResult(
1358 rp: RestorePoint,1253 rp: RestorePoint,
1359 scope: *Scope,1254 scope: *Scope,
1360 used: ResultUsed,1255 used: ResultUsed,
1361 result: TransResult,1256 result: *ast.Node,
1362) !TransResult {1257) TransError!*ast.Node {
1363 if (used == .used) return result;1258 if (used == .used) return result;
1364 // NOTE: This is backwards, but the semicolon must immediately follow the node.1259 // NOTE: This is backwards, but the semicolon must immediately follow the node.
1365 _ = try appendToken(rp.c, .Semicolon, ";");1260 _ = try appendToken(rp.c, .Semicolon, ";");
1366 const lhs = try transCreateNodeIdentifier(rp.c, "_", null);1261 const lhs = try transCreateNodeIdentifier(rp.c, "_");
1367 const op_token = try appendToken(rp.c, .Equal, "=");1262 const op_token = try appendToken(rp.c, .Equal, "=");
1368 const op_node = try rp.c.a().create(ast.Node.InfixOp);1263 const op_node = try rp.c.a().create(ast.Node.InfixOp);
1369 op_node.* = ast.Node.InfixOp{1264 op_node.* = ast.Node.InfixOp{
1370 .op_token = op_token,1265 .op_token = op_token,
1371 .lhs = lhs,1266 .lhs = lhs,
1372 .op = .Assign,1267 .op = .Assign,
1373 .rhs = result.node,1268 .rhs = result,
1374 };
1375 return TransResult{
1376 .node = &op_node.base,
1377 .child_scope = scope,
1378 .node_scope = scope,
1379 };1269 };
1270 return &op_node.base;
1380}1271}
13811272
1382fn addTopLevelDecl(c: *Context, name: []const u8, decl_node: *ast.Node) !void {1273fn addTopLevelDecl(c: *Context, name: []const u8, decl_node: *ast.Node) !void {
...@@ -1443,7 +1334,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) TypeErro...@@ -1443,7 +1334,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) TypeErro
1443 return node;1334 return node;
1444 }1335 }
14451336
1446 const field_name = try appendIdentifier(c, try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, field_decl))), null);1337 const field_name = try appendIdentifier(c, try c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, field_decl))));
1447 _ = try appendToken(c, .Colon, ":");1338 _ = try appendToken(c, .Colon, ":");
1448 const field_type = try transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc);1339 const field_type = try transQualType(rp, ZigClangFieldDecl_getType(field_decl), field_loc);
14491340
...@@ -1467,7 +1358,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) TypeErro...@@ -1467,7 +1358,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) TypeErro
14671358
1468fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.Node {1359fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.Node {
1469 if (c.decl_table.get(@ptrToInt(ZigClangEnumDecl_getCanonicalDecl(enum_decl)))) |name|1360 if (c.decl_table.get(@ptrToInt(ZigClangEnumDecl_getCanonicalDecl(enum_decl)))) |name|
1470 return try transCreateNodeIdentifier(c, name.value, null); // Avoid processing this decl twice1361 return try transCreateNodeIdentifier(c, name.value); // Avoid processing this decl twice
1471 const rp = makeRestorePoint(c);1362 const rp = makeRestorePoint(c);
1472 const enum_loc = ZigClangEnumDecl_getLocation(enum_decl);1363 const enum_loc = ZigClangEnumDecl_getLocation(enum_decl);
14731364
...@@ -1483,7 +1374,7 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No...@@ -1483,7 +1374,7 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No
14831374
1484 const name = try std.fmt.allocPrint(c.a(), "enum_{}", .{bare_name});1375 const name = try std.fmt.allocPrint(c.a(), "enum_{}", .{bare_name});
1485 _ = try c.decl_table.put(@ptrToInt(ZigClangEnumDecl_getCanonicalDecl(enum_decl)), name);1376 _ = try c.decl_table.put(@ptrToInt(ZigClangEnumDecl_getCanonicalDecl(enum_decl)), name);
1486 const name_tok = try appendIdentifier(c, name, null);1377 const name_tok = try appendIdentifier(c, name);
1487 const eq_tok = try appendToken(c, .Equal, "=");1378 const eq_tok = try appendToken(c, .Equal, "=");
14881379
1489 const init_node = if (ZigClangEnumDecl_getDefinition(enum_decl)) |enum_def| blk: {1380 const init_node = if (ZigClangEnumDecl_getDefinition(enum_decl)) |enum_def| blk: {
...@@ -1550,7 +1441,7 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No...@@ -1550,7 +1441,7 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No
1550 else1441 else
1551 enum_val_name;1442 enum_val_name;
15521443
1553 const field_name_tok = try appendIdentifier(c, field_name, null);1444 const field_name_tok = try appendIdentifier(c, field_name);
15541445
1555 const int_node = if (!pure_enum) blk: {1446 const int_node = if (!pure_enum) blk: {
1556 _ = try appendToken(c, .Colon, "=");1447 _ = try appendToken(c, .Colon, "=");
...@@ -1603,18 +1494,18 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No...@@ -1603,18 +1494,18 @@ fn transEnumDecl(c: *Context, enum_decl: *const ZigClangEnumDecl) Error!?*ast.No
1603 try addTopLevelDecl(c, name, &node.base);1494 try addTopLevelDecl(c, name, &node.base);
1604 if (!is_unnamed)1495 if (!is_unnamed)
1605 try c.alias_list.push(.{ .alias = bare_name, .name = name });1496 try c.alias_list.push(.{ .alias = bare_name, .name = name });
1606 return transCreateNodeIdentifier(c, name, null);1497 return transCreateNodeIdentifier(c, name);
1607}1498}
16081499
1609fn addEnumTopLevel(c: *Context, enum_name: []const u8, field_name: []const u8, enum_val_name: []const u8) !void {1500fn addEnumTopLevel(c: *Context, enum_name: []const u8, field_name: []const u8, enum_val_name: []const u8) !void {
1610 const visib_tok = try appendToken(c, .Keyword_pub, "pub");1501 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
1611 const const_tok = try appendToken(c, .Keyword_const, "const");1502 const const_tok = try appendToken(c, .Keyword_const, "const");
1612 const name_tok = try appendIdentifier(c, enum_val_name, null);1503 const name_tok = try appendIdentifier(c, enum_val_name);
1613 const eq_tok = try appendToken(c, .Equal, "=");1504 const eq_tok = try appendToken(c, .Equal, "=");
16141505
1615 const enum_ident = try transCreateNodeIdentifier(c, enum_name, null);1506 const enum_ident = try transCreateNodeIdentifier(c, enum_name);
1616 const period_tok = try appendToken(c, .Period, ".");1507 const period_tok = try appendToken(c, .Period, ".");
1617 const field_ident = try transCreateNodeIdentifier(c, field_name, null);1508 const field_ident = try transCreateNodeIdentifier(c, field_name);
16181509
1619 const field_access_node = try c.a().create(ast.Node.InfixOp);1510 const field_access_node = try c.a().create(ast.Node.InfixOp);
1620 field_access_node.* = .{1511 field_access_node.* = .{
...@@ -1780,11 +1671,11 @@ fn transCreateNodeAssign(...@@ -1780,11 +1671,11 @@ fn transCreateNodeAssign(
1780 _ = try appendToken(rp.c, .Semicolon, ";");1671 _ = try appendToken(rp.c, .Semicolon, ";");
17811672
1782 const node = try rp.c.a().create(ast.Node.InfixOp);1673 const node = try rp.c.a().create(ast.Node.InfixOp);
1783 node.* = ast.Node.InfixOp{1674 node.* = .{
1784 .op_token = eq_token,1675 .op_token = eq_token,
1785 .lhs = lhs_node.node,1676 .lhs = lhs_node,
1786 .op = .Assign,1677 .op = .Assign,
1787 .rhs = rhs_node.node,1678 .rhs = rhs_node,
1788 };1679 };
1789 return node;1680 return node;
1790 }1681 }
...@@ -1864,9 +1755,9 @@ fn transCreateNodeInfixOp(...@@ -1864,9 +1755,9 @@ fn transCreateNodeInfixOp(
1864 const node = try rp.c.a().create(ast.Node.InfixOp);1755 const node = try rp.c.a().create(ast.Node.InfixOp);
1865 node.* = ast.Node.InfixOp{1756 node.* = ast.Node.InfixOp{
1866 .op_token = op_token,1757 .op_token = op_token,
1867 .lhs = lhs.node,1758 .lhs = lhs,
1868 .op = op,1759 .op = op,
1869 .rhs = rhs.node,1760 .rhs = rhs,
1870 };1761 };
1871 if (!grouped) return &node.base;1762 if (!grouped) return &node.base;
1872 const rparen = try appendToken(rp.c, .RParen, ")");1763 const rparen = try appendToken(rp.c, .RParen, ")");
...@@ -1896,7 +1787,7 @@ fn transCreateNodePtrType(...@@ -1896,7 +1787,7 @@ fn transCreateNodePtrType(
1896 .Identifier => blk: {1787 .Identifier => blk: {
1897 const lbracket = try appendToken(c, .LBracket, "["); // Rendering checks if this token + 2 == .Identifier, so needs to return this token1788 const lbracket = try appendToken(c, .LBracket, "["); // Rendering checks if this token + 2 == .Identifier, so needs to return this token
1898 _ = try appendToken(c, .Asterisk, "*");1789 _ = try appendToken(c, .Asterisk, "*");
1899 _ = try appendIdentifier(c, "c", null); // not really an identifier1790 _ = try appendIdentifier(c, "c");
1900 _ = try appendToken(c, .RBracket, "]");1791 _ = try appendToken(c, .RBracket, "]");
1901 break :blk lbracket;1792 break :blk lbracket;
1902 },1793 },
...@@ -2019,7 +1910,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a...@@ -2019,7 +1910,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
2019 const pub_tok = try appendToken(c, .Keyword_pub, "pub");1910 const pub_tok = try appendToken(c, .Keyword_pub, "pub");
2020 const inline_tok = try appendToken(c, .Keyword_inline, "inline");1911 const inline_tok = try appendToken(c, .Keyword_inline, "inline");
2021 const fn_tok = try appendToken(c, .Keyword_fn, "fn");1912 const fn_tok = try appendToken(c, .Keyword_fn, "fn");
2022 const name_tok = try appendIdentifier(c, name, null);1913 const name_tok = try appendIdentifier(c, name);
2023 _ = try appendToken(c, .LParen, "(");1914 _ = try appendToken(c, .LParen, "(");
20241915
2025 const proto_alias = proto_alias_node.cast(ast.Node.FnProto).?;1916 const proto_alias = proto_alias_node.cast(ast.Node.FnProto).?;
...@@ -2068,7 +1959,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a...@@ -2068,7 +1959,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
2068 .section_expr = null,1959 .section_expr = null,
2069 };1960 };
20701961
2071 const block = try transCreateNodeBlock(c, null, null);1962 const block = try transCreateNodeBlock(c, null);
20721963
2073 const return_expr = try transCreateNodeReturnExpr(c);1964 const return_expr = try transCreateNodeReturnExpr(c);
2074 const unwrap_expr = try transCreateNodeUnwrapNull(c, ref.cast(ast.Node.VarDecl).?.init_node.?);1965 const unwrap_expr = try transCreateNodeUnwrapNull(c, ref.cast(ast.Node.VarDecl).?.init_node.?);
...@@ -2079,7 +1970,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a...@@ -2079,7 +1970,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
2079 _ = try appendToken(c, .Comma, ",");1970 _ = try appendToken(c, .Comma, ",");
2080 }1971 }
2081 const param = pn.*.cast(ast.Node.ParamDecl).?;1972 const param = pn.*.cast(ast.Node.ParamDecl).?;
2082 try call_expr.op.Call.params.push(try transCreateNodeIdentifier(c, tokenSlice(c, param.name_token.?), null));1973 try call_expr.op.Call.params.push(try transCreateNodeIdentifier(c, tokenSlice(c, param.name_token.?)));
2083 }1974 }
2084 call_expr.rtoken = try appendToken(c, .RParen, ")");1975 call_expr.rtoken = try appendToken(c, .RParen, ")");
2085 return_expr.rhs = &call_expr.base;1976 return_expr.rhs = &call_expr.base;
...@@ -2107,7 +1998,7 @@ fn transCreateNodeEnumLiteral(c: *Context, name: []const u8) !*ast.Node {...@@ -2107,7 +1998,7 @@ fn transCreateNodeEnumLiteral(c: *Context, name: []const u8) !*ast.Node {
2107 const node = try c.a().create(ast.Node.EnumLiteral);1998 const node = try c.a().create(ast.Node.EnumLiteral);
2108 node.* = .{1999 node.* = .{
2109 .dot = try appendToken(c, .Period, "."),2000 .dot = try appendToken(c, .Period, "."),
2110 .name = try appendIdentifier(c, name, null), // scoped to an enum2001 .name = try appendIdentifier(c, name),
2111 };2002 };
2112 return &node.base;2003 return &node.base;
2113}2004}
...@@ -2136,9 +2027,9 @@ fn transCreateNodeElse(c: *Context) !*ast.Node.Else {...@@ -2136,9 +2027,9 @@ fn transCreateNodeElse(c: *Context) !*ast.Node.Else {
2136 return node;2027 return node;
2137}2028}
21382029
2139fn transCreateNodeBlock(c: *Context, label: ?[]const u8, scope: ?*Scope) !*ast.Node.Block {2030fn transCreateNodeBlock(c: *Context, label: ?[]const u8) !*ast.Node.Block {
2140 const label_node = if (label) |l| blk: {2031 const label_node = if (label) |l| blk: {
2141 const ll = try appendIdentifier(c, l, scope);2032 const ll = try appendIdentifier(c, l);
2142 _ = try appendToken(c, .Colon, ":");2033 _ = try appendToken(c, .Colon, ":");
2143 break :blk ll;2034 break :blk ll;
2144 } else null;2035 } else null;
...@@ -2196,7 +2087,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour...@@ -2196,7 +2087,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour
2196 .Float16 => "f16",2087 .Float16 => "f16",
2197 .LongDouble => "c_longdouble",2088 .LongDouble => "c_longdouble",
2198 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "unsupported builtin type", .{}),2089 else => return revertAndWarn(rp, error.UnsupportedType, source_loc, "unsupported builtin type", .{}),
2199 }, null);2090 });
2200 },2091 },
2201 .FunctionProto => {2092 .FunctionProto => {
2202 const fn_proto_ty = @ptrCast(*const ZigClangFunctionProtoType, ty);2093 const fn_proto_ty = @ptrCast(*const ZigClangFunctionProtoType, ty);
...@@ -2274,7 +2165,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour...@@ -2274,7 +2165,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour
22742165
2275 const typedef_decl = ZigClangTypedefType_getDecl(typedef_ty);2166 const typedef_decl = ZigClangTypedefType_getDecl(typedef_ty);
2276 const typedef_name = try rp.c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, typedef_decl)));2167 const typedef_name = try rp.c.str(ZigClangDecl_getName_bytes_begin(@ptrCast(*const ZigClangDecl, typedef_decl)));
2277 return transCreateNodeIdentifier(rp.c, typedef_name, null);2168 return transCreateNodeIdentifier(rp.c, typedef_name);
2278 },2169 },
2279 .Record => {2170 .Record => {
2280 const record_ty = @ptrCast(*const ZigClangRecordType, ty);2171 const record_ty = @ptrCast(*const ZigClangRecordType, ty);
...@@ -2288,7 +2179,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour...@@ -2288,7 +2179,7 @@ fn transType(rp: RestorePoint, ty: *const ZigClangType, source_loc: ZigClangSour
2288 // };2179 // };
2289 const record_decl = ZigClangRecordType_getDecl(record_ty);2180 const record_decl = ZigClangRecordType_getDecl(record_ty);
2290 if (try getContainerName(rp, record_decl)) |name|2181 if (try getContainerName(rp, record_decl)) |name|
2291 return transCreateNodeIdentifier(rp.c, name, null)2182 return transCreateNodeIdentifier(rp.c, name)
2292 else2183 else
2293 return transRecordDecl(rp.c, record_decl);2184 return transRecordDecl(rp.c, record_decl);
2294 },2185 },
...@@ -2426,7 +2317,7 @@ fn finishTransFnProto(...@@ -2426,7 +2317,7 @@ fn finishTransFnProto(
2426 else2317 else
2427 null;2318 null;
2428 const fn_tok = try appendToken(rp.c, .Keyword_fn, "fn");2319 const fn_tok = try appendToken(rp.c, .Keyword_fn, "fn");
2429 const name_tok = if (fn_decl_context) |ctx| try appendIdentifier(rp.c, ctx.fn_name, null) else null;2320 const name_tok = if (fn_decl_context) |ctx| try appendIdentifier(rp.c, ctx.fn_name) else null;
2430 const lparen_tok = try appendToken(rp.c, .LParen, "(");2321 const lparen_tok = try appendToken(rp.c, .LParen, "(");
24312322
2432 var fn_params = ast.Node.FnProto.ParamList.init(rp.c.a());2323 var fn_params = ast.Node.FnProto.ParamList.init(rp.c.a());
...@@ -2449,7 +2340,7 @@ fn finishTransFnProto(...@@ -2449,7 +2340,7 @@ fn finishTransFnProto(
2449 break :blk a;2340 break :blk a;
2450 } else param_name;2341 } else param_name;
24512342
2452 const result = try appendIdentifier(rp.c, checked_param_name, null);2343 const result = try appendIdentifier(rp.c, checked_param_name);
2453 _ = try appendToken(rp.c, .Colon, ":");2344 _ = try appendToken(rp.c, .Colon, ":");
2454 break :blk result;2345 break :blk result;
2455 }2346 }
...@@ -2497,12 +2388,12 @@ fn finishTransFnProto(...@@ -2497,12 +2388,12 @@ fn finishTransFnProto(
24972388
2498 const return_type_node = blk: {2389 const return_type_node = blk: {
2499 if (ZigClangFunctionType_getNoReturnAttr(fn_ty)) {2390 if (ZigClangFunctionType_getNoReturnAttr(fn_ty)) {
2500 break :blk try transCreateNodeIdentifier(rp.c, "noreturn", null);2391 break :blk try transCreateNodeIdentifier(rp.c, "noreturn");
2501 } else {2392 } else {
2502 const return_qt = ZigClangFunctionType_getReturnType(fn_ty);2393 const return_qt = ZigClangFunctionType_getReturnType(fn_ty);
2503 if (isCVoid(return_qt)) {2394 if (isCVoid(return_qt)) {
2504 // convert primitive c_void to actual void (only for return type)2395 // convert primitive c_void to actual void (only for return type)
2505 break :blk try transCreateNodeIdentifier(rp.c, "void", null);2396 break :blk try transCreateNodeIdentifier(rp.c, "void");
2506 } else {2397 } else {
2507 break :blk transQualType(rp, return_qt, source_loc) catch |err| switch (err) {2398 break :blk transQualType(rp, return_qt, source_loc) catch |err| switch (err) {
2508 error.UnsupportedType => {2399 error.UnsupportedType => {
...@@ -2555,7 +2446,7 @@ fn emitWarning(c: *Context, loc: ZigClangSourceLocation, comptime format: []cons...@@ -2555,7 +2446,7 @@ fn emitWarning(c: *Context, loc: ZigClangSourceLocation, comptime format: []cons
2555fn failDecl(c: *Context, loc: ZigClangSourceLocation, name: []const u8, comptime format: []const u8, args: var) !void {2446fn failDecl(c: *Context, loc: ZigClangSourceLocation, name: []const u8, comptime format: []const u8, args: var) !void {
2556 // const name = @compileError(msg);2447 // const name = @compileError(msg);
2557 const const_tok = try appendToken(c, .Keyword_const, "const");2448 const const_tok = try appendToken(c, .Keyword_const, "const");
2558 const name_tok = try appendIdentifier(c, name, null);2449 const name_tok = try appendIdentifier(c, name);
2559 const eq_tok = try appendToken(c, .Equal, "=");2450 const eq_tok = try appendToken(c, .Equal, "=");
2560 const builtin_tok = try appendToken(c, .Builtin, "@compileError");2451 const builtin_tok = try appendToken(c, .Builtin, "@compileError");
2561 const lparen_tok = try appendToken(c, .LParen, "(");2452 const lparen_tok = try appendToken(c, .LParen, "(");
...@@ -2640,11 +2531,7 @@ fn isValidZigIdentifier(name: []const u8) bool {...@@ -2640,11 +2531,7 @@ fn isValidZigIdentifier(name: []const u8) bool {
2640 return true;2531 return true;
2641}2532}
26422533
2643fn appendIdentifier(c: *Context, name: []const u8, scope: ?*Scope) !ast.TokenIndex {2534fn appendIdentifier(c: *Context, name: []const u8) !ast.TokenIndex {
2644 if (scope) |s|
2645 if (s.getAlias(name)) |alias| {
2646 return appendTokenFmt(c, .Identifier, "{}", .{alias});
2647 };
2648 if (!isValidZigIdentifier(name) or std.zig.Token.getKeyword(name) != null) {2535 if (!isValidZigIdentifier(name) or std.zig.Token.getKeyword(name) != null) {
2649 return appendTokenFmt(c, .Identifier, "@\"{}\"", .{name});2536 return appendTokenFmt(c, .Identifier, "@\"{}\"", .{name});
2650 } else {2537 } else {
...@@ -2652,8 +2539,8 @@ fn appendIdentifier(c: *Context, name: []const u8, scope: ?*Scope) !ast.TokenInd...@@ -2652,8 +2539,8 @@ fn appendIdentifier(c: *Context, name: []const u8, scope: ?*Scope) !ast.TokenInd
2652 }2539 }
2653}2540}
26542541
2655fn transCreateNodeIdentifier(c: *Context, name: []const u8, scope: ?*Scope) !*ast.Node {2542fn transCreateNodeIdentifier(c: *Context, name: []const u8) !*ast.Node {
2656 const token_index = try appendIdentifier(c, name, scope);2543 const token_index = try appendIdentifier(c, name);
2657 const identifier = try c.a().create(ast.Node.Identifier);2544 const identifier = try c.a().create(ast.Node.Identifier);
2658 identifier.* = ast.Node.Identifier{2545 identifier.* = ast.Node.Identifier{
2659 .base = ast.Node{ .id = ast.Node.Id.Identifier },2546 .base = ast.Node{ .id = ast.Node.Id.Identifier },
...@@ -2740,7 +2627,7 @@ fn transMacroDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u8,...@@ -2740,7 +2627,7 @@ fn transMacroDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u8,
27402627
2741 const visib_tok = try appendToken(c, .Keyword_pub, "pub");2628 const visib_tok = try appendToken(c, .Keyword_pub, "pub");
2742 const mut_tok = try appendToken(c, .Keyword_const, "const");2629 const mut_tok = try appendToken(c, .Keyword_const, "const");
2743 const name_tok = try appendIdentifier(c, name, null);2630 const name_tok = try appendIdentifier(c, name);
2744 const eq_tok = try appendToken(c, .Equal, "=");2631 const eq_tok = try appendToken(c, .Equal, "=");
27452632
2746 const init_node = try parseCExpr(rp, it, source_loc, scope);2633 const init_node = try parseCExpr(rp, it, source_loc, scope);
...@@ -2773,7 +2660,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u...@@ -2773,7 +2660,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u
2773 const pub_tok = try appendToken(c, .Keyword_pub, "pub");2660 const pub_tok = try appendToken(c, .Keyword_pub, "pub");
2774 const inline_tok = try appendToken(c, .Keyword_inline, "inline");2661 const inline_tok = try appendToken(c, .Keyword_inline, "inline");
2775 const fn_tok = try appendToken(c, .Keyword_fn, "fn");2662 const fn_tok = try appendToken(c, .Keyword_fn, "fn");
2776 const name_tok = try appendIdentifier(c, name, null);2663 const name_tok = try appendIdentifier(c, name);
2777 _ = try appendToken(c, .LParen, "(");2664 _ = try appendToken(c, .LParen, "(");
27782665
2779 if (it.next().?.id != .LParen) {2666 if (it.next().?.id != .LParen) {
...@@ -2790,7 +2677,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u...@@ -2790,7 +2677,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u
2790 break :blk alias;2677 break :blk alias;
2791 } else param_tok.bytes;2678 } else param_tok.bytes;
27922679
2793 const param_name_tok = try appendIdentifier(c, checked_name, null);2680 const param_name_tok = try appendIdentifier(c, checked_name);
2794 _ = try appendToken(c, .Colon, ":");2681 _ = try appendToken(c, .Colon, ":");
27952682
2796 const token_index = try appendToken(c, .Keyword_var, "var");2683 const token_index = try appendToken(c, .Keyword_var, "var");
...@@ -2843,7 +2730,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u...@@ -2843,7 +2730,7 @@ fn transMacroFnDefine(c: *Context, it: *ctok.TokenList.Iterator, name: []const u
2843 .section_expr = null,2730 .section_expr = null,
2844 };2731 };
28452732
2846 const block = try transCreateNodeBlock(c, null, null);2733 const block = try transCreateNodeBlock(c, null);
28472734
2848 const return_expr = try transCreateNodeReturnExpr(c);2735 const return_expr = try transCreateNodeReturnExpr(c);
2849 const expr = try parseCExpr(rp, it, source_loc, scope);2736 const expr = try parseCExpr(rp, it, source_loc, scope);
...@@ -2888,7 +2775,7 @@ fn parseCNumLit(rp: RestorePoint, tok: *CToken, source_loc: ZigClangSourceLocati...@@ -2888,7 +2775,7 @@ fn parseCNumLit(rp: RestorePoint, tok: *CToken, source_loc: ZigClangSourceLocati
2888 .LL => "c_longlong",2775 .LL => "c_longlong",
2889 .LLU => "c_ulonglong",2776 .LLU => "c_ulonglong",
2890 else => unreachable,2777 else => unreachable,
2891 }, null));2778 }));
2892 _ = try appendToken(rp.c, .Comma, ",");2779 _ = try appendToken(rp.c, .Comma, ",");
2893 try cast_node.params.push(try transCreateNodeInt(rp.c, tok.bytes));2780 try cast_node.params.push(try transCreateNodeInt(rp.c, tok.bytes));
2894 cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");2781 cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
...@@ -2902,7 +2789,7 @@ fn parseCNumLit(rp: RestorePoint, tok: *CToken, source_loc: ZigClangSourceLocati...@@ -2902,7 +2789,7 @@ fn parseCNumLit(rp: RestorePoint, tok: *CToken, source_loc: ZigClangSourceLocati
2902 .F => "f32",2789 .F => "f32",
2903 .L => "f64",2790 .L => "f64",
2904 else => unreachable,2791 else => unreachable,
2905 }, null));2792 }));
2906 _ = try appendToken(rp.c, .Comma, ",");2793 _ = try appendToken(rp.c, .Comma, ",");
2907 try cast_node.params.push(try transCreateNodeFloat(rp.c, tok.bytes));2794 try cast_node.params.push(try transCreateNodeFloat(rp.c, tok.bytes));
2908 cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");2795 cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
...@@ -2939,7 +2826,10 @@ fn parseCPrimaryExpr(rp: RestorePoint, it: *ctok.TokenList.Iterator, source_loc:...@@ -2939,7 +2826,10 @@ fn parseCPrimaryExpr(rp: RestorePoint, it: *ctok.TokenList.Iterator, source_loc:
2939 .NumLitInt, .NumLitFloat => {2826 .NumLitInt, .NumLitFloat => {
2940 return parseCNumLit(rp, tok, source_loc);2827 return parseCNumLit(rp, tok, source_loc);
2941 },2828 },
2942 .Identifier => return transCreateNodeIdentifier(rp.c, tok.bytes, scope),2829 .Identifier => {
2830 const name = if (scope.getAlias(tok.bytes)) |a| a else tok.bytes;
2831 return transCreateNodeIdentifier(rp.c, name);
2832 },
2943 .LParen => {2833 .LParen => {
2944 const inner_node = try parseCExpr(rp, it, source_loc, scope);2834 const inner_node = try parseCExpr(rp, it, source_loc, scope);
29452835
...@@ -3060,7 +2950,7 @@ fn parseCSuffixOpExpr(rp: RestorePoint, it: *ctok.TokenList.Iterator, source_loc...@@ -3060,7 +2950,7 @@ fn parseCSuffixOpExpr(rp: RestorePoint, it: *ctok.TokenList.Iterator, source_loc
3060 );2950 );
30612951
3062 const op_token = try appendToken(rp.c, .Period, ".");2952 const op_token = try appendToken(rp.c, .Period, ".");
3063 const rhs = try transCreateNodeIdentifier(rp.c, name_tok.bytes, null); // TODO scope);2953 const rhs = try transCreateNodeIdentifier(rp.c, name_tok.bytes);
3064 const access_node = try rp.c.a().create(ast.Node.InfixOp);2954 const access_node = try rp.c.a().create(ast.Node.InfixOp);
3065 access_node.* = .{2955 access_node.* = .{
3066 .op_token = op_token,2956 .op_token = op_token,
test/translate_c.zig+30-3
...@@ -637,11 +637,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {...@@ -637,11 +637,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
637 \\pub extern var glProcs: union_OpenGLProcs;637 \\pub extern var glProcs: union_OpenGLProcs;
638 ,638 ,
639 \\pub const glClearPFN = PFNGLCLEARPROC;639 \\pub const glClearPFN = PFNGLCLEARPROC;
640 // , // TODO640 // , // TODO
641 // \\pub inline fn glClearUnion(arg_1: GLbitfield) void {641 // \\pub inline fn glClearUnion(arg_1: GLbitfield) void {
642 // \\ return glProcs.gl.Clear.?(arg_1);642 // \\ return glProcs.gl.Clear.?(arg_1);
643 // \\}643 // \\}
644 ,644 ,
645 \\pub const OpenGLProcs = union_OpenGLProcs;645 \\pub const OpenGLProcs = union_OpenGLProcs;
646 });646 });
647647
...@@ -671,6 +671,34 @@ pub fn addCases(cases: *tests.TranslateCContext) void {...@@ -671,6 +671,34 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
671 \\pub const FOO2 = "aoeu\x07 derp";671 \\pub const FOO2 = "aoeu\x07 derp";
672 });672 });
673673
674 cases.add_2("variable aliasing",
675 \\static long a = 2;
676 \\static long b = 2;
677 \\static int c = 4;
678 \\void foo(char c) {
679 \\ int a;
680 \\ char b = 123;
681 \\ b = (char) a;
682 \\ {
683 \\ int d = 5;
684 \\ }
685 \\ unsigned d = 440;
686 \\}
687 , &[_][]const u8{
688 \\pub var a: c_long = @as(c_long, 2);
689 \\pub var b: c_long = @as(c_long, 2);
690 \\pub var c: c_int = 4;
691 \\pub export fn foo(c_1: u8) void {
692 \\ var a_2: c_int = undefined;
693 \\ var b_3: u8 = @as(u8, 123);
694 \\ b_3 = @as(u8, a_2);
695 \\ {
696 \\ var d: c_int = 5;
697 \\ }
698 \\ var d: c_uint = @as(c_uint, 440);
699 \\}
700 });
701
674 /////////////// Cases for only stage1 which are TODO items for stage2 ////////////////702 /////////////// Cases for only stage1 which are TODO items for stage2 ////////////////
675703
676 if (builtin.os != builtin.Os.windows) {704 if (builtin.os != builtin.Os.windows) {
...@@ -2059,5 +2087,4 @@ pub fn addCases(cases: *tests.TranslateCContext) void {...@@ -2059,5 +2087,4 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
2059 , &[_][]const u8{2087 , &[_][]const u8{
2060 \\pub const NRF_GPIO = if (@typeId(@TypeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeId(@TypeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE);2088 \\pub const NRF_GPIO = if (@typeId(@TypeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeId(@TypeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Int) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE);
2061 });2089 });
2062
2063}2090}