feat: simplify Args, make it plain array

Author: i582

examples/golang/tasm-go/spec/spec.go

@@ -262,9 +262,23 @@ func loader(instructions []spec.Instruction) loaderFunc {
 
 		var args []any
 
-		switch layout.Args.Empty {
-		case spec.SimpleArgs:
-			for _, child := range layout.Args.Children {
+		// Process DICTPUSHCONST-like instructions with separate logic
+		if len(layout.Args) == 2 && layout.Args[0].Empty == "dict" {
+			keyLength := slice.MustLoadUInt(10)
+			dictCell, _ := slice.LoadRefCell()
+			dict := dictCell.AsDict(uint(keyLength))
+			keyValues, _ := dict.LoadAll()
+
+			methods := make([]DecompiledMethod, 0, len(keyValues))
+			for _, kv := range keyValues {
+				id := kv.Key.MustLoadUInt(uint(keyLength))
+				code := decompileCell(kv.Value.MustToCell())
+				methods = append(methods, DecompiledMethod{id, code.instructions})
+			}
+
+			args = append(args, keyLength, DecompiledDict{methods})
+		} else {
+			for _, child := range layout.Args {
 				switch child.Empty {
 				case "delta":
 					switch child.Arg.Empty {
@@ -328,20 +342,6 @@ func loader(instructions []spec.Instruction) loaderFunc {
 					log.Fatalf("unhandled type of arg: %v", child)
 				}
 			}
-		case spec.Dictpush:
-			keyLength := slice.MustLoadUInt(10)
-			dictCell, _ := slice.LoadRefCell()
-			dict := dictCell.AsDict(uint(keyLength))
-			all, _ := dict.LoadAll()
-
-			methods := make([]DecompiledMethod, 0, len(all))
-			for _, kv := range all {
-				id := kv.Key.MustLoadUInt(uint(keyLength))
-				code := decompileCell(kv.Value.MustToCell())
-				methods = append(methods, DecompiledMethod{id, code.instructions})
-			}
-
-			args = append(args, keyLength, DecompiledDict{methods})
 		}
 
 		return DeserializedInstruction{

examples/golang/tasm-go/tasm/decompile.go

@@ -381,40 +381,11 @@
       "additionalProperties": false
     },
     "Args": {
-      "description": "Arguments structure for instruction operands",
-      "oneOf": [
-        {
-          "type": "object",
-          "description": "Plain arguments with children",
-          "properties": {
-            "$": {
-              "type": "string",
-              "const": "simpleArgs"
-            },
-            "children": {
-              "type": "array",
-              "description": "List of child argument structures",
-              "items": {
-                "$ref": "#/definitions/Arg"
-              }
-            }
-          },
-          "required": ["$", "children"],
-          "additionalProperties": false
-        },
-        {
-          "type": "object",
-          "description": "Dictionary push arguments (key length and dictionary)",
-          "properties": {
-            "$": {
-              "type": "string",
-              "const": "dictpush"
-            }
-          },
-          "required": ["$"],
-          "additionalProperties": false
-        }
-      ]
+      "description": "Instruction arguments",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Arg"
+      }
     },
     "ArgRange": {
       "type": "object",
@@ -478,6 +449,9 @@
         {
           "$ref": "#/definitions/InlineCodeSliceArg"
         },
+        {
+          "$ref": "#/definitions/InlineDictArg"
+        },
         {
           "$ref": "#/definitions/ExoticCellArg"
         },
@@ -727,6 +701,17 @@
       "required": ["$", "bits"],
       "additionalProperties": false
     },
+    "InlineDictArg": {
+      "type": "object",
+      "properties": {
+        "$": {
+          "type": "string",
+          "const": "dict"
+        }
+      },
+      "required": ["$"],
+      "additionalProperties": false
+    },
     "ExoticCellArg": {
       "type": "object",
       "properties": {