Rename the DEC dot cake correctly to the inverse of the others

This commit is contained in:
Willem Cazander 2025-01-23 00:05:25 +01:00
parent e8e112aaca
commit 0d3323ba82
4 changed files with 18 additions and 9 deletions

View file

@ -135,7 +135,7 @@ public class FourCornerUnicodeDisplay {
return true; return true;
} }
} }
if (FourCornerDotCake.FC_DEC0127_PX0.equals(slice)) { if (FourCornerDotCake.FC_DEC2701_PX0.equals(slice)) {
output.appendCodePoint(FCDotPIE9DDash09.IMG_ESC_DEC.codePointDotIndex()); output.appendCodePoint(FCDotPIE9DDash09.IMG_ESC_DEC.codePointDotIndex());
} }
if (FourCornerDotCake.FC_UWU0101_S1.equals(slice)) { if (FourCornerDotCake.FC_UWU0101_S1.equals(slice)) {

View file

@ -139,7 +139,7 @@ public enum FourCornerDotCake {
// =========== Allow small terminators to take over 6 bit main frame computers // =========== Allow small terminators to take over 6 bit main frame computers
FC_CDC1604_P6(0, 64, FCDotCDC1604DashP6.values(), "Character Dough Cake"), FC_CDC1604_P6(0, 64, FCDotCDC1604DashP6.values(), "Character Dough Cake"),
FC_DEC0127_PX0(64, 27, FCDotDEC2701DashPX0.values(), "Direct or Escaped Control"), FC_DEC2701_PX0(64, 27, FCDotDEC2701DashPX0.values(), "Direct or Escaped Control"),
FC_APL0127_P7A(91, 27, FCDotAPL0127DashP7A.values(), "Array Programming Language P7A"), FC_APL0127_P7A(91, 27, FCDotAPL0127DashP7A.values(), "Array Programming Language P7A"),
FC_APL0127_P7B(118, 27, FCDotAPL0127DashP7B.values(), "Array Programming Language P7B"), FC_APL0127_P7B(118, 27, FCDotAPL0127DashP7B.values(), "Array Programming Language P7B"),

View file

@ -191,7 +191,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo
@Override @Override
public int cakePointDotIndex() { public int cakePointDotIndex() {
return FourCornerDotCake.FC_DEC0127_PX0.getStart() + ordinal(); return FourCornerDotCake.FC_DEC2701_PX0.getStart() + ordinal();
} }
static public int valuesLength() { static public int valuesLength() {
@ -203,7 +203,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo
} }
static public FCDotDEC2701DashPX0 valueOfCakePoint(int cakePoint) { static public FCDotDEC2701DashPX0 valueOfCakePoint(int cakePoint) {
return valueOf(cakePoint - FourCornerDotCake.FC_DEC0127_PX0.getStart()); return valueOf(cakePoint - FourCornerDotCake.FC_DEC2701_PX0.getStart());
} }
static public FCDotDEC2701DashPX0 valueOf(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) { static public FCDotDEC2701DashPX0 valueOf(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) {

View file

@ -88,7 +88,7 @@ public class FourCornerZionStenoLexer {
if (FourCornerDotCake.FC_CDC1604_P6.equals(cakeSlice)) { if (FourCornerDotCake.FC_CDC1604_P6.equals(cakeSlice)) {
continue; // handle CDC manually continue; // handle CDC manually
} }
if (FourCornerDotCake.FC_DEC0127_PX0.equals(cakeSlice)) { if (FourCornerDotCake.FC_DEC2701_PX0.equals(cakeSlice)) {
continue; // handle DEC manually continue; // handle DEC manually
} }
if (FourCornerDotCake.FC_UNI2K_11.equals(cakeSlice)) { if (FourCornerDotCake.FC_UNI2K_11.equals(cakeSlice)) {
@ -397,8 +397,17 @@ public class FourCornerZionStenoLexer {
private Integer pepperMode = null; private Integer pepperMode = null;
public StenoScannerCDCDEC() { public StenoScannerCDCDEC() {
super(FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_DEC0127_PX0.getStop()); super(FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_DEC2701_PX0.getStop());
} }
// TODO
// // Log state changes
// if (FCDotCDC1604DashP6._NEWLINE.ordinal() == cdcDECPoint) {
// lexer.currLine++;
// lexer.currCol = 0;
// lexer.fireSignals.fireStateLine(lexer.currLine);
// lexer.fireSignals.fireStateColumn(lexer.currCol);
// }
@Override @Override
public void process(FourCornerZionStenoLexer lexer, int idxFirst, int idxLast) { public void process(FourCornerZionStenoLexer lexer, int idxFirst, int idxLast) {
@ -416,8 +425,8 @@ public class FourCornerZionStenoLexer {
continue; continue;
} }
int cdcDECPoint = lexer.input.get(scanIndex); int cdcDECPoint = lexer.input.get(scanIndex);
if (FourCornerDotCake.FC_DEC0127_PX0.contains(cdcDECPoint)) { if (FourCornerDotCake.FC_DEC2701_PX0.contains(cdcDECPoint)) {
lexer.handler.strobeWord(FourCornerDotCake.FC_DEC0127_PX0, cdcDECPoint - FourCornerDotCake.FC_DEC0127_PX0.getStart()); lexer.handler.strobeWord(FourCornerDotCake.FC_DEC2701_PX0, cdcDECPoint - FourCornerDotCake.FC_DEC2701_PX0.getStart());
} else { } else {
lexer.handler.strobeWord(FourCornerDotCake.FC_CDC1604_P6, cdcDECPoint); lexer.handler.strobeWord(FourCornerDotCake.FC_CDC1604_P6, cdcDECPoint);
} }
@ -435,7 +444,7 @@ public class FourCornerZionStenoLexer {
return false; // disable escape handing return false; // disable escape handing
} }
int cdcDECPoint = lexer.input.get(scanIndex); int cdcDECPoint = lexer.input.get(scanIndex);
if (FourCornerDotCake.FC_DEC0127_PX0.contains(cdcDECPoint)) { if (FourCornerDotCake.FC_DEC2701_PX0.contains(cdcDECPoint)) {
decMode = FCDotDEC2701DashPX0.valueOfCakePoint(cdcDECPoint); decMode = FCDotDEC2701DashPX0.valueOfCakePoint(cdcDECPoint);
cleanOldDECMode(); cleanOldDECMode();
return true; return true;