Commit be5b677c by Ben Clayton

Fix generation of named enumerator types

Schema top-level definitions, such as `InvalidatedAreas` and `SteppingGranularity` were being emitted as empty structures, when they were actually enumerators. Re-work protocol_gen.go to emit these correctly. Also bumps the protocol to DAP version 1.46.0
parent ad185ee7
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// Generated with protocol_gen.go -- do not edit this file. // Generated with protocol_gen.go -- do not edit this file.
// go run scripts/protocol_gen/protocol_gen.go // go run scripts/protocol_gen/protocol_gen.go
// //
// DAP version 1.43.0 // DAP version 1.46.0
#include "dap/protocol.h" #include "dap/protocol.h"
...@@ -102,6 +102,7 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(StoppedEvent, ...@@ -102,6 +102,7 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(StoppedEvent,
"stopped", "stopped",
DAP_FIELD(allThreadsStopped, "allThreadsStopped"), DAP_FIELD(allThreadsStopped, "allThreadsStopped"),
DAP_FIELD(description, "description"), DAP_FIELD(description, "description"),
DAP_FIELD(hitBreakpointIds, "hitBreakpointIds"),
DAP_FIELD(preserveFocusHint, "preserveFocusHint"), DAP_FIELD(preserveFocusHint, "preserveFocusHint"),
DAP_FIELD(reason, "reason"), DAP_FIELD(reason, "reason"),
DAP_FIELD(text, "text"), DAP_FIELD(text, "text"),
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// Generated with protocol_gen.go -- do not edit this file. // Generated with protocol_gen.go -- do not edit this file.
// go run scripts/protocol_gen/protocol_gen.go // go run scripts/protocol_gen/protocol_gen.go
// //
// DAP version 1.43.0 // DAP version 1.46.0
#include "dap/protocol.h" #include "dap/protocol.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// Generated with protocol_gen.go -- do not edit this file. // Generated with protocol_gen.go -- do not edit this file.
// go run scripts/protocol_gen/protocol_gen.go // go run scripts/protocol_gen/protocol_gen.go
// //
// DAP version 1.43.0 // DAP version 1.46.0
#include "dap/protocol.h" #include "dap/protocol.h"
......
...@@ -15,14 +15,12 @@ ...@@ -15,14 +15,12 @@
// Generated with protocol_gen.go -- do not edit this file. // Generated with protocol_gen.go -- do not edit this file.
// go run scripts/protocol_gen/protocol_gen.go // go run scripts/protocol_gen/protocol_gen.go
// //
// DAP version 1.43.0 // DAP version 1.46.0
#include "dap/protocol.h" #include "dap/protocol.h"
namespace dap { namespace dap {
DAP_IMPLEMENT_STRUCT_TYPEINFO(ChecksumAlgorithm, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(Checksum, DAP_IMPLEMENT_STRUCT_TYPEINFO(Checksum,
"", "",
DAP_FIELD(algorithm, "algorithm"), DAP_FIELD(algorithm, "algorithm"),
...@@ -70,7 +68,10 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(ColumnDescriptor, ...@@ -70,7 +68,10 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(ColumnDescriptor,
DAP_IMPLEMENT_STRUCT_TYPEINFO(ExceptionBreakpointsFilter, DAP_IMPLEMENT_STRUCT_TYPEINFO(ExceptionBreakpointsFilter,
"", "",
DAP_FIELD(conditionDescription,
"conditionDescription"),
DAP_FIELD(def, "default"), DAP_FIELD(def, "default"),
DAP_FIELD(description, "description"),
DAP_FIELD(filter, "filter"), DAP_FIELD(filter, "filter"),
DAP_FIELD(label, "label"), DAP_FIELD(label, "label"),
DAP_FIELD(supportsCondition, DAP_FIELD(supportsCondition,
...@@ -122,8 +123,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO( ...@@ -122,8 +123,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(
DAP_FIELD(supportsValueFormattingOptions, DAP_FIELD(supportsValueFormattingOptions,
"supportsValueFormattingOptions")); "supportsValueFormattingOptions"));
DAP_IMPLEMENT_STRUCT_TYPEINFO(CompletionItemType, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(CompletionItem, DAP_IMPLEMENT_STRUCT_TYPEINFO(CompletionItem,
"", "",
DAP_FIELD(label, "label"), DAP_FIELD(label, "label"),
...@@ -135,8 +134,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(CompletionItem, ...@@ -135,8 +134,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(CompletionItem,
DAP_FIELD(text, "text"), DAP_FIELD(text, "text"),
DAP_FIELD(type, "type")); DAP_FIELD(type, "type"));
DAP_IMPLEMENT_STRUCT_TYPEINFO(DataBreakpointAccessType, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(DisassembledInstruction, DAP_IMPLEMENT_STRUCT_TYPEINFO(DisassembledInstruction,
"", "",
DAP_FIELD(address, "address"), DAP_FIELD(address, "address"),
...@@ -167,8 +164,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(VariablePresentationHint, ...@@ -167,8 +164,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(VariablePresentationHint,
DAP_IMPLEMENT_STRUCT_TYPEINFO(ValueFormat, "", DAP_FIELD(hex, "hex")); DAP_IMPLEMENT_STRUCT_TYPEINFO(ValueFormat, "", DAP_FIELD(hex, "hex"));
DAP_IMPLEMENT_STRUCT_TYPEINFO(ExceptionBreakMode, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(ExceptionDetails, DAP_IMPLEMENT_STRUCT_TYPEINFO(ExceptionDetails,
"", "",
DAP_FIELD(evaluateName, "evaluateName"), DAP_FIELD(evaluateName, "evaluateName"),
...@@ -189,8 +184,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(GotoTarget, ...@@ -189,8 +184,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(GotoTarget,
DAP_FIELD(label, "label"), DAP_FIELD(label, "label"),
DAP_FIELD(line, "line")); DAP_FIELD(line, "line"));
DAP_IMPLEMENT_STRUCT_TYPEINFO(InvalidatedAreas, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(Module, DAP_IMPLEMENT_STRUCT_TYPEINFO(Module,
"", "",
DAP_FIELD(addressRange, "addressRange"), DAP_FIELD(addressRange, "addressRange"),
...@@ -204,8 +197,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(Module, ...@@ -204,8 +197,6 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(Module,
DAP_FIELD(symbolStatus, "symbolStatus"), DAP_FIELD(symbolStatus, "symbolStatus"),
DAP_FIELD(version, "version")); DAP_FIELD(version, "version"));
DAP_IMPLEMENT_STRUCT_TYPEINFO(SteppingGranularity, "");
DAP_IMPLEMENT_STRUCT_TYPEINFO(Scope, DAP_IMPLEMENT_STRUCT_TYPEINFO(Scope,
"", "",
DAP_FIELD(column, "column"), DAP_FIELD(column, "column"),
...@@ -267,6 +258,7 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(InstructionBreakpoint, ...@@ -267,6 +258,7 @@ DAP_IMPLEMENT_STRUCT_TYPEINFO(InstructionBreakpoint,
DAP_IMPLEMENT_STRUCT_TYPEINFO(StackFrame, DAP_IMPLEMENT_STRUCT_TYPEINFO(StackFrame,
"", "",
DAP_FIELD(canRestart, "canRestart"),
DAP_FIELD(column, "column"), DAP_FIELD(column, "column"),
DAP_FIELD(endColumn, "endColumn"), DAP_FIELD(endColumn, "endColumn"),
DAP_FIELD(endLine, "endLine"), DAP_FIELD(endLine, "endLine"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment