New ast types for user defined, including state variable fixes for in…

…itial value
unpackdev · Oct 18, 2023 · 1d7a45e · 1d7a45e
1 parent 34a3f0c
commit 1d7a45e
Show file tree

Hide file tree

Showing 14 changed files with 1,275 additions and 70 deletions.
diff --git a/ast/state_variable.proto b/ast/state_variable.proto
@@ -5,6 +5,7 @@ package unpack.v1.ast;
 import "ast/types.proto";
 import "ast/src.proto";
 import "ast/type_name.proto";
+import "xds/type/v3/typed_struct.proto";
 
 message StateVariable {
     int64 id = 1;
@@ -19,4 +20,5 @@ message StateVariable {
     unpack.v1.ast.Mutability state_mutability = 10;
     unpack.v1.ast.TypeName type_name = 11;
     unpack.v1.ast.TypeDescription type_description = 12;
+    xds.type.v3.TypedStruct initial_value = 13;
 }
diff --git a/ast/types.proto b/ast/types.proto
@@ -128,6 +128,7 @@ enum NodeType {
   YUL_VARIABLE_DECLARATION = 122;
   YUL_EXPRESSION = 123;
   HEX_NUMBER = 124;
+  USER_DEFINED_VALUE_TYPE = 125;
 }
 
 enum Mutability {

diff --git a/ast/user_defined.proto b/ast/user_defined.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+package unpack.v1.ast;
+option go_package = "github.com/unpackdev/protos/dist/go/ast;ast_pb";
+
+import "ast/types.proto";
+import "ast/src.proto";
+import "ast/type_name.proto";
+
+message UserDefinedValueTypeDefinition {
+    int64 id = 1;
+    unpack.v1.ast.NodeType node_type = 2;
+    unpack.v1.ast.Src src = 3;
+    bool is = 4;
+    string type = 5;
+    unpack.v1.ast.Src type_location = 6;
+    string name = 7;
+    unpack.v1.ast.Src name_location = 8;
+    unpack.v1.ast.TypeName type_name = 9;
+    int64 referenced_declaration = 10;
+    unpack.v1.ast.TypeDescription type_description = 11;
+}
diff --git a/dist/docs/docs.json b/dist/docs/docs.json
@@ -10496,6 +10496,18 @@
               "isoneof": false,
               "oneofdecl": "",
               "defaultValue": ""
+            },
+            {
+              "name": "initial_value",
+              "description": "",
+              "label": "",
+              "type": "TypedStruct",
+              "longType": "xds.type.v3.TypedStruct",
+              "fullType": "xds.type.v3.TypedStruct",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         }
@@ -12502,6 +12514,11 @@
               "name": "HEX_NUMBER",
               "number": "124",
               "description": ""
+            },
+            {
+              "name": "USER_DEFINED_VALUE_TYPE",
+              "number": "125",
+              "description": ""
             }
           ]
         },
@@ -13118,6 +13135,164 @@
       ],
       "services": []
     },
+    {
+      "name": "ast/user_defined.proto",
+      "description": "",
+      "package": "unpack.v1.ast",
+      "hasEnums": false,
+      "hasExtensions": false,
+      "hasMessages": true,
+      "hasServices": false,
+      "enums": [],
+      "extensions": [],
+      "messages": [
+        {
+          "name": "UserDefinedValueTypeDefinition",
+          "longName": "UserDefinedValueTypeDefinition",
+          "fullName": "unpack.v1.ast.UserDefinedValueTypeDefinition",
+          "description": "",
+          "hasExtensions": false,
+          "hasFields": true,
+          "hasOneofs": false,
+          "extensions": [],
+          "fields": [
+            {
+              "name": "id",
+              "description": "",
+              "label": "",
+              "type": "int64",
+              "longType": "int64",
+              "fullType": "int64",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "node_type",
+              "description": "",
+              "label": "",
+              "type": "NodeType",
+              "longType": "NodeType",
+              "fullType": "unpack.v1.ast.NodeType",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "src",
+              "description": "",
+              "label": "",
+              "type": "Src",
+              "longType": "Src",
+              "fullType": "unpack.v1.ast.Src",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "is",
+              "description": "",
+              "label": "",
+              "type": "bool",
+              "longType": "bool",
+              "fullType": "bool",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "type",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "type_location",
+              "description": "",
+              "label": "",
+              "type": "Src",
+              "longType": "Src",
+              "fullType": "unpack.v1.ast.Src",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "name",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "name_location",
+              "description": "",
+              "label": "",
+              "type": "Src",
+              "longType": "Src",
+              "fullType": "unpack.v1.ast.Src",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "type_name",
+              "description": "",
+              "label": "",
+              "type": "TypeName",
+              "longType": "TypeName",
+              "fullType": "unpack.v1.ast.TypeName",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "referenced_declaration",
+              "description": "",
+              "label": "",
+              "type": "int64",
+              "longType": "int64",
+              "fullType": "int64",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            },
+            {
+              "name": "type_description",
+              "description": "",
+              "label": "",
+              "type": "TypeDescription",
+              "longType": "TypeDescription",
+              "fullType": "unpack.v1.ast.TypeDescription",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
+            }
+          ]
+        }
+      ],
+      "services": []
+    },
     {
       "name": "ast/using.proto",
       "description": "",

diff --git a/dist/go/ast/state_variable.pb.go b/dist/go/ast/state_variable.pb.go