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
+6 -10
View File
@@ -3,19 +3,15 @@
;; definition of type simple-focus
(deftype simple-focus (process-focusable)
((first-time? symbol :offset-assert 204)
((first-time? symbol)
)
:heap-base #x50
:method-count-assert 28
:size-assert #xd0
:flag-assert #x1c005000d0
(:methods
(idle () _type_ :state 27)
(:state-methods
idle
)
)
;; definition for method 3 of type simple-focus
(defmethod inspect simple-focus ((this simple-focus))
(defmethod inspect ((this simple-focus))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -29,13 +25,13 @@
)
;; definition for method 20 of type simple-focus
(defmethod get-trans simple-focus ((this simple-focus) (arg0 int))
(defmethod get-trans ((this simple-focus) (arg0 int))
"@returns the `trans` [[vector]] from the process's `root` (typically either a [[trsqv]] or a [[collide-shape]])"
(-> this root trans)
)
;; definition for method 12 of type simple-focus
(defmethod run-logic? simple-focus ((this simple-focus))
(defmethod run-logic? ((this simple-focus))
(when (-> this first-time?)
(set! (-> this first-time?) #f)
#t