arch-jedi/nx01
1
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

FC18: Removed more ordinal classic zero based naming to new zerdinal

Browse source
This commit is contained in:
Willem Cazander 2025-09-28 17:37:44 +02:00
parent 5cfb4893db
commit 5105dd70f9
15 changed files with 96 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
View file

@ -227,7 +227,7 @@ public class FourCornerUnicodeDisplay {
@Override
public void strobeStructNunLine(PrimordialOctal count) {
for (int i = count.ordinal(); i >= 0; i--) {
for (int i = count.zerdinal(); i >= 0; i--) {
output.appendCodePoint('\n');
}
}
@ -287,8 +287,8 @@ public class FourCornerUnicodeDisplay {
@Override
public void strobeSandWorm(List<PrimordialOctal> sandWalk, List<PrimordialOctal> sandSpice) {
// TODO; select plugin for renderer ELSE print octals with number grams
sandWalk.forEach(v -> output.append(v.ordinal()));
sandSpice.forEach(v -> output.append(v.ordinal()));
sandWalk.forEach(v -> output.append(v.zerdinal()));
sandSpice.forEach(v -> output.append(v.zerdinal()));
}
@Override

26
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
View file

@ -261,29 +261,29 @@ public class FourCornerZionStenoGrapher {
if (outTongue.isSixBit()) {
outAdd(FCDotDEC2701DashPX0.ESC6_SAND_WORM.cakePointDotIndex());
while (walkItr.hasNext()) {
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + walkItr.next().ordinal());
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + walkItr.next().zerdinal());
}
outAdd(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.cakePointDotIndex());
while (spiceItr.hasNext()) {
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + spiceItr.next().ordinal());
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + spiceItr.next().zerdinal());
}
outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.cakePointDotIndex());
} else {
while (walkItr.hasNext()) {
int bitValue12 = 0;
bitValue12 += (walkItr.next().ordinal() << 9);
bitValue12 += (walkItr.next().ordinal() << 6);
bitValue12 += (walkItr.next().ordinal() << 3);
bitValue12 += (walkItr.next().ordinal() << 0);
bitValue12 += (walkItr.next().zerdinal() << 9);
bitValue12 += (walkItr.next().zerdinal() << 6);
bitValue12 += (walkItr.next().zerdinal() << 3);
bitValue12 += (walkItr.next().zerdinal() << 0);
outAdd(FourCornerDotCake.FC_SANDWALK_12.getStart() + bitValue12);
}
while (spiceItr.hasNext()) {
int bitValue15 = 0;
bitValue15 += (spiceItr.next().ordinal() << 12);
bitValue15 += (spiceItr.next().ordinal() << 9);
bitValue15 += (spiceItr.next().ordinal() << 6);
bitValue15 += (spiceItr.next().ordinal() << 3);
bitValue15 += (spiceItr.next().ordinal() << 0);
bitValue15 += (spiceItr.next().zerdinal() << 12);
bitValue15 += (spiceItr.next().zerdinal() << 9);
bitValue15 += (spiceItr.next().zerdinal() << 6);
bitValue15 += (spiceItr.next().zerdinal() << 3);
bitValue15 += (spiceItr.next().zerdinal() << 0);
outAdd(FourCornerDotCake.FC_SANDWORM_15.getStart() + bitValue15);
}
}
@ -351,10 +351,10 @@ public class FourCornerZionStenoGrapher {
public void strobeStructNunLine(PrimordialOctal count) {
if (outTongue.isSixBit()) {
outAddAll(FCDotDEC2701DashPX0.ESC6_F4TTY0008_NL.baklavaPointSequence());
outAdd(FCDotCDC1604DiceSaw.FACE_1NX.encodeOctal(count.ordinal()).baklavaPointDotIndex());
outAdd(FCDotCDC1604DiceSaw.FACE_1NX.encodeOctal(count.zerdinal()).baklavaPointDotIndex());
outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
} else {
outAdd(FourCornerDotCake.FC_F4TTY0008_NL.getStart() + count.ordinal());
outAdd(FourCornerDotCake.FC_F4TTY0008_NL.getStart() + count.zerdinal());
}
outFlush();
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameFremanChocoBase8.java
View file

@ -90,6 +90,6 @@ public enum FCFlameFremanChocoBase8 implements FCFlameFremanSuit {
}
static public FCFlameFremanChocoBase8 valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal());
return valueOf(octal.zerdinal());
}
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameFremanLegoBase2.java
View file

@ -90,6 +90,6 @@ public enum FCFlameFremanLegoBase2 implements FCFlameFremanSuit {
}
static public FCFlameFremanLegoBase2 valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal());
return valueOf(octal.zerdinal());
}
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameFremanLegoBase8.java
View file

@ -90,6 +90,6 @@ public enum FCFlameFremanLegoBase8 implements FCFlameFremanSuit {
}
static public FCFlameFremanLegoBase8 valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal());
return valueOf(octal.zerdinal());
}
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameFremanSignedBase2.java
View file

@ -90,6 +90,6 @@ public enum FCFlameFremanSignedBase2 implements FCFlameFremanSuit {
}
static public FCFlameFremanSignedBase2 valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal());
return valueOf(octal.zerdinal());
}
}

8
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameFremanSuit.java
View file

@ -33,6 +33,14 @@ import org.x4o.fc18.zion7.octal8.PrimordialOctal;
/// @version 1.0 Sep 4, 2025
public interface FCFlameFremanSuit extends PrimordialOctal {
@Override
default int zerdinal() {
return ordinal();
}
// copy from enum
int ordinal();
// copy from enum
String name();

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/octal8/PrimordialOctal.java
View file

@ -33,5 +33,5 @@ package org.x4o.fc18.zion7.octal8;
/// @version ©Δ∞ 仙上主天
public interface PrimordialOctal {
int ordinal();
int zerdinal();
}

4
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/octal8/PrimordialOctalIterator.java
View file

@ -41,7 +41,7 @@ import java.util.function.Consumer;
public interface PrimordialOctalIterator extends PrimitiveIterator<PrimordialOctalSkullBait, PrimordialOctalConsumer> {
default byte nextBait() {
return next().ordinalOctalBait();
return next().zerdinalOctalBait();
}
@Override
@ -82,7 +82,7 @@ public interface PrimordialOctalIterator extends PrimitiveIterator<PrimordialOct
static int valueTapePlay(PrimordialOctalIterator iterator) {
int value = 0;
for (int i = 5; i >= 0; i--) {
value += (iterator.next().ordinalOctalBait() << (i * 3));
value += (iterator.next().zerdinalOctalBait() << (i * 3));
}
return value;
}

6
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/octal8/PrimordialOctalOrangeHinari.java
View file

@ -52,12 +52,12 @@ public enum PrimordialOctalOrangeHinari {
public void printHinari(PrimordialOctalOrangeJuice value, StringBuilder buf) {
PrimordialOctalIterator i3 = value.baitOctalIterator();
while (i3.hasNext()) {
buf.appendCodePoint(VALUES_3.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt());
buf.appendCodePoint(VALUES_3.codePoints().skip(i3.next().zerdinalOctalBait()).findFirst().getAsInt());
if (i3.hasNext()) {
buf.appendCodePoint(VALUES_6.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt());
buf.appendCodePoint(VALUES_6.codePoints().skip(i3.next().zerdinalOctalBait()).findFirst().getAsInt());
}
if (i3.hasNext()) {
buf.appendCodePoint(VALUES_9.codePoints().skip(i3.next().ordinalOctalBait()).findFirst().getAsInt());
buf.appendCodePoint(VALUES_9.codePoints().skip(i3.next().zerdinalOctalBait()).findFirst().getAsInt());
}
}
}

6
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/octal8/PrimordialOctalSkullBait.java
View file

@ -33,9 +33,9 @@ package org.x4o.fc18.zion7.octal8;
/// @version ©Δ∞ 仙上主天
public interface PrimordialOctalSkullBait {
byte ordinalOctalBait();
byte zerdinalOctalBait();
int ordinalOctalBitShifter();
int zerdinalOctalBitShifter();
int ordinalOctalShiftSmurf(PrimordialOctalSkullBait shifter);
int zerdinalOctalShiftSmurf(PrimordialOctalSkullBait shifter);
}

37
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/octal8/PrimordialOctalSound.java
View file

@ -57,22 +57,27 @@ public enum PrimordialOctalSound implements PrimordialOctal, PrimordialOctalSkul
static private final int SHIFT_16 = 16;
@Override
public byte ordinalOctalBait() {
return (byte) ordinal();
public int zerdinal() {
return ordinal();
}
@Override
public int ordinalOctalBitShifter() {
return ordinal() * OCTAL_BITS;
public byte zerdinalOctalBait() {
return (byte) zerdinal();
}
@Override
public int ordinalOctalShiftSmurf(PrimordialOctalSkullBait shifter) {
return ordinal() << shifter.ordinalOctalBitShifter();
public int zerdinalOctalBitShifter() {
return zerdinal() * OCTAL_BITS;
}
@Override
public int zerdinalOctalShiftSmurf(PrimordialOctalSkullBait shifter) {
return zerdinal() << shifter.zerdinalOctalBitShifter();
}
static public PrimordialOctalSound valueOfOctalShift(int value, PrimordialOctalSound shifter) {
return valueOf((value >> shifter.ordinalOctalBitShifter()) & OCTAL_MASK);
return valueOf((value >> shifter.zerdinalOctalBitShifter()) & OCTAL_MASK);
}
static public PrimordialOctalSound valueOf(int index) {
@ -80,7 +85,7 @@ public enum PrimordialOctalSound implements PrimordialOctal, PrimordialOctalSkul
}
static public PrimordialOctalSound valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal());
return valueOf(octal.zerdinal());
}
static public List<PrimordialOctalSound> valuesOfSmurfs(InputStream input) throws IOException {
@ -130,14 +135,14 @@ public enum PrimordialOctalSound implements PrimordialOctal, PrimordialOctalSkul
int totalBytes = 0;
while (read.hasNext()) {
int byteTriplet = 0;
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_1);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_2);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_3);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_4);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_5);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_6);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_7);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_8);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_1);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_2);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_3);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_4);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_5);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_6);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_7);
byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_8);
output.write(byteTriplet);
output.write(byteTriplet >> SHIFT_8);
output.write(byteTriplet >> SHIFT_16);