diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerRecipe.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerRecipe.java index d19f8bb..893f23d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerRecipe.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerRecipe.java @@ -133,7 +133,7 @@ final public class FourCornerRecipe { } } if (isSixBit) { - out.add(FCDotCDC1604DashP6._SALAH_INTERROBANG.cakePointDotIndex()); // fixme improve: see FourCornerDotCollePie9.baklavaPointsPIE9C + out.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.cakePointDotIndex()); // fixme improve: see FourCornerDotCollePie9.baklavaPointsPIE9C } return out; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java index e6b774b..b47d400 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java @@ -86,7 +86,7 @@ public class FourCornerUnicodeImport { } static public FourCornerUnicodeImport lossy() { - return new FourCornerUnicodeImport(true, true, false, List.of(FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION)); // TODO: change + return new FourCornerUnicodeImport(true, true, false, List.of(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION)); // TODO: change } public List convertToInt18(String text) { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java index f84e482..cba775a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java @@ -44,26 +44,26 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 { // LMNO PQRS TUVW XYZ& /// This compatibility indicator is not a candy letter but a control data character string termination code. - _NUL('\u0000'), + NS00_NUL('\u0000'), /// Goto direct escaped control with sequence of 3 escapes on 6 bit systems. - _ESC6_X1('\u0001'), - _ESC6_X2('\u0002'), - _ESC6_X3('\u0003'), + NS01_ESC6_X1('\u0001'), + NS02_ESC6_X2('\u0002'), + NS03_ESC6_X3('\u0003'), /// End of argumented escape sequence prayer. - _SALAH_INTERROBANG('‽'), + NS04_SALAH_INTERROBANG('‽'), /// Next argument separator for escape sequences. - _RAKA_UPNEXT_QUESTION('¿'), + NS05_RAKA_UPNEXT_QUESTION('¿'), /// Use 3 pepper marks, to spice up the escape sequences. - _PEPPER_EXCLAMATION('!'), - _PEPPER_QUESTION('?'), + NS06_PEPPER_EXCLAMATION('!'), + NS07_PEPPER_QUESTION('?'), /// Special Argument Lexer Token, to season escape sequences. /// For examples in ESC68_PIE; Move to left pie. - _SALT_COMPARE_LEFT('<'), - _SALT_COMPARE_RIGHT('>'), + NS08_SALT_COMPARE_LEFT('<'), + NS09_SALT_COMPARE_RIGHT('>'), /// Second set of number letters. NY27_SQUARE_LEFT('['), @@ -200,25 +200,25 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 { } static public boolean isEscape6(int cakePoint) { - return cakePoint == _ESC6_X1.cakePointDotIndex() || cakePoint == _ESC6_X2.cakePointDotIndex() || cakePoint == _ESC6_X3.cakePointDotIndex(); + return cakePoint == NS01_ESC6_X1.cakePointDotIndex() || cakePoint == NS02_ESC6_X2.cakePointDotIndex() || cakePoint == NS03_ESC6_X3.cakePointDotIndex(); } static public boolean isEscapeSaltLeft(int cakePoint) { - return cakePoint == _SALT_COMPARE_LEFT.cakePointDotIndex(); + return cakePoint == NS08_SALT_COMPARE_LEFT.cakePointDotIndex(); } static public boolean isEscapeSaltRight(int cakePoint) { - return cakePoint == _SALT_COMPARE_RIGHT.cakePointDotIndex(); + return cakePoint == NS09_SALT_COMPARE_RIGHT.cakePointDotIndex(); } static public boolean isEscapePepper(int cakePoint) { - return cakePoint == _PEPPER_EXCLAMATION.cakePointDotIndex() || cakePoint == _PEPPER_QUESTION.cakePointDotIndex(); + return cakePoint == NS06_PEPPER_EXCLAMATION.cakePointDotIndex() || cakePoint == NS07_PEPPER_QUESTION.cakePointDotIndex(); } static public int pepper3SequenceRead(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) { - int c1 = msb == FCDotCDC1604DashP6._PEPPER_EXCLAMATION?0:1; - int c2 = csb == FCDotCDC1604DashP6._PEPPER_EXCLAMATION?0:1; - int c3 = lsb == FCDotCDC1604DashP6._PEPPER_EXCLAMATION?0:1; + int c1 = msb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1; + int c2 = csb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1; + int c3 = lsb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1; return (c1 << 2) + (c2 << 1) + (c3 << 0); } @@ -234,9 +234,9 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 { throw new IllegalArgumentException("Pepper spray is only 3 bit"); } return List.of( - ((mode >> 2) & 0b1)==0?_PEPPER_EXCLAMATION:_PEPPER_QUESTION, - ((mode >> 1) & 0b1)==0?_PEPPER_EXCLAMATION:_PEPPER_QUESTION, - ((mode >> 0) & 0b1)==0?_PEPPER_EXCLAMATION:_PEPPER_QUESTION + ((mode >> 2) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION, + ((mode >> 1) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION, + ((mode >> 0) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION ); } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java index 55d7648..e6bde12 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java @@ -50,7 +50,7 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou private FCDotCMD5401Dash2D(FCDotCDC1604DashP6 selector) { this.selector = Objects.requireNonNull(selector); - if (selector.ordinal() <= FCDotCDC1604DashP6._SALT_COMPARE_RIGHT.ordinal()) { + if (selector.ordinal() <= FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT.ordinal()) { throw new IllegalArgumentException("Not used here to keep mind space free"); } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java index d16cc34..b4798a1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java @@ -172,9 +172,9 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo @Override public List baklavaPointSequence() { return List.of( - FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), - FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), - FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3) + FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + (ordinal() / 9), + FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + ((ordinal() / 3) % 3), + FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + (ordinal() % 3) ); } @@ -202,9 +202,9 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo static public FCDotDEC2701DashPX0 valueOf(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) { int idx = 0; - idx += (msb.ordinal() - FCDotCDC1604DashP6._ESC6_X1.ordinal()) * 9; - idx += (csb.ordinal() - FCDotCDC1604DashP6._ESC6_X1.ordinal()) * 3; - idx += (lsb.ordinal() - FCDotCDC1604DashP6._ESC6_X1.ordinal()); + idx += (msb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal()) * 9; + idx += (csb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal()) * 3; + idx += (lsb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal()); return valueOf(idx); } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java index fb31b68..d98952f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java @@ -287,11 +287,11 @@ public class FourCornerZionStenoGrapher { while (walkItr.hasNext()) { outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + walkItr.next().ordinal()); } - outAdd(FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.cakePointDotIndex()); + outAdd(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.cakePointDotIndex()); while (spiceItr.hasNext()) { outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + spiceItr.next().ordinal()); } - outAdd(FCDotCDC1604DashP6._SALAH_INTERROBANG.cakePointDotIndex()); + outAdd(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.cakePointDotIndex()); } else { while (walkItr.hasNext()) { int bitValue12 = 0; @@ -349,10 +349,10 @@ public class FourCornerZionStenoGrapher { while (argu.hasNext()) { outAddAll(argu.next()); if (argu.hasNext()) { - outAdd(FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.baklavaPointDotIndex()); + outAdd(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.baklavaPointDotIndex()); } } - outAdd(FCDotCDC1604DashP6._SALAH_INTERROBANG.baklavaPointDotIndex()); + outAdd(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex()); outFlush(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java index 87e79ad..d065f13 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java @@ -740,7 +740,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs lexer.cdcDECModeInc = FCDotINC0801DashP8.valueOf(readEscapePepper3(lexer)); return true; } - if (FCDotCDC1604DashP6._SALAH_INTERROBANG.baklavaPointDotIndex() == cdcPoint) { + if (FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex() == cdcPoint) { lexer.decModeReset(); return true; // end E10 mode, so no print } @@ -792,23 +792,23 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs if (cdcPoint >= FCDotCDC1604DashP6.NY27_SQUARE_LEFT.ordinal() && cdcPoint <= FCDotCDC1604DashP6.NY01_AT.ordinal()) { lexer.cdcDECModePie = FCDotCDC1604DashP6.NY01_AT.ordinal() - cdcPoint; // goto relative return true; // swallow button - } else if (cdcPoint == FCDotCDC1604DashP6._PEPPER_EXCLAMATION.ordinal()) { + } else if (cdcPoint == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION.ordinal()) { if (lexer.cdcDECModePie < 26) { lexer.cdcDECModePie++; } return true; // eat the up pepper - } else if (cdcPoint == FCDotCDC1604DashP6._PEPPER_QUESTION.ordinal()) { + } else if (cdcPoint == FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal()) { if (lexer.cdcDECModePie > 0) { lexer.cdcDECModePie--; } return true; // eat the down salt - } else if (cdcPoint == FCDotCDC1604DashP6._SALT_COMPARE_LEFT.ordinal()) { + } else if (cdcPoint == FCDotCDC1604DashP6.NS08_SALT_COMPARE_LEFT.ordinal()) { lexer.cdcDECModePieAlt = false; return true; // eat the left salt - } else if (cdcPoint == FCDotCDC1604DashP6._SALT_COMPARE_RIGHT.ordinal()) { + } else if (cdcPoint == FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT.ordinal()) { lexer.cdcDECModePieAlt = true; return true; // eat the right salt - } else if (cdcPoint == FCDotCDC1604DashP6._SALAH_INTERROBANG.ordinal() || cdcPoint == FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.ordinal()) { + } else if (cdcPoint == FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal() || cdcPoint == FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal()) { lexer.decModeReset(); return true; // eat salah and end mode } @@ -832,7 +832,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs List argu = new ArrayList<>(); while (lexer.cdcDECScanIndex <= lexer.cdcDECScanIndexEnd) { int cdcPoint = lexer.input.get(lexer.cdcDECScanIndex); - if (cdcPoint == FCDotCDC1604DashP6._NUL.ordinal()) { + if (cdcPoint == FCDotCDC1604DashP6.NS00_NUL.ordinal()) { lexer.smokeSignals.burnSalahInvalidCakePoint(lexer.currLine, lexer.currCol, cdcPoint); result.clear(); lexer.cdcDECScanIndex--; @@ -843,11 +843,11 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs lexer.cdcDECScanIndex--; return true; } - if (FCDotCDC1604DashP6._SALAH_INTERROBANG.ordinal() == cdcPoint) { + if (FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal() == cdcPoint) { result.add(argu); return true; } - if (FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.ordinal() == cdcPoint) { + if (FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal() == cdcPoint) { result.add(argu); argu = new ArrayList<>(); lexer.cdcDECScanIndex++; @@ -867,11 +867,11 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs boolean sandWalker = true; while (lexer.cdcDECScanIndex <= lexer.cdcDECScanIndexEnd) { int cdcPoint = lexer.input.get(lexer.cdcDECScanIndex); - if (cdcPoint == FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.ordinal()) { + if (cdcPoint == FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal()) { sandWalker = false; continue; } - if (cdcPoint == FCDotCDC1604DashP6._SALAH_INTERROBANG.ordinal()) { + if (cdcPoint == FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal()) { lexer.handler.strobeSandWorm(sandWalk, sandSpice); return true; } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java index 27a85b1..e38463b 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java @@ -57,7 +57,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); // select lower case cdc.add(FCDotCDC1604DashP6.NX10_J); cdc.add(FCDotCDC1604DashP6.NX11_K); - cdc.add(FCDotCDC1604DashP6._SALT_COMPARE_RIGHT); + cdc.add(FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT); cdc.add(FCDotCDC1604DashP6.NX12_L); cdc.add(FCDotCDC1604DashP6.NX13_M); cdc.add(FCDotDEC2701DashPX0.ESC_STOP); @@ -114,23 +114,23 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._SALT_COMPARE_RIGHT); // goto right FC.PIE9D-27 + cdc.add(FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT); // goto right FC.PIE9D-27 cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._PEPPER_QUESTION); // goto up FC.PIE9D-26 + cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-26 cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._PEPPER_QUESTION); // goto up FC.PIE9D-25 + cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-25 cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._PEPPER_QUESTION); // goto up FC.PIE9D-24 + cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-24 cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._SALAH_INTERROBANG); + cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG); Assertions.assertEquals("θ̲ο̲ι̲θοιhoih̲o̲i̲𝘩𝘰𝘪𝐇𝐎𝐈ΘΟΙ𝚯𝚶𝚰", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); } @@ -141,7 +141,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_1); cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_2); cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_3); - cdc.add(FCDotCDC1604DashP6._SALAH_INTERROBANG); + cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG); Assertions.assertEquals("𝟏𝟐𝟑", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); } @@ -162,7 +162,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); cdc.add(FCDotCDC1604DashP6.NX09_I); - cdc.add(FCDotCDC1604DashP6._SALAH_INTERROBANG); + cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG); // Assertions.assertEquals("𝘩𝘰𝘪╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); Assertions.assertEquals("╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java index 6c41016..7693e64 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java @@ -45,9 +45,9 @@ public class FCDotVT06Test { List cdc = new ArrayList<>(); cdc.addAll(VTDash06DotZeroACursor.VT_CURSOR_GOTO.baklavaPointSequence()); cdc.addAll(FourCornerRecipe.toDecimalsX06(123)); // TODO: fix these are the wrong, we need to use the txt grams version - cdc.add(FCDotCDC1604DashP6._RAKA_UPNEXT_QUESTION.baklavaPointDotIndex()); + cdc.add(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.baklavaPointDotIndex()); cdc.addAll(FourCornerRecipe.toDecimalsX06(456)); - cdc.add(FCDotCDC1604DashP6._SALAH_INTERROBANG.baklavaPointDotIndex()); + cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex()); Assertions.assertEquals("␘␘␇AG␇␇␇^BCD¿␇␇␇^EFG‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc)); // TODO: Fix lexer embedded escapes, and display external with single unicode escape sign @@ -59,7 +59,7 @@ public class FCDotVT06Test { List cdc = new ArrayList<>(); cdc.addAll(VTDash06DotZeroCClear.VT_CLEAR_TOP.baklavaPointSequence()); cdc.addAll(FourCornerRecipe.toDecimalsX06(5)); - cdc.add(FCDotCDC1604DashP6._SALAH_INTERROBANG.baklavaPointDotIndex()); + cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex()); Assertions.assertEquals("␘␘␇CA␇␇␇^F‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc)); } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0Test.java index 9db421b..6b66092 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0Test.java @@ -46,19 +46,19 @@ public class FCDotDEC2701DashPX0Test { List seq = null; seq = FCDotDEC2701DashPX0.ESC_USER_1.baklavaPointSequence(); Assertions.assertEquals(3, seq.size()); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(0)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(1)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(2)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(2)); seq = FCDotDEC2701DashPX0.ESC_VT06.baklavaPointSequence(); Assertions.assertEquals(3, seq.size()); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(0)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(1)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq.get(2)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC6_X2.ordinal(), seq.get(2)); seq = FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence(); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(0)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(1)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(2)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(2)); } } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8Test.java index d0b9c02..1999a16 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8Test.java @@ -46,11 +46,11 @@ public class FCDotINC0801DashP8Test { List seq = null; seq = FCDotINC0801DashP8.INC_LUA0127_P7D.baklavaPointSequence(); Assertions.assertEquals(6, seq.size()); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq.get(0)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(1)); - Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(2)); - Assertions.assertEquals(FCDotCDC1604DashP6._PEPPER_EXCLAMATION.ordinal(), seq.get(3)); - Assertions.assertEquals(FCDotCDC1604DashP6._PEPPER_QUESTION.ordinal(), seq.get(4)); - Assertions.assertEquals(FCDotCDC1604DashP6._PEPPER_QUESTION.ordinal(), seq.get(5)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC6_X2.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(2)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION.ordinal(), seq.get(3)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal(), seq.get(4)); + Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal(), seq.get(5)); } }