spec(core): update per code review 🙀

- keep 'deadkey' out of the ldml code
- other renames

For: #9119

Author: srl295

common/web/types/src/ldml-keyboard/pattern-parser.ts

@@ -50,7 +50,7 @@ export class MarkerParser {
   /**
    * Marker sentinel as a string - U+FFFF
    */
-  public static readonly SENTINEL = String.fromCodePoint(constants.marker_sentinel);
+  public static readonly SENTINEL = String.fromCodePoint(constants.uc_sentinel);
   /**
    * Marker code as a string - U+0008
    */

common/web/types/test/ldml-keyboard/test-pattern-parser.ts

@@ -105,8 +105,8 @@ describe('Test of Pattern Parsers', () => {
       );
     });
     it('should match some marker constants', () => {
-      assert.equal(constants.marker_sentinel, KMXFile.UC_SENTINEL);
-      assert.equal(constants.marker_code_deadkey, KMXFile.CODE_DEADKEY);
+      assert.equal(constants.uc_sentinel, KMXFile.UC_SENTINEL);
+      assert.equal(constants.marker_code, KMXFile.CODE_DEADKEY);
     });
   });
   describe('should test VariableParser', () => {

core/include/ldml/keyboardprocessor_ldml.h

@@ -94,11 +94,10 @@
 #define LDML_LENGTH_VKEY 0xC
 #define LDML_LENGTH_VKEY_ITEM 0x8
 #define LDML_MARKER_ANY_INDEX 0xFFFE
-#define LDML_MARKER_CODE_DEADKEY 0x8
+#define LDML_MARKER_CODE 0x8
 #define LDML_MARKER_MAX_COUNT 0xFFFC
 #define LDML_MARKER_MAX_INDEX 0xFFFD
 #define LDML_MARKER_MIN_INDEX 0x1
-#define LDML_MARKER_SENTINEL 0xFFFF
 #define LDML_META_SETTINGS_FALLBACK_OMIT 0x1
 #define LDML_META_SETTINGS_TRANSFORMFAILURE_OMIT 0x2
 #define LDML_META_SETTINGS_TRANSFORMPARTIAL_HIDE 0x4
@@ -135,6 +134,7 @@
 #define LDML_TRAN_FLAGS_ERROR 0x1
 #define LDML_TRAN_GROUP_TYPE_REORDER 0x1
 #define LDML_TRAN_GROUP_TYPE_TRANSFORM 0x0
+#define LDML_UC_SENTINEL 0xFFFF
 #define LDML_VARS_ENTRY_TYPE_SET 0x1
 #define LDML_VARS_ENTRY_TYPE_STRING 0x0
 #define LDML_VARS_ENTRY_TYPE_UNICODESET 0x2

core/include/ldml/keyboardprocessor_ldml.ts

@@ -616,9 +616,9 @@ class Constants {
 
   // ---- marker stuff ----
   /** == kmx_file.UC_SENTINEL, always followed by `marker_code`, marker index 0x0001-0xfffe */
-  readonly marker_sentinel     = 0xFFFF;
+  readonly uc_sentinel         = 0xFFFF;
   /** == kmx_file.CODE_DEADKEY */
-  readonly marker_code = 0x0008;
+  readonly marker_code         = 0x0008;
   /** minimum usable marker index */
   readonly marker_min_index    = 0x0001;
   /** index value referring to the 'any' marker match */

core/src/kmx/kmx_plus.h

@@ -311,7 +311,7 @@ static_assert(sizeof(struct COMP_KMXPLUS_TRAN_TRANSFORM) == LDML_LENGTH_TRAN_TRA
 static_assert(sizeof(struct COMP_KMXPLUS_TRAN_REORDER) == LDML_LENGTH_TRAN_REORDER, "mismatched size of tran reorder");
 
 // assert some parallel constants
-static_assert(LDML_MARKER_SENTINEL == UC_SENTINEL, "mismatch: LDML_MARKER_SENTINEL");
+static_assert(LDML_UC_SENTINEL == UC_SENTINEL, "mismatch: LDML_UC_SENTINEL");
 static_assert(LDML_MARKER_CODE == CODE_DEADKEY, "mismatch: LDML_MARKER_CODE");
 static_assert(LDML_MARKER_ANY_INDEX < UC_SENTINEL, "expected LDML_MARKER_ANY_INDEX < UC_SENTINEL");
 

developer/src/kmc-ldml/test/test-vars.ts

@@ -191,8 +191,8 @@ describe('vars', function () {
   describe('should match some marker constants', () => {
     // neither of these live here, but, common/web/types does not import ldml-keyboard-constants otherwise.
 
-    assert.equal(constants.marker_sentinel, KMX.KMXFile.UC_SENTINEL);
-    assert.equal(constants.marker_code_deadkey, KMX.KMXFile.CODE_DEADKEY);
+    assert.equal(constants.uc_sentinel, KMX.KMXFile.UC_SENTINEL);
+    assert.equal(constants.marker_code, KMX.KMXFile.CODE_DEADKEY);
   });
   describe('markers', function () {
     this.slow(500); // 0.5 sec -- json schema validation takes a while