mirror of
https://github.com/open-goal/jak-project
synced 2026-08-15 21:00:19 -04:00
deftype and defmethod syntax major changes (#3094)
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>
This commit is contained in:
+6
-9
@@ -6,7 +6,7 @@
|
||||
|
||||
;; definition for method 9 of type collide-cache
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defmethod debug-draw collide-cache ((this collide-cache))
|
||||
(defmethod debug-draw ((this collide-cache))
|
||||
(let ((gp-0 (the-as object (-> this tris))))
|
||||
(countdown (s4-0 (-> this num-tris))
|
||||
(let ((t1-0 (copy-and-set-field (-> *pat-mode-info* (-> (the-as collide-cache-tri gp-0) pat mode) color) a 64)))
|
||||
@@ -55,17 +55,14 @@
|
||||
|
||||
;; definition of type col-rend-filter
|
||||
(deftype col-rend-filter (structure)
|
||||
((show-pat-set pat-surface :offset-assert 0)
|
||||
(show-pat-clear pat-surface :offset-assert 4)
|
||||
(event-mask uint32 :offset-assert 8)
|
||||
((show-pat-set pat-surface)
|
||||
(show-pat-clear pat-surface)
|
||||
(event-mask uint32)
|
||||
)
|
||||
:method-count-assert 9
|
||||
:size-assert #xc
|
||||
:flag-assert #x90000000c
|
||||
)
|
||||
|
||||
;; definition for method 3 of type col-rend-filter
|
||||
(defmethod inspect col-rend-filter ((this col-rend-filter))
|
||||
(defmethod inspect ((this col-rend-filter))
|
||||
(when (not this)
|
||||
(set! this this)
|
||||
(goto cfg-4)
|
||||
@@ -185,7 +182,7 @@
|
||||
|
||||
;; definition for method 9 of type col-rend
|
||||
;; INFO: Used lq/sq
|
||||
(defmethod col-rend-method-9 col-rend ((this col-rend))
|
||||
(defmethod col-rend-method-9 ((this col-rend))
|
||||
(let ((s5-0 (new 'stack-no-clear 'collide-query)))
|
||||
(let ((f30-0 (-> this bbox-radius)))
|
||||
(let ((v1-0 (-> this track)))
|
||||
|
||||
Reference in New Issue
Block a user