mirror of
https://github.com/open-goal/jak-project
synced 2026-05-26 07:39:12 -04:00
ManDude
cd68cb671e
Major change to how `deftype` shows up in our code: - the decompiler will no longer emit the `offset-assert`, `method-count-assert`, `size-assert` and `flag-assert` parameters. There are extremely few cases where having this in the decompiled code is helpful, as the types there come from `all-types` which already has those parameters. This also doesn't break type consistency because: - the asserts aren't compared. - the first step of the test uses `all-types`, which has the asserts, which will throw an error if they're bad. - the decompiler won't emit the `heap-base` parameter unless necessary now. - the decompiler will try its hardest to turn a fixed-offset field into an `overlay-at` field. It falls back to the old offset if all else fails. - `overlay-at` now supports field "dereferencing" to specify the offset that's within a field that's a structure, e.g.: ```lisp (deftype foobar (structure) ((vec vector :inline) (flags int32 :overlay-at (-> vec w)) ) ) ``` in this structure, the offset of `flags` will be 12 because that is the final offset of `vec`'s `w` field within this structure. - **removed ID from all method declarations.** IDs are only ever automatically assigned now. Fixes #3068. - added an `:overlay` parameter to method declarations, in order to declare a new method that goes on top of a previously-defined method. Syntax is `:overlay <method-name>`. Please do not ever use this. - added `state-methods` list parameter. This lets you quickly specify a list of states to be put in the method table. Same syntax as the `states` list parameter. The decompiler will try to put as many states in this as it can without messing with the method ID order. Also changes `defmethod` to make the first type definition (before the arguments) optional. The type can now be inferred from the first argument. Fixes #3093. --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
32 lines
707 B
Common Lisp
32 lines
707 B
Common Lisp
(deftype test-stack-type (basic)
|
|
((name string)
|
|
(count uint32)
|
|
(pad uint8 12))
|
|
(:methods
|
|
(new (symbol type int) _type_)
|
|
)
|
|
)
|
|
|
|
(defmethod new test-stack-type ((allocation symbol) (type-to-make type) (init-count int))
|
|
(let ((obj (object-new allocation type-to-make)))
|
|
(set! (-> obj name) "this is my name")
|
|
(set! (-> obj count) init-count)
|
|
obj
|
|
)
|
|
)
|
|
|
|
|
|
(defun stack-test-2 ()
|
|
(let ((obj (new 'stack 'test-stack-type 12))
|
|
(obj2 (new 'stack 'test-stack-type 13)))
|
|
(if (and (= 4 (logand 15 (the uint obj)))
|
|
(= 4 (logand 15 (the uint obj2)))
|
|
(= 12 (-> obj count))
|
|
)
|
|
1234
|
|
0
|
|
)
|
|
)
|
|
)
|
|
|
|
(stack-test-2) |