Translate-c-2 the rest #3935

Vexu · 2019-12-17T23:19:28Z

Statements

Casts

PointerToBoolean
IntegralToBoolean
PointerToIntegral
IntegralToPointer

Macros

call
deref
array access
This one TODO

zig/src-self-hosted/translate_c.zig

Line 3057 in d8499f7

// TODO a.b.c

daurnimator · 2019-12-18T01:12:54Z

src-self-hosted/translate_c.zig

+
+    // TODO https://github.com/ziglang/zig/issues/3756
+    // TODO https://github.com/ziglang/zig/issues/1802
+    const checked_name = if (isZigPrimitiveType(var_name)) try std.fmt.allocPrint(c.a(), "_{}", .{var_name}) else var_name;


Am I correct in thinking this introduces a workaround for #3756?

Yes. I don't like the how it makes translated names slightly less predictable, but at least it won't break on import.

kavika13 · 2019-12-18T07:10:09Z

I noticed that the translate-c tests are failing on master for me (even without my changes), and I'm not sure the cause. I also can't separate those bugs from anything my changes have caused, so I am a little blocked.

I'm going to be mostly unavailable for the holidays pretty shortly, so if you want to hijack my pull request into your work then please go for it!

Vexu · 2019-12-18T07:42:25Z

I noticed that the translate-c tests are failing on master for me (even without my changes), and I'm not sure the cause. I also can't separate those bugs from anything my changes have caused, so I am a little blocked.

Seems like an issue with transImplicitCastExpr.

I'm going to be mostly unavailable for the holidays pretty shortly, so if you want to hijack my pull request into your work then please go for it!

Will do.

Vexu · 2019-12-18T10:48:56Z

Seems like an issue with transImplicitCastExpr.

I think I already fixed this.

kavika13 · 2019-12-18T11:22:27Z

src-self-hosted/translate_c.zig

+    }
+    const lhs_node = try transExpr(rp, scope, ZigClangBinaryOperator_getLHS(stmt), .used, .l_value);
+    switch (op) {
+        .PtrMemD, .PtrMemI, .Cmp => return revertAndWarn(


I think .* (PtrMemD) and ->* (PtrMemI) should be unreachable, because they're C++ things?
https://github.com/llvm-mirror/clang/blob/master/include/clang/AST/OperationKinds.def#L357

Also the spaceship <=> (Cmp) operator:
https://github.com/llvm-mirror/clang/blob/master/include/clang/AST/OperationKinds.def#L370

Definitely agree, thanks for looking them up.

lib/std/zig/ast.zig

data-man · 2019-12-20T06:38:52Z

int main() {
  int len = 2;
  switch (len) {
    case 0:
      break;
    case 1 ... 3:
      break;
    case 4 ... 6:
      break;
    default:
      ;
  }
  return 0;
}

=>

pub export fn main() c_int {
    var len: c_int = 2;
    __switch: {
        __default: {
            __case_2: {
                __case_1: {
                    __case_0: {
                        switch (len) {
                            0 => break :__case_0,
                            1...1 => break :__case_1,
                            4...4 => break :__case_2,
                            else => break :__default,
                        }
                    }
                    break :__switch;
                }
                break :__switch;
            }
            break :__switch;
        }
        {}
    }
    return 0;
}

Of course, this is GCC's extension, and there is not much of a code like that.

andrewrk · 2019-12-20T19:10:16Z

@Vexu after this is merged I would like to invite you to do the honors of deleting the C++ implementation from the repo. I think you deserve to have all those deleted lines under your name 😁

Vexu · 2019-12-22T12:04:07Z

I went ahead and made all non-namespaced enums integers to match stage 1 behavior with anonymous enums. I also made the change for named enums since the current implementation of transEnumDecl doesn't know if it is actually anonymous or a typedef.

The benefit from this is that if you need an integer you can just use the identifier as you would in C and if you need an enum all you need to do is prefix the it with a period.

- make non-namespaced enums ints - fix .used compound assignments not being grouped - fix macro calls with casts producing invalid Zig

data-man · 2019-12-22T13:43:43Z

//#include <stdint.h>

int a = 1;
int64_t b = 1;

ints.c:4:1: error: unknown type name 'int64_t'
int64_t b = 1;
^

If #include is uncommented then

pub const uint_least64_t = u64;
pub const int_fast64_t = i64;
pub const uint_fast64_t = u64;
pub const int_least32_t = i32;
pub const uint_least32_t = u32;
pub const int_fast32_t = i32;
pub const uint_fast32_t = u32;
pub const int_least16_t = i16;
pub const uint_least16_t = u16;
pub const int_fast16_t = i16;
pub const uint_fast16_t = u16;
pub const int_least8_t = i8;
pub const uint_least8_t = u8;
pub const int_fast8_t = i8;
pub const uint_fast8_t = u8;
pub const intmax_t = c_long;
pub const uintmax_t = c_ulong;
_pub export var a: c_int = 1;_
_pub export var b: i64 = @as(i64, 1);_
			^ Why export?
const __INTMAX_TYPE__ = @compileError("unable to translate macro");
const __UINTMAX_TYPE__ = @compileError("unable to translate macro");
const __PTRDIFF_TYPE__ = @compileError("unable to translate macro");
const __INTPTR_TYPE__ = @compileError("unable to translate macro");
const __SIZE_TYPE__ = @compileError("unable to translate macro");
const __WINT_TYPE__ = @compileError("unable to translate macro");`

...and many errors

Would be nice not to take integer definitions from clang.

Vexu · 2019-12-22T14:00:32Z

_pub export var a: c_int = 1;_
_pub export var b: i64 = @as(i64, 1);_
			^ Why export?

Because they are not static, see #2780

Would be nice not to take integer definitions from clang.

Currently this behaves same as stage 1 which also requires you to include stdint.h

andrewrk · 2019-12-22T17:22:53Z

Ready to merge?

Vexu · 2019-12-22T17:26:49Z

Yes, works as good as stage1 on everything I've tried.

andrewrk

I am delighted to merge this enormous contribution to Zig. Excellent work, @Vexu.

andrewrk · 2019-12-22T21:18:30Z

@Vexu want to do the honors of hooking up @cImport to the self-hosted version and deleting the C++ implementation?

Vexu · 2019-12-22T21:20:56Z

I've already done so.

kavika13 and others added 17 commits December 16, 2019 01:34

Add comparison and bitwise binary ops in translate-c-2

c8c8964

Add bit shift binary ops in translate-c-2

acff2d4

Add boolean and, boolean or binary ops in translate-c-2

89ef635

Fix compile errors after rebasing on master (missing switch->else)

0c03fe4

translate-c-2 comma operator

d9527ed

translate-c-2 wors-case assign

6265625

translate-c-2 if statements

e3f1bfe

translate-c-2 while loops

6a3d483

translate-c-2 break and continue

d54bcb2

translate-c-2 for loops

ab6fe57

translate-c-2 don't shadow primitive types

9cda93a

translate-c-2 floats

daa22d4

translate-c-2 conditional operator

0283ab8

translate-c-2 switch

65531c7

translate-c-2 fix container type resolution

a6960b8

translate-c-2 various fixes to get more tests passing

6d7025d

translate-c-2 character literals and more test fixes

21bc335

daurnimator added the translate-c C to Zig source translation feature (@cImport) label Dec 18, 2019

daurnimator reviewed Dec 18, 2019

View reviewed changes

Vexu added 2 commits December 18, 2019 09:51

Merge remote-tracking branch 'kavika13/master' into translate-c-2

90eed41

translate-c-2 update @kavika13's work to removal of TransResult

f54e7d6

kavika13 reviewed Dec 18, 2019

View reviewed changes

Vexu added 5 commits December 18, 2019 13:32

translate-c-2 fix expression grouping bugs

62bfff5

translate-c-2 stmt expr

e65b9e8

translate-c-2 member access

cf7a5b7

translate-c-2 array access

c2666c4

translate-c-2 function calls

d54c288

Vexu added 2 commits December 19, 2019 10:48

translate-c-2 increments worst-case

6cd402f

translate-c-2 compound assign

f837c7c

data-man reviewed Dec 19, 2019

View reviewed changes

lib/std/zig/ast.zig Outdated Show resolved Hide resolved

data-man reviewed Dec 19, 2019

View reviewed changes

lib/std/zig/ast.zig Outdated Show resolved Hide resolved

Vexu added 2 commits December 19, 2019 20:58

translate-c-2 improve macro fn ptr caller

61482be

translate-c-2 add missing casts

b7f1816

Vexu marked this pull request as ready for review December 19, 2019 22:10

translate-c-2 copy parametrs to stack

d172a73

Vexu force-pushed the translate-c-2 branch from 4091e7e to d172a73 Compare December 19, 2019 22:12

Vexu added 4 commits December 20, 2019 11:35

translate-c-2 fix switch range

daeb939

translate-c-2 improve macro escape sequences

e0046b7

translate-c-2 final small fixes

9437d99

translate-c-2 fix bugs found translating SDL

949f236

translate-c-2 fix macro regression

40f607d

translate-c-2 various fixes

9d31b65

- make non-namespaced enums ints - fix .used compound assignments not being grouped - fix macro calls with casts producing invalid Zig

Vexu force-pushed the translate-c-2 branch from 79b2df4 to 9d31b65 Compare December 22, 2019 12:38

andrewrk approved these changes Dec 22, 2019

View reviewed changes

andrewrk merged commit 28dbdba into ziglang:master Dec 22, 2019

Vexu deleted the translate-c-2 branch December 22, 2019 21:15

andrewrk mentioned this pull request Dec 22, 2019

make translate-c self-hosted #1964

Closed

3 tasks

daurnimator mentioned this pull request Jan 2, 2020

Allow translating C code that conflicts with primitive types #3756

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Translate-c-2 the rest #3935

Translate-c-2 the rest #3935

Vexu commented Dec 17, 2019 •

edited

daurnimator Dec 18, 2019

Vexu Dec 18, 2019

kavika13 commented Dec 18, 2019 •

edited

Vexu commented Dec 18, 2019

Vexu commented Dec 18, 2019

kavika13 Dec 18, 2019 •

edited

Vexu Dec 18, 2019

data-man commented Dec 20, 2019

andrewrk commented Dec 20, 2019

Vexu commented Dec 22, 2019

data-man commented Dec 22, 2019

Vexu commented Dec 22, 2019

andrewrk commented Dec 22, 2019

Vexu commented Dec 22, 2019

andrewrk left a comment

andrewrk commented Dec 22, 2019

Vexu commented Dec 22, 2019

Translate-c-2 the rest #3935

Translate-c-2 the rest #3935

Conversation

Vexu commented Dec 17, 2019 • edited

daurnimator Dec 18, 2019

Choose a reason for hiding this comment

Vexu Dec 18, 2019

Choose a reason for hiding this comment

kavika13 commented Dec 18, 2019 • edited

Vexu commented Dec 18, 2019

Vexu commented Dec 18, 2019

kavika13 Dec 18, 2019 • edited

Choose a reason for hiding this comment

Vexu Dec 18, 2019

Choose a reason for hiding this comment

data-man commented Dec 20, 2019

andrewrk commented Dec 20, 2019

Vexu commented Dec 22, 2019

data-man commented Dec 22, 2019

Vexu commented Dec 22, 2019

andrewrk commented Dec 22, 2019

Vexu commented Dec 22, 2019

andrewrk left a comment

Choose a reason for hiding this comment

andrewrk commented Dec 22, 2019

Vexu commented Dec 22, 2019

Vexu commented Dec 17, 2019 •

edited

kavika13 commented Dec 18, 2019 •

edited

kavika13 Dec 18, 2019 •

edited