mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-05 15:18:49 +00:00
Add missing doc_format flags for entities and improve docs for the odin package
This commit is contained in:
@@ -28,11 +28,11 @@ Magic_String :: "odindoc\x00";
|
|||||||
|
|
||||||
Header_Base :: struct {
|
Header_Base :: struct {
|
||||||
magic: [8]byte,
|
magic: [8]byte,
|
||||||
_: u32le,
|
_: u32le, // padding
|
||||||
version: Version_Type,
|
version: Version_Type,
|
||||||
total_size: u32le,
|
total_size: u32le, // in bytes
|
||||||
header_size: u32le,
|
header_size: u32le, // in bytes
|
||||||
hash: u32le,
|
hash: u32le, // hash of the data after the header (header_size)
|
||||||
}
|
}
|
||||||
|
|
||||||
Header :: struct {
|
Header :: struct {
|
||||||
@@ -95,16 +95,17 @@ Entity_Flag :: enum u32le {
|
|||||||
Foreign = 0,
|
Foreign = 0,
|
||||||
Export = 1,
|
Export = 1,
|
||||||
|
|
||||||
Param_Using = 2,
|
Param_Using = 2, // using
|
||||||
Param_Const = 3,
|
Param_Const = 3, // #const
|
||||||
Param_Auto_Cast = 4,
|
Param_Auto_Cast = 4, // auto_cast
|
||||||
Param_Ellipsis = 5,
|
Param_Ellipsis = 5, // Variadic parameter
|
||||||
Param_CVararg = 6,
|
Param_CVararg = 6, // #c_vararg
|
||||||
Param_No_Alias = 7,
|
Param_No_Alias = 7, // #no_alias
|
||||||
|
|
||||||
Type_Alias = 8,
|
Type_Alias = 8,
|
||||||
|
|
||||||
Var_Thread_Local = 9,
|
Var_Thread_Local = 9,
|
||||||
|
Var_Static = 10,
|
||||||
}
|
}
|
||||||
|
|
||||||
Entity_Flags :: distinct bit_set[Entity_Flag; u32le];
|
Entity_Flags :: distinct bit_set[Entity_Flag; u32le];
|
||||||
@@ -116,14 +117,25 @@ Entity :: struct {
|
|||||||
name: String,
|
name: String,
|
||||||
type: Type_Index,
|
type: Type_Index,
|
||||||
init_string: String,
|
init_string: String,
|
||||||
_: u32le,
|
_: u32le, // reserved for init
|
||||||
comment: String,
|
comment: String,
|
||||||
docs: String,
|
docs: String,
|
||||||
|
|
||||||
|
// May used by:
|
||||||
|
// .Variable
|
||||||
|
// .Procedure
|
||||||
foreign_library: Entity_Index,
|
foreign_library: Entity_Index,
|
||||||
|
// May used by:
|
||||||
|
// .Variable
|
||||||
|
// .Procedure
|
||||||
link_name: String,
|
link_name: String,
|
||||||
|
|
||||||
attributes: Array(Attribute),
|
attributes: Array(Attribute),
|
||||||
grouped_entities: Array(Entity_Index), // Procedure Groups
|
|
||||||
where_clauses: Array(String), // Procedures
|
// Used by: .Proc_Group
|
||||||
|
grouped_entities: Array(Entity_Index),
|
||||||
|
// May used by: .Procedure
|
||||||
|
where_clauses: Array(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
Attribute :: struct {
|
Attribute :: struct {
|
||||||
@@ -160,14 +172,23 @@ Type_Elems_Cap :: 4;
|
|||||||
|
|
||||||
Type :: struct {
|
Type :: struct {
|
||||||
kind: Type_Kind,
|
kind: Type_Kind,
|
||||||
flags: u32le, // Type_Kind specific
|
// Type_Kind specific used by some types
|
||||||
|
// Underlying flag types:
|
||||||
|
// .Basic - Type_Flags_Basic
|
||||||
|
// .Struct - Type_Flags_Struct
|
||||||
|
// .Union - Type_Flags_Union
|
||||||
|
// .Proc - Type_Flags_Proc
|
||||||
|
// .Bit_Set - Type_Flags_Bit_Set
|
||||||
|
flags: u32le,
|
||||||
|
|
||||||
// Used by:
|
// Used by:
|
||||||
// .Basic
|
// .Basic
|
||||||
// .Named
|
// .Named
|
||||||
// .Generic
|
// .Generic
|
||||||
name: String,
|
name: String,
|
||||||
custom_align: String, // .Struct, .Union
|
|
||||||
|
// Used By: .Struct, .Union
|
||||||
|
custom_align: String,
|
||||||
|
|
||||||
// Used by:
|
// Used by:
|
||||||
// .Array - 1 count: 0=len
|
// .Array - 1 count: 0=len
|
||||||
@@ -178,8 +199,9 @@ Type :: struct {
|
|||||||
elem_count_len: u32le,
|
elem_count_len: u32le,
|
||||||
elem_counts: [Type_Elems_Cap]i64le,
|
elem_counts: [Type_Elems_Cap]i64le,
|
||||||
|
|
||||||
// Each of these is esed by some types, not all
|
// Used by: .Procedures
|
||||||
calling_convention: String, // Procedures
|
// blank implies the "odin" calling convention
|
||||||
|
calling_convention: String,
|
||||||
|
|
||||||
// Used by:
|
// Used by:
|
||||||
// .Named - 1 type: 0=base type
|
// .Named - 1 type: 0=base type
|
||||||
@@ -195,22 +217,24 @@ Type :: struct {
|
|||||||
// .SOA_Struct_Dynamic - 1 type: underlying SOA struct element
|
// .SOA_Struct_Dynamic - 1 type: underlying SOA struct element
|
||||||
// .Union - 0+ types: variants
|
// .Union - 0+ types: variants
|
||||||
// .Enum - <1 type: 0=base type
|
// .Enum - <1 type: 0=base type
|
||||||
// .Procedure - 2 types: 0=parameters, 1=results
|
// .Proc - 2 types: 0=parameters, 1=results
|
||||||
// .Bit_Set - <=2 types: 0=element type, 1=underlying type (Underlying_Type flag will be set)
|
// .Bit_Set - <=2 types: 0=element type, 1=underlying type (Underlying_Type flag will be set)
|
||||||
// .Simd_Vector - 1 type: 0=element
|
// .Simd_Vector - 1 type: 0=element
|
||||||
// .Relative_Pointer - 2 types: 0=pointer type, 1=base integer
|
// .Relative_Pointer - 2 types: 0=pointer type, 1=base integer
|
||||||
// .Relative_Slice - 2 types: 0=slice type, 1=base integer
|
// .Relative_Slice - 2 types: 0=slice type, 1=base integer
|
||||||
types: Array(Type_Index),
|
types: Array(Type_Index),
|
||||||
|
|
||||||
// Used by:
|
// Used by:
|
||||||
// .Named - 1 field for the definition
|
// .Named - 1 field for the definition
|
||||||
// .Struct - fields
|
// .Struct - fields
|
||||||
// .Enum - fields
|
// .Enum - fields
|
||||||
// .Tuple - parameters (procedures only)
|
// .Tuple - parameters (procedures only)
|
||||||
entities: Array(Entity_Index),
|
entities: Array(Entity_Index),
|
||||||
|
|
||||||
polymorphic_params: Type_Index, // .Struct, .Union
|
// Used By: .Struct, .Union
|
||||||
where_clauses: Array(String), // .Struct, .Union
|
polymorphic_params: Type_Index,
|
||||||
|
// Used By: .Struct, .Union
|
||||||
|
where_clauses: Array(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
Type_Flags_Basic :: distinct bit_set[Type_Flag_Basic; u32le];
|
Type_Flags_Basic :: distinct bit_set[Type_Flag_Basic; u32le];
|
||||||
|
|||||||
@@ -167,6 +167,7 @@ enum OdinDocEntityFlag : u32 {
|
|||||||
OdinDocEntityFlag_Type_Alias = 1<<8,
|
OdinDocEntityFlag_Type_Alias = 1<<8,
|
||||||
|
|
||||||
OdinDocEntityFlag_Var_Thread_Local = 1<<9,
|
OdinDocEntityFlag_Var_Thread_Local = 1<<9,
|
||||||
|
OdinDocEntityFlag_Var_Static = 1<<10,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct OdinDocEntity {
|
struct OdinDocEntity {
|
||||||
|
|||||||
+11
-2
@@ -813,19 +813,28 @@ OdinDocEntityIndex odin_doc_add_entity(OdinDocWriter *w, Entity *e) {
|
|||||||
break;
|
break;
|
||||||
case Entity_Variable:
|
case Entity_Variable:
|
||||||
if (e->Variable.is_foreign) { flags |= OdinDocEntityFlag_Foreign; }
|
if (e->Variable.is_foreign) { flags |= OdinDocEntityFlag_Foreign; }
|
||||||
if (e->Variable.is_export) { flags |= OdinDocEntityFlag_Export; }
|
if (e->Variable.is_export) { flags |= OdinDocEntityFlag_Export; }
|
||||||
if (e->Variable.thread_local_model != "") {
|
if (e->Variable.thread_local_model != "") {
|
||||||
flags |= OdinDocEntityFlag_Var_Thread_Local;
|
flags |= OdinDocEntityFlag_Var_Thread_Local;
|
||||||
}
|
}
|
||||||
|
if (e->flags & EntityFlag_Static) { flags |= OdinDocEntityFlag_Var_Static; }
|
||||||
link_name = e->Variable.link_name;
|
link_name = e->Variable.link_name;
|
||||||
break;
|
break;
|
||||||
case Entity_Procedure:
|
case Entity_Procedure:
|
||||||
if (e->Procedure.is_foreign) { flags |= OdinDocEntityFlag_Foreign; }
|
if (e->Procedure.is_foreign) { flags |= OdinDocEntityFlag_Foreign; }
|
||||||
if (e->Procedure.is_export) { flags |= OdinDocEntityFlag_Export; }
|
if (e->Procedure.is_export) { flags |= OdinDocEntityFlag_Export; }
|
||||||
link_name = e->Procedure.link_name;
|
link_name = e->Procedure.link_name;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (e->flags & EntityFlag_Param) {
|
||||||
|
if (e->flags & EntityFlag_Using) { flags |= OdinDocEntityFlag_Param_Using; }
|
||||||
|
if (e->flags & EntityFlag_ConstInput) { flags |= OdinDocEntityFlag_Param_Const; }
|
||||||
|
if (e->flags & EntityFlag_AutoCast) { flags |= OdinDocEntityFlag_Param_AutoCast; }
|
||||||
|
if (e->flags & EntityFlag_Ellipsis) { flags |= OdinDocEntityFlag_Param_Ellipsis; }
|
||||||
|
if (e->flags & EntityFlag_NoAlias) { flags |= OdinDocEntityFlag_Param_NoAlias; }
|
||||||
|
}
|
||||||
|
|
||||||
OdinDocString init_string = {};
|
OdinDocString init_string = {};
|
||||||
if (init_expr) {
|
if (init_expr) {
|
||||||
init_string = odin_doc_expr_string(w, init_expr);
|
init_string = odin_doc_expr_string(w, init_expr);
|
||||||
|
|||||||
Reference in New Issue
Block a user