| author |  hryx <codroid@gmail.com> 2019-05-26 16:51:25-07:00 |
| committer | hryx <codroid@gmail.com> 2019-05-26 16:51:25-07:00 |
| log | 99f0b28d3946a1110df235bb8d3b1918afc08df8 |
| tree | 065be43507663da7b195291e86cf436755697862 |
| parent | fceedada5c18ca5e9fa3ca14e74f6722eda85600 |
| signature | Commit is signed but in an unrecognized format. |
var decl: mut_token, create child scope
4 files changed, 34 insertions(+), 14 deletions(-)
src-self-hosted
src-self-hosted/clang.zig+1
| ... | @@ -509,6 +509,7 @@ pub extern fn ZigClangAPSInt_getRawData(self: ?*const struct_ZigClangAPSInt) [*c | ... | @@ -509,6 +509,7 @@ pub extern fn ZigClangAPSInt_getRawData(self: ?*const struct_ZigClangAPSInt) [*c |
| 509 | pub extern fn ZigClangAPSInt_getNumWords(self: ?*const struct_ZigClangAPSInt) c_uint; | 509 | pub extern fn ZigClangAPSInt_getNumWords(self: ?*const struct_ZigClangAPSInt) c_uint; |
| 510 | pub extern fn ZigClangAPValueLValueBase_dyn_cast_Expr(self: struct_ZigClangAPValueLValueBase) ?*const struct_ZigClangExpr; | 510 | pub extern fn ZigClangAPValueLValueBase_dyn_cast_Expr(self: struct_ZigClangAPValueLValueBase) ?*const struct_ZigClangExpr; |
| 511 | pub extern fn ZigClangASTUnit_delete(arg0: ?*struct_ZigClangASTUnit) void; | 511 | pub extern fn ZigClangASTUnit_delete(arg0: ?*struct_ZigClangASTUnit) void; |
| 512 | pub extern fn ZigClangVarDecl_getType(self: ?*const struct_ZigClangVarDecl) struct_ZigClangQualType; | ||
| 512 | 513 | ||
| 513 | pub extern fn ZigClangFunctionDecl_getType(self: *const ZigClangFunctionDecl) struct_ZigClangQualType; | 514 | pub extern fn ZigClangFunctionDecl_getType(self: *const ZigClangFunctionDecl) struct_ZigClangQualType; |
| 514 | pub extern fn ZigClangFunctionDecl_getLocation(self: *const ZigClangFunctionDecl) struct_ZigClangSourceLocation; | 515 | pub extern fn ZigClangFunctionDecl_getLocation(self: *const ZigClangFunctionDecl) struct_ZigClangSourceLocation; |
src-self-hosted/translate_c.zig+26-14
| ... | @@ -369,9 +369,11 @@ fn transCompoundStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCompo | ... | @@ -369,9 +369,11 @@ fn transCompoundStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangCompo |
| 369 | }; | 369 | }; |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt) !TransResult { | 372 | fn transDeclStmt(rp: RestorePoint, parent_scope: *Scope, stmt: *const ZigClangDeclStmt) !TransResult { |
| 373 | const c = rp.c; | 373 | const c = rp.c; |
| 374 | const block_scope = findBlockScope(scope); | 374 | const block_scope = findBlockScope(parent_scope); |
| 375 | var scope = parent_scope; | ||
| 376 | |||
| 375 | var it = ZigClangDeclStmt_decl_begin(stmt); | 377 | var it = ZigClangDeclStmt_decl_begin(stmt); |
| 376 | const end_it = ZigClangDeclStmt_decl_end(stmt); | 378 | const end_it = ZigClangDeclStmt_decl_end(stmt); |
| 377 | while (it != end_it) : (it += 1) { | 379 | while (it != end_it) : (it += 1) { |
| ... | @@ -385,23 +387,33 @@ fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt) | ... | @@ -385,23 +387,33 @@ fn transDeclStmt(rp: RestorePoint, scope: *Scope, stmt: *const ZigClangDeclStmt) |
| 385 | // else | 387 | // else |
| 386 | // try appendToken(c, .Keyword_threadlocal, "threadlocal"); | 388 | // try appendToken(c, .Keyword_threadlocal, "threadlocal"); |
| 387 | const thread_local_token: ?ast.TokenIndex = null; | 389 | const thread_local_token: ?ast.TokenIndex = null; |
| 388 | // TODO: | 390 | const qual_type = ZigClangVarDecl_getType(var_decl); |
| 389 | // const mut_token = if (ZigClangQualType_isConstQualified(qual_type)) | 391 | const mut_token = if (ZigClangQualType_isConstQualified(qual_type)) |
| 390 | // try appendToken(c, .Keyword_const, "const") | 392 | try appendToken(c, .Keyword_const, "const") |
| 391 | // else | 393 | else |
| 392 | // try appendToken(c, .Keyword_var, "var"); | 394 | try appendToken(c, .Keyword_var, "var"); |
| 393 | const mut_token = try appendToken(c, .Keyword_var, "var"); | 395 | const name_type = struct { |
| 394 | const name_token = blk: { | 396 | str: []const u8, |
| 395 | const name = try c.str(ZigClangDecl_getName_bytes_begin( | 397 | token: ast.TokenIndex, |
| 396 | @ptrCast(*const ZigClangDecl, var_decl), | ||
| 397 | )); | ||
| 398 | break :blk try appendToken(c, .Identifier, name); | ||
| 399 | }; | 398 | }; |
| 399 | const c_name = try c.str(ZigClangDecl_getName_bytes_begin( | ||
| 400 | @ptrCast(*const ZigClangDecl, var_decl), | ||
| 401 | )); | ||
| 402 | const name_token = try appendToken(c, .Identifier, c_name); | ||
| 400 | const eq_token = try appendToken(c, .Equal, "="); | 403 | const eq_token = try appendToken(c, .Equal, "="); |
| 401 | // TODO: init_node | 404 | // TODO: |
| 405 | // const init_node = ZigClangVarDecl_getInit(); | ||
| 402 | const init_node: ?*ast.Node = null; | 406 | const init_node: ?*ast.Node = null; |
| 403 | const semicolon_token = try appendToken(c, .Semicolon, ";"); | 407 | const semicolon_token = try appendToken(c, .Semicolon, ";"); |
| 404 | 408 | ||
| 409 | const var_scope = try c.a().create(Scope.Var); | ||
| 410 | var_scope.* = Scope.Var{ | ||
| 411 | .base = Scope{ .id = .Var, .parent = parent_scope }, | ||
| 412 | .c_name = c_name, | ||
| 413 | .zig_name = c_name, // TODO: getWantedName | ||
| 414 | }; | ||
| 415 | scope = &var_scope.base; | ||
| 416 | |||
| 405 | const node = try rp.c.a().create(ast.Node.VarDecl); | 417 | const node = try rp.c.a().create(ast.Node.VarDecl); |
| 406 | node.* = ast.Node.VarDecl{ | 418 | node.* = ast.Node.VarDecl{ |
| 407 | .base = ast.Node{ .id = .VarDecl }, | 419 | .base = ast.Node{ .id = .VarDecl }, |
src/zig_clang.cpp+5
| ... | @@ -1821,6 +1821,11 @@ void ZigClangASTUnit_delete(struct ZigClangASTUnit *self) { | ... | @@ -1821,6 +1821,11 @@ void ZigClangASTUnit_delete(struct ZigClangASTUnit *self) { |
| 1821 | delete reinterpret_cast<clang::ASTUnit *>(self); | 1821 | delete reinterpret_cast<clang::ASTUnit *>(self); |
| 1822 | } | 1822 | } |
| 1823 | 1823 | ||
| 1824 | struct ZigClangQualType ZigClangVarDecl_getType(const struct ZigClangVarDecl *self) { | ||
| 1825 | auto casted = reinterpret_cast<const clang::VarDecl *>(self); | ||
| 1826 | return bitcast(casted->getType()); | ||
| 1827 | } | ||
| 1828 | |||
| 1824 | enum ZigClangBuiltinTypeKind ZigClangBuiltinType_getKind(const struct ZigClangBuiltinType *self) { | 1829 | enum ZigClangBuiltinTypeKind ZigClangBuiltinType_getKind(const struct ZigClangBuiltinType *self) { |
| 1825 | auto casted = reinterpret_cast<const clang::BuiltinType *>(self); | 1830 | auto casted = reinterpret_cast<const clang::BuiltinType *>(self); |
| 1826 | return (ZigClangBuiltinTypeKind)casted->getKind(); | 1831 | return (ZigClangBuiltinTypeKind)casted->getKind(); |
src/zig_clang.h+2
| ... | @@ -753,6 +753,8 @@ ZIG_EXTERN_C struct ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **ar | ... | @@ -753,6 +753,8 @@ ZIG_EXTERN_C struct ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **ar |
| 753 | ZIG_EXTERN_C void ZigClangASTUnit_delete(struct ZigClangASTUnit *); | 753 | ZIG_EXTERN_C void ZigClangASTUnit_delete(struct ZigClangASTUnit *); |
| 754 | ZIG_EXTERN_C void ZigClangErrorMsg_delete(struct Stage2ErrorMsg *ptr, size_t len); | 754 | ZIG_EXTERN_C void ZigClangErrorMsg_delete(struct Stage2ErrorMsg *ptr, size_t len); |
| 755 | 755 | ||
| 756 | ZIG_EXTERN_C struct ZigClangQualType ZigClangVarDecl_getType(const struct ZigClangVarDecl *); | ||
| 757 | |||
| 756 | ZIG_EXTERN_C struct ZigClangASTContext *ZigClangASTUnit_getASTContext(struct ZigClangASTUnit *); | 758 | ZIG_EXTERN_C struct ZigClangASTContext *ZigClangASTUnit_getASTContext(struct ZigClangASTUnit *); |
| 757 | ZIG_EXTERN_C struct ZigClangSourceManager *ZigClangASTUnit_getSourceManager(struct ZigClangASTUnit *); | 759 | ZIG_EXTERN_C struct ZigClangSourceManager *ZigClangASTUnit_getSourceManager(struct ZigClangASTUnit *); |
| 758 | ZIG_EXTERN_C bool ZigClangASTUnit_visitLocalTopLevelDecls(struct ZigClangASTUnit *, void *context, | 760 | ZIG_EXTERN_C bool ZigClangASTUnit_visitLocalTopLevelDecls(struct ZigClangASTUnit *, void *context, |