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>

decompiler/analysis/analyze_inspect_method.cpp

@@ -1643,31 +1643,59 @@ std::string TypeInspectorResult::print_as_deftype(
   }
 
   if (type_method_count > 9) {
-    result.append("(:methods\n    ");
+    std::string methods_list;
+    std::string state_methods_list;
+
     MethodInfo old_new_method;
     if (old_game_type && old_game_type->get_my_new_method(&old_new_method)) {
-      result.append(old_method_string(old_new_method));
-      result.append("\n    ");
+      methods_list.append("    ");
+      methods_list.append(old_method_string(old_new_method));
+      methods_list.push_back('\n');
     }
+    bool done_with_state_methods = false;
     for (int i = parent_method_count; i < type_method_count; i++) {
-      // If the method is actually a state, skip it!
+      bool print_as_state_method = false;
       if (method_states.count(i) != 0) {
-        result.append(fmt::format("({} () _type_ :state {})", method_states.at(i), i));
+        if (!done_with_state_methods) {
+          print_as_state_method = true;
+          state_methods_list.append(fmt::format("    {}", method_states.at(i)));
+        } else {
+          methods_list.append(
+              fmt::format("    ({} () _type_ :state) ;; {}", method_states.at(i), i));
+        }
       } else {
-        result.append(fmt::format("({}-method-{} () none {})", type_name, i, i));
+        done_with_state_methods = true;
+        methods_list.append(fmt::format("    ({}-method-{} () none) ;; {}", type_name, i, i));
       }
       if (old_game_type) {
         MethodInfo info;
         if (old_game_type->get_my_method(i, &info)) {
-          result += old_method_string(info);
+          if (print_as_state_method) {
+            state_methods_list += old_method_string(info);
+          } else {
+            methods_list += old_method_string(info);
+          }
         }
       }
-      result.append("\n    ");
+      if (print_as_state_method) {
+        state_methods_list.push_back('\n');
+      } else {
+        methods_list.push_back('\n');
+      }
+    }
+    if (!state_methods_list.empty()) {
+      result.append("(:state-methods\n");
+      result.append(state_methods_list);
+      result.append("    )\n  ");
+    }
+    if (!methods_list.empty()) {
+      result.append("(:methods");
+      result.append(methods_list);
+      result.append("    )\n  ");
     }
-    result.append(")\n  ");
   }
 
-  // Print out states if we have em
+  // Print out (normal) states if we have em
   // - Could probably assume the process name comes first and associate it with the right type
   // but that may or may not be risky so, edit the types yourself...
   if (method_states.size() > 0) {

decompiler/analysis/final_output.cpp

@@ -178,7 +178,9 @@ std::string final_defun_out(const Function& func,
     auto method_info =
         dts.ts.lookup_method(func.guessed_name.type_name, func.guessed_name.method_id);
     top.push_back(pretty_print::to_symbol(method_info.name));
-    top.push_back(pretty_print::to_symbol(func.guessed_name.type_name));
+    if (method_info.name == "new") {
+      top.push_back(pretty_print::to_symbol(func.guessed_name.type_name));
+    }
     top.push_back(arguments);
     auto top_form = pretty_print::build_list(top);
 

decompiler/config/jak1/ntsc_v1/inputs.jsonc

@@ -9,9 +9,7 @@
   // you want to run on the entire game.
   "dgo_names": [
     "CGO/KERNEL.CGO",
-    "CGO/ENGINE.CGO",
     "CGO/GAME.CGO",
-    "CGO/ART.CGO",
     "DGO/BEA.DGO",
     "DGO/CIT.DGO",
     "CGO/COMMON.CGO",

decompiler/util/DecompilerTypeSystem.cpp

@@ -110,7 +110,7 @@ void DecompilerTypeSystem::parse_type_defs(const std::vector<std::string>& file_
     } catch (std::exception& e) {
       auto info = m_reader.db.get_info_for(o);
       lg::error("{} when parsing decompiler type file:{}", e.what(), info);
-      throw e;
+      throw;
     }
   });
 }