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:
ManDude
2023-10-30 03:20:02 +00:00
committed by GitHub
parent 09536c68ac
commit cd68cb671e
2079 changed files with 94384 additions and 117066 deletions
@@ -3,42 +3,40 @@
;; definition of type process-taskable
(deftype process-taskable (process-focusable)
((task game-task-control :offset-assert 204)
(ambient ambient-control :inline :offset-assert 208)
(neck-joint-index int32 :offset-assert 224)
(talk-message text-id :offset-assert 228)
(bounce-away symbol :offset-assert 232)
(will-talk symbol :offset-assert 236)
(look-at-me symbol :offset-assert 240)
(hide-during-movie symbol :offset-assert 244)
(talk-distance meters :offset-assert 248)
(talk-height meters :offset-assert 252)
(last-talk time-frame :offset-assert 256)
(want-to-say time-frame :offset-assert 264)
(birth-time time-frame :offset-assert 272)
(slave handle :offset-assert 280)
((task game-task-control)
(ambient ambient-control :inline)
(neck-joint-index int32)
(talk-message text-id)
(bounce-away symbol)
(will-talk symbol)
(look-at-me symbol)
(hide-during-movie symbol)
(talk-distance meters)
(talk-height meters)
(last-talk time-frame)
(want-to-say time-frame)
(birth-time time-frame)
(slave handle)
)
:heap-base #xa0
:method-count-assert 38
:size-assert #x120
:flag-assert #x2600a00120
(:state-methods
hide
idle
(active game-task-event)
(play-game game-task-event)
)
(:methods
(hide () _type_ :state 27)
(idle () _type_ :state 28)
(active (game-task-event) _type_ :state 29)
(play-game (game-task-event) _type_ :state 30)
(process-taskable-method-31 (_type_) none 31)
(process-taskable-method-32 (_type_) none 32)
(init-art! (_type_) none 33)
(process-taskable-method-34 (_type_) symbol 34)
(get-art-elem (_type_) art-element 35)
(process-taskable-method-36 (_type_) none 36)
(process-taskable-method-37 (_type_) none 37)
(process-taskable-method-31 (_type_) none)
(process-taskable-method-32 (_type_) none)
(init-art! (_type_) none)
(process-taskable-method-34 (_type_) symbol)
(get-art-elem (_type_) art-element)
(process-taskable-method-36 (_type_) none)
(process-taskable-method-37 (_type_) none)
)
)
;; definition for method 3 of type process-taskable
(defmethod inspect process-taskable ((this process-taskable))
(defmethod inspect ((this process-taskable))
(when (not this)
(set! this this)
(goto cfg-4)