mirror of
https://github.com/open-goal/jak-project
synced 2026-09-06 11:20:54 -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:
+4
-4
@@ -1110,7 +1110,7 @@
|
||||
)
|
||||
|
||||
;; definition for method 9 of type editable-array
|
||||
(defmethod editable-array-method-9 editable-array ((this editable-array) (arg0 editable-command) (arg1 mouse-info))
|
||||
(defmethod editable-array-method-9 ((this editable-array) (arg0 editable-command) (arg1 mouse-info))
|
||||
(if (execute-select this arg0 arg1)
|
||||
(return #f)
|
||||
)
|
||||
@@ -1424,7 +1424,7 @@
|
||||
)
|
||||
|
||||
;; definition for method 10 of type editable-player
|
||||
(defmethod deactivate editable-player ((this editable-player))
|
||||
(defmethod deactivate ((this editable-player))
|
||||
(dotimes (v1-0 (-> *level* length))
|
||||
(let ((a1-3 (-> *level* level v1-0)))
|
||||
(if (= (-> a1-3 status) 'active)
|
||||
@@ -1440,7 +1440,7 @@
|
||||
|
||||
;; definition for method 7 of type editable-player
|
||||
;; WARN: Return type mismatch process-drawable vs editable-player.
|
||||
(defmethod relocate editable-player ((this editable-player) (arg0 int))
|
||||
(defmethod relocate ((this editable-player) (arg0 int))
|
||||
(let ((v1-0 *kernel-context*))
|
||||
(set! (-> v1-0 relocating-process) this)
|
||||
(set! (-> v1-0 relocating-min) (the-as int (&-> this type)))
|
||||
@@ -1461,7 +1461,7 @@
|
||||
|
||||
;; definition for method 21 of type editable-player
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defmethod editable-player-method-21 editable-player ((this editable-player))
|
||||
(defmethod editable-player-method-21 ((this editable-player))
|
||||
(set! *display-region-marks* #f)
|
||||
(let* ((s5-0 (-> this current length))
|
||||
(s4-0 0)
|
||||
|
||||
Reference in New Issue
Block a user