From 0c4f7cd365b47463241b55f1eb49a84b19c7329d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 19 Jan 2021 17:25:44 +0100
Subject: [PATCH] [server] Fixes the data record KfMarker with respect to
Ivette changes.
This record must be kept synchronized with the Ivette Location type.
---
ivette/api/generated/kernel/ast/index.ts | 8 ++++----
src/plugins/server/kernel_ast.ml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ivette/api/generated/kernel/ast/index.ts b/ivette/api/generated/kernel/ast/index.ts
index 2bd3772caab..9ae32c6bf69 100644
--- a/ivette/api/generated/kernel/ast/index.ts
+++ b/ivette/api/generated/kernel/ast/index.ts
@@ -238,7 +238,7 @@ export const byMarker: Compare.Order<marker> = Compare.structural;
/** Location: function and marker */
export interface location {
/** Function */
- function: Json.key<'#fct'>;
+ fct: Json.key<'#fct'>;
/** Marker */
marker: marker;
}
@@ -246,7 +246,7 @@ export interface location {
/** Loose decoder for `location` */
export const jLocation: Json.Loose<location> =
Json.jObject({
- function: Json.jFail(Json.jKey<'#fct'>('#fct'),'#fct expected'),
+ fct: Json.jFail(Json.jKey<'#fct'>('#fct'),'#fct expected'),
marker: jMarkerSafe,
});
@@ -257,8 +257,8 @@ export const jLocationSafe: Json.Safe<location> =
/** Natural order for `location` */
export const byLocation: Compare.Order<location> =
Compare.byFields
- <{ function: Json.key<'#fct'>, marker: marker }>({
- function: Compare.string,
+ <{ fct: Json.key<'#fct'>, marker: marker }>({
+ fct: Compare.string,
marker: byMarker,
});
diff --git a/src/plugins/server/kernel_ast.ml b/src/plugins/server/kernel_ast.ml
index b707805c998..dfc1510305d 100644
--- a/src/plugins/server/kernel_ast.ml
+++ b/src/plugins/server/kernel_ast.ml
@@ -322,7 +322,7 @@ end
module KfMarker = struct
type record
let record : record Record.signature = Record.signature ()
- let fct = Record.field record ~name:"function"
+ let fct = Record.field record ~name:"fct"
~descr:(Md.plain "Function") (module Kf)
let marker = Record.field record ~name:"marker"
~descr:(Md.plain "Marker") (module Marker)
--
GitLab