diff options
| author | Mike Pall <mike> | 2016-07-17 16:25:37 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-17 16:25:37 +0200 |
| commit | 22e8e0796940e0583c59642dad069873c1077f75 (patch) | |
| tree | 2108f59894ff9c6e25609de54beb1493b031dccb /src | |
| parent | d41469c12461da00db73d548d0fbf018fb28494a (diff) | |
| parent | 6be5ffdf2b20b870392ee265f6ff7792f072592f (diff) | |
| download | luajit-22e8e0796940e0583c59642dad069873c1077f75.tar.gz luajit-22e8e0796940e0583c59642dad069873c1077f75.tar.bz2 luajit-22e8e0796940e0583c59642dad069873c1077f75.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_ctype.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lj_ctype.h b/src/lj_ctype.h index e9b426f0..4e49f57f 100644 --- a/src/lj_ctype.h +++ b/src/lj_ctype.h | |||
| @@ -42,18 +42,18 @@ LJ_STATIC_ASSERT(((int)CT_STRUCT & (int)CT_ARRAY) == CT_STRUCT); | |||
| 42 | ** ---------- info ------------ | 42 | ** ---------- info ------------ |
| 43 | ** |type flags... A cid | size | sib | next | name | | 43 | ** |type flags... A cid | size | sib | next | name | |
| 44 | ** +----------------------------+--------+-------+-------+-------+-- | 44 | ** +----------------------------+--------+-------+-------+-------+-- |
| 45 | ** |NUM BFvcUL.. A | size | | type | | | 45 | ** |NUM BFcvUL.. A | size | | type | | |
| 46 | ** |STRUCT ..vcU..V A | size | field | name? | name? | | 46 | ** |STRUCT ..cvU..V A | size | field | name? | name? | |
| 47 | ** |PTR ..vcR... A cid | size | | type | | | 47 | ** |PTR ..cvR... A cid | size | | type | | |
| 48 | ** |ARRAY VCvc...V A cid | size | | type | | | 48 | ** |ARRAY VCcv...V A cid | size | | type | | |
| 49 | ** |VOID ..vc.... A | size | | type | | | 49 | ** |VOID ..cv.... A | size | | type | | |
| 50 | ** |ENUM A cid | size | const | name? | name? | | 50 | ** |ENUM A cid | size | const | name? | name? | |
| 51 | ** |FUNC ....VS.. cc cid | nargs | field | name? | name? | | 51 | ** |FUNC ....VS.. cc cid | nargs | field | name? | name? | |
| 52 | ** |TYPEDEF cid | | | name | name | | 52 | ** |TYPEDEF cid | | | name | name | |
| 53 | ** |ATTRIB attrnum cid | attr | sib? | type? | | | 53 | ** |ATTRIB attrnum cid | attr | sib? | type? | | |
| 54 | ** |FIELD cid | offset | field | | name? | | 54 | ** |FIELD cid | offset | field | | name? | |
| 55 | ** |BITFIELD B.vcU csz bsz pos | offset | field | | name? | | 55 | ** |BITFIELD B.cvU csz bsz pos | offset | field | | name? | |
| 56 | ** |CONSTVAL c cid | value | const | name | name | | 56 | ** |CONSTVAL c cid | value | const | name | name | |
| 57 | ** |EXTERN cid | | sib? | name | name | | 57 | ** |EXTERN cid | | sib? | name | name | |
| 58 | ** |KW tok | size | | name | name | | 58 | ** |KW tok | size | | name | name | |
| 59 | ** +----------------------------+--------+-------+-------+-------+-- | 59 | ** +----------------------------+--------+-------+-------+-------+-- |