723806 - JS CTypes prints function types incorrectly

Status: RESOLVED FIXED

Description

[Jim Blandy :jimb]

Created attachment 594054 [details] [diff] [review]
Make JavaScript CTypes print function types correctly.

CTypes prints function types incorrectly. For example:

js> ctypes.FunctionType(ctypes.default_abi, ctypes.int).toString()
"type int()()"
js> 

It should return "type int()".

Comment 1

[Jim Blandy :jimb]

I thought Chris had helped work on CTypes, and thus r?'d him; if that's not correct, apologies; who is best?

Comment 2

[Bobby Holley (:bholley) (busy with Stylo)]

Comment on attachment 594054 [details] [diff] [review]
Make JavaScript CTypes print function types correctly.

>-      // Wrap the entire expression so far with parens.
>-      PrependString(result, "(");
>-      AppendString(result, ")");
>+      // Function application binds more tightly than dereferencing, so
>+      // wrap pointer types in parens.
>+      if (prevGrouping == TYPE_pointer) {
>+        PrependString(result, "(");
>+        AppendString(result, ")");
>+      }

Good catch. :-)

Could be worth making a note here that pointers are the only modifiers that can directly wrap functions (since you can't have arrays of functions or functions returning functions), so the only thing we're guarding against here is function types as the outermost modifier. But it's not super crucial.


>diff --git a/js/src/jit-test/tests/basic/CTypes-toString.js b/js/src/jit-test/tests/basic/CTypes-toString.js

Awesome tests! These should go in toolkit/components/ctypes/tests though.

r=bholley with the tests moved.

Comment 3

[Jim Blandy :jimb]

Created attachment 594854 [details] [diff] [review]
Make JavaScript CTypes print function types correctly. (r=bholley on original)

Revised per bholley's review comments.

Comment 4

[Jim Blandy :jimb]

try run: https://tbpl.mozilla.org/?tree=Try&rev=4eee592f6378

Comment 5

[Jim Blandy :jimb]

Try looks good.
https://hg.mozilla.org/integration/mozilla-inbound/rev/c0077ffef801

Comment 6

[Marco Bonardo [::mak]]

Backed out due to test failures on all Windows boxes in test_ctypes.js and test_ctypes.xul.

Fwiw, Try didn't really look good ;)

Comment 7

[Jim Blandy :jimb]

(In reply to Marco Bonardo [:mak] from comment #6)
> Fwiw, Try didn't really look good ;)

I suck. Thanks, Marco.

Comment 8

[Jim Blandy :jimb]

Created attachment 595983 [details] [diff] [review]
Make JavaScript CTypes print function types correctly. (r=bholley on original)

Revised to fix Win32 tests (bad spacing for __stdcall and WINAPI qualifiers).

Comment 9

[Jim Blandy :jimb]

New try run: https://tbpl.mozilla.org/?tree=Try&rev=c327706ed342

Comment 10

[Jim Blandy :jimb]

(In reply to Jim Blandy :jimb from comment #9)
> New try run: https://tbpl.mozilla.org/?tree=Try&rev=c327706ed342

That showed up some more xpcshell test failures. This one is clean:
https://tbpl.mozilla.org/?tree=Try&rev=cc27c2c3fa1a

Comment 11

[Jim Blandy :jimb]

https://hg.mozilla.org/integration/mozilla-inbound/rev/f80c406b902a

Comment 12

[Marco Bonardo [::mak]]

https://hg.mozilla.org/mozilla-central/rev/f80c406b902a