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

11
nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ/T008ᖟ.java
View file

@ -68,6 +68,11 @@ public enum T008ᖟ implements TerminatorEnum𓄯<T008ᖟ>, LegoᐧBrickᐧTape
return ghostsInAShell; return ghostsInAShell;
} }
@Override
public int zerdinal() {
return ordinal(); // note: Duplicate, can't use parent interface to impl the extra PrimordialOctal here
}
@Override @Override
public int zerdinalSpaceBoundary() { public int zerdinalSpaceBoundary() {
return valuesLength(); return valuesLength();
@ -78,8 +83,8 @@ public enum T008ᖟ implements TerminatorEnum𓄯<T008ᖟ>, LegoᐧBrickᐧTape
return valueOf(zerdinal); return valueOf(zerdinal);
} }
public int ordinalOctalShiftNative(T008ᖟ shifter) { public int zerdinalOctalShiftNative(T008ᖟ shifter) {
return ordinal() << shifter.abacusRȧñkOctalBitShifter(); return zerdinal() << shifter.abacusRȧñkOctalBitShifter();
} }
public T002ᖟ clampᐧtuneᐧtool(T003ᖟ part) { public T002ᖟ clampᐧtuneᐧtool(T003ᖟ part) {
@ -117,7 +122,7 @@ public enum T008ᖟ implements TerminatorEnum𓄯<T008ᖟ>, LegoᐧBrickᐧTape
} }
static public T008ᖟ valueOf(final PrimordialOctal octal) { static public T008ᖟ valueOf(final PrimordialOctal octal) {
return valueOf(octal.ordinal()); return valueOf(octal.zerdinal());
} }
public static int valuesLength() { public static int valuesLength() {

44
nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ/TTꞱꞱᖟGateway.java
View file

@ -231,15 +231,15 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
return slice + "_" + slices; return slice + "_" + slices;
} }
} }
private interface PrimordialOrdinalMutexBaseX { private interface PrimordialZerdinalMutexBaseX {
} }
private interface PrimordialOrdinalMutex<T extends PrimordialOrdinalMutexBaseX> extends PrimordialZerdinalSpaceBoundary { private interface PrimordialZerdinalMutex<T extends PrimordialZerdinalMutexBaseX> extends PrimordialZerdinalSpaceBoundary {
} }
private interface PrimordialOrdinalMutexBase1 extends PrimordialOrdinalMutexBaseX { private interface PrimordialZerdinalMutexBase1 extends PrimordialZerdinalMutexBaseX {
static final int PART_0001 = 0; static final int PART_0001 = 0;
} }
// TODO: redo works in java/maven and (2slow) in OPEN eclipse but stack overflow on open workspace at pre-startup, type tree of 2k+ is to much... // TODO: redo works in java/maven and (2slow) in OPEN eclipse but stack overflow on open workspace at pre-startup, type tree of 2k+ is to much...
private interface PrimordialOrdinalMutexBase2 extends PrimordialOrdinalMutexBase1 { private interface PrimordialZerdinalMutexBase2 extends PrimordialZerdinalMutexBase1 {
// change extends Base1 to BaseX and we have 2304 fields of part1 defining 0... (=ugly last resort test) // change extends Base1 to BaseX and we have 2304 fields of part1 defining 0... (=ugly last resort test)
//static final int PART_0001 = 0; //static final int PART_0001 = 0;
static final int PART_0002 = 1; static final int PART_0002 = 1;
@ -259,52 +259,52 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
// static NetherRingTone<?> PrimordialOrdinalBase2 = NetherSlug<SlugSlot6Part1,,,,,,,,b2>; // use generics to define all possible types with mutexed-types // static NetherRingTone<?> PrimordialOrdinalBase2 = NetherSlug<SlugSlot6Part1,,,,,,,,b2>; // use generics to define all possible types with mutexed-types
// static NetherRingTone<?> PrimordialOrdinalBase2PartX = NetherSlug<,,,,,,,b2,p1++>, NetherSlugBound<,,,,,,,b2,p2> {} // or one range super, so one method argument works // static NetherRingTone<?> PrimordialOrdinalBase2PartX = NetherSlug<,,,,,,,b2,p1++>, NetherSlugBound<,,,,,,,b2,p2> {} // or one range super, so one method argument works
} }
private interface PrimordialOrdinalBase1 extends PrimordialOrdinalMutexBase1, PrimordialOrdinalMutex<PrimordialOrdinalMutexBase1> { private interface PrimordialZerdinalBase1 extends PrimordialZerdinalMutexBase1, PrimordialZerdinalMutex<PrimordialZerdinalMutexBase1> {
@Override @Override
default int zerdinalSpaceBoundary() { default int zerdinalSpaceBoundary() {
return PART_0001; return PART_0001;
} }
} }
private interface PrimordialOrdinalBase2 extends PrimordialOrdinalMutexBase2, PrimordialOrdinalMutex<PrimordialOrdinalMutexBase2> { private interface PrimordialZerdinalBase2 extends PrimordialZerdinalMutexBase2, PrimordialZerdinalMutex<PrimordialZerdinalMutexBase2> {
@Override @Override
default int zerdinalSpaceBoundary() { default int zerdinalSpaceBoundary() {
return PART_0002; return PART_0002;
} }
} }
static private class BoneOrdinalBase1 extends BoneTerminatorBaseX<BoneOrdinalBase1> implements PrimordialOrdinalBase1 { static private class BoneZerdinalBase1 extends BoneTerminatorBaseX<BoneZerdinalBase1> implements PrimordialZerdinalBase1 {
static public final BoneOrdinalBase1 IDENDITY = new BoneOrdinalBase1(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO); static public final BoneZerdinalBase1 IDENDITY = new BoneZerdinalBase1(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO);
private BoneOrdinalBase1(int slice) { private BoneZerdinalBase1(int slice) {
super(1, slice, i -> new BoneOrdinalBase1(i)); // TODO: make anno optional and add slice count in an drum constructor super(1, slice, i -> new BoneZerdinalBase1(i)); // TODO: make anno optional and add slice count in an drum constructor
} }
static public BoneOrdinalBase1 valueOf(int zerdinal) { static public BoneZerdinalBase1 valueOf(int zerdinal) {
return IDENDITY.zerdinalMaterializeSpace(zerdinal); return IDENDITY.zerdinalMaterializeSpace(zerdinal);
} }
static public int valuesLength() { static public int valuesLength() {
return IDENDITY.zerdinalSpaceBoundary(); return IDENDITY.zerdinalSpaceBoundary();
} }
static public BoneOrdinalBase1[] values() { static public BoneZerdinalBase1[] values() {
return IDENDITY.zerdinalSpaceRodsToLadder().toArrayᴿᵈ(new BoneOrdinalBase1[] {}); return IDENDITY.zerdinalSpaceRodsToLadder().toArrayᴿᵈ(new BoneZerdinalBase1[] {});
} }
} }
static private class BoneOrdinalBase2 extends BoneTerminatorBaseX<BoneOrdinalBase2> implements PrimordialOrdinalBase2 { static private class BoneZerdinalBase2 extends BoneTerminatorBaseX<BoneZerdinalBase2> implements PrimordialZerdinalBase2 {
static public final BoneOrdinalBase2 IDENDITY = new BoneOrdinalBase2(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO); static public final BoneZerdinalBase2 IDENDITY = new BoneZerdinalBase2(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO);
private BoneOrdinalBase2(int slice) { private BoneZerdinalBase2(int slice) {
super(2, slice, i -> new BoneOrdinalBase2(i)); super(2, slice, i -> new BoneZerdinalBase2(i));
} }
static public BoneOrdinalBase2 valueOf(int zerdinal) { static public BoneZerdinalBase2 valueOf(int zerdinal) {
return IDENDITY.zerdinalMaterializeSpace(zerdinal); return IDENDITY.zerdinalMaterializeSpace(zerdinal);
} }
static public int valuesLength() { static public int valuesLength() {
return IDENDITY.zerdinalSpaceBoundary(); return IDENDITY.zerdinalSpaceBoundary();
} }
static public BoneOrdinalBase2[] values() { static public BoneZerdinalBase2[] values() {
return IDENDITY.zerdinalSpaceRodsToLadder().toArrayᴿᵈ(new BoneOrdinalBase2[] {}); return IDENDITY.zerdinalSpaceRodsToLadder().toArrayᴿᵈ(new BoneZerdinalBase2[] {});
} }
} }
public Ladderᴿᵈ<? extends Terminator𓄯<?>> deliverPieSlices(int pieSlices) { public Ladderᴿᵈ<? extends Terminator𓄯<?>> deliverPieSlices(int pieSlices) {
//BoneOrdinalBase1 b1p1 = BoneOrdinalBase1.valueOf(BoneOrdinalBase1.PART_0001); //BoneZerdinalBase1 b1p1 = BoneZerdinalBase1.valueOf(BoneZerdinalBase1.PART_0001);
//BoneOrdinalBase2 b2p1 = BoneOrdinalBase2.valueOf(BoneOrdinalBase2.PART_0001); //BoneZerdinalBase2 b2p1 = BoneZerdinalBase2.valueOf(BoneZerdinalBase2.PART_0001);
Vū́ǘrBurnCounterᴶᴹˣ counter = deliveryCounters.get(pieSlices); Vū́ǘrBurnCounterᴶᴹˣ counter = deliveryCounters.get(pieSlices);
if (counter == null) { if (counter == null) {
synchronized (deliveryCounters) { synchronized (deliveryCounters) {

16
nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᒢᓫᑊᐣᑊ/LegoGearByteNative.java
View file

@ -136,14 +136,14 @@ public enum LegoGearByteNative {
JediTempleBase8Iterator read = brickᐧtapeᐧrecordᐧχ3(); JediTempleBase8Iterator read = brickᐧtapeᐧrecordᐧχ3();
while (read.hasNextᴿᵈ().toNavajo()) { while (read.hasNextᴿᵈ().toNavajo()) {
int byteTriplet = 0; int byteTriplet = 0;
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_1); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_1);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_2); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_2);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_3); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_3);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_4); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_4);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_5); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_5);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_6); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_6);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_7); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_7);
byteTriplet += read.nextᴿᵈ().ordinalOctalShiftNative(T008ᖟ.PART_8); byteTriplet += read.nextᴿᵈ().zerdinalOctalShiftNative(T008ᖟ.PART_8);
output.write(byteTriplet); output.write(byteTriplet);
output.write(byteTriplet >> SHIFT_8); output.write(byteTriplet >> SHIFT_8);
output.write(byteTriplet >> SHIFT_16); output.write(byteTriplet >> SHIFT_16);

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

@ -227,7 +227,7 @@ public class FourCornerUnicodeDisplay {
@Override @Override
public void strobeStructNunLine(PrimordialOctal count) { public void strobeStructNunLine(PrimordialOctal count) {
for (int i = count.ordinal(); i >= 0; i--) { for (int i = count.zerdinal(); i >= 0; i--) {
output.appendCodePoint('\n'); output.appendCodePoint('\n');
} }
} }
@ -287,8 +287,8 @@ public class FourCornerUnicodeDisplay {
@Override @Override
public void strobeSandWorm(List<PrimordialOctal> sandWalk, List<PrimordialOctal> sandSpice) { public void strobeSandWorm(List<PrimordialOctal> sandWalk, List<PrimordialOctal> sandSpice) {
// TODO; select plugin for renderer ELSE print octals with number grams // TODO; select plugin for renderer ELSE print octals with number grams
sandWalk.forEach(v -> output.append(v.ordinal())); sandWalk.forEach(v -> output.append(v.zerdinal()));
sandSpice.forEach(v -> output.append(v.ordinal())); sandSpice.forEach(v -> output.append(v.zerdinal()));
} }
@Override @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()) { if (outTongue.isSixBit()) {
outAdd(FCDotDEC2701DashPX0.ESC6_SAND_WORM.cakePointDotIndex()); outAdd(FCDotDEC2701DashPX0.ESC6_SAND_WORM.cakePointDotIndex());
while (walkItr.hasNext()) { 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()); outAdd(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.cakePointDotIndex());
while (spiceItr.hasNext()) { 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()); outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.cakePointDotIndex());
} else { } else {
while (walkItr.hasNext()) { while (walkItr.hasNext()) {
int bitValue12 = 0; int bitValue12 = 0;
bitValue12 += (walkItr.next().ordinal() << 9); bitValue12 += (walkItr.next().zerdinal() << 9);
bitValue12 += (walkItr.next().ordinal() << 6); bitValue12 += (walkItr.next().zerdinal() << 6);
bitValue12 += (walkItr.next().ordinal() << 3); bitValue12 += (walkItr.next().zerdinal() << 3);
bitValue12 += (walkItr.next().ordinal() << 0); bitValue12 += (walkItr.next().zerdinal() << 0);
outAdd(FourCornerDotCake.FC_SANDWALK_12.getStart() + bitValue12); outAdd(FourCornerDotCake.FC_SANDWALK_12.getStart() + bitValue12);
} }
while (spiceItr.hasNext()) { while (spiceItr.hasNext()) {
int bitValue15 = 0; int bitValue15 = 0;
bitValue15 += (spiceItr.next().ordinal() << 12); bitValue15 += (spiceItr.next().zerdinal() << 12);
bitValue15 += (spiceItr.next().ordinal() << 9); bitValue15 += (spiceItr.next().zerdinal() << 9);
bitValue15 += (spiceItr.next().ordinal() << 6); bitValue15 += (spiceItr.next().zerdinal() << 6);
bitValue15 += (spiceItr.next().ordinal() << 3); bitValue15 += (spiceItr.next().zerdinal() << 3);
bitValue15 += (spiceItr.next().ordinal() << 0); bitValue15 += (spiceItr.next().zerdinal() << 0);
outAdd(FourCornerDotCake.FC_SANDWORM_15.getStart() + bitValue15); outAdd(FourCornerDotCake.FC_SANDWORM_15.getStart() + bitValue15);
} }
} }
@ -351,10 +351,10 @@ public class FourCornerZionStenoGrapher {
public void strobeStructNunLine(PrimordialOctal count) { public void strobeStructNunLine(PrimordialOctal count) {
if (outTongue.isSixBit()) { if (outTongue.isSixBit()) {
outAddAll(FCDotDEC2701DashPX0.ESC6_F4TTY0008_NL.baklavaPointSequence()); 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()); outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
} else { } else {
outAdd(FourCornerDotCake.FC_F4TTY0008_NL.getStart() + count.ordinal()); outAdd(FourCornerDotCake.FC_F4TTY0008_NL.getStart() + count.zerdinal());
} }
outFlush(); 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) { 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) { 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) { 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) { 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 /// @version 1.0 Sep 4, 2025
public interface FCFlameFremanSuit extends PrimordialOctal { public interface FCFlameFremanSuit extends PrimordialOctal {
@Override
default int zerdinal() {
return ordinal();
}
// copy from enum
int ordinal();
// copy from enum // copy from enum
String name(); 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 ©Δ∞ 仙上主天 /// @version ©Δ∞ 仙上主天
public interface PrimordialOctal { 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> { public interface PrimordialOctalIterator extends PrimitiveIterator<PrimordialOctalSkullBait, PrimordialOctalConsumer> {
default byte nextBait() { default byte nextBait() {
return next().ordinalOctalBait(); return next().zerdinalOctalBait();
} }
@Override @Override
@ -82,7 +82,7 @@ public interface PrimordialOctalIterator extends PrimitiveIterator<PrimordialOct
static int valueTapePlay(PrimordialOctalIterator iterator) { static int valueTapePlay(PrimordialOctalIterator iterator) {
int value = 0; int value = 0;
for (int i = 5; i >= 0; i--) { for (int i = 5; i >= 0; i--) {
value += (iterator.next().ordinalOctalBait() << (i * 3)); value += (iterator.next().zerdinalOctalBait() << (i * 3));
} }
return value; 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) { public void printHinari(PrimordialOctalOrangeJuice value, StringBuilder buf) {
PrimordialOctalIterator i3 = value.baitOctalIterator(); PrimordialOctalIterator i3 = value.baitOctalIterator();
while (i3.hasNext()) { 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()) { 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()) { 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 ©Δ∞ 仙上主天 /// @version ©Δ∞ 仙上主天
public interface PrimordialOctalSkullBait { 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; static private final int SHIFT_16 = 16;
@Override @Override
public byte ordinalOctalBait() { public int zerdinal() {
return (byte) ordinal(); return ordinal();
} }
@Override @Override
public int ordinalOctalBitShifter() { public byte zerdinalOctalBait() {
return ordinal() * OCTAL_BITS; return (byte) zerdinal();
} }
@Override @Override
public int ordinalOctalShiftSmurf(PrimordialOctalSkullBait shifter) { public int zerdinalOctalBitShifter() {
return ordinal() << shifter.ordinalOctalBitShifter(); return zerdinal() * OCTAL_BITS;
}
@Override
public int zerdinalOctalShiftSmurf(PrimordialOctalSkullBait shifter) {
return zerdinal() << shifter.zerdinalOctalBitShifter();
} }
static public PrimordialOctalSound valueOfOctalShift(int value, PrimordialOctalSound shifter) { 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) { static public PrimordialOctalSound valueOf(int index) {
@ -80,7 +85,7 @@ public enum PrimordialOctalSound implements PrimordialOctal, PrimordialOctalSkul
} }
static public PrimordialOctalSound valueOf(PrimordialOctal octal) { static public PrimordialOctalSound valueOf(PrimordialOctal octal) {
return valueOf(octal.ordinal()); return valueOf(octal.zerdinal());
} }
static public List<PrimordialOctalSound> valuesOfSmurfs(InputStream input) throws IOException { static public List<PrimordialOctalSound> valuesOfSmurfs(InputStream input) throws IOException {
@ -130,14 +135,14 @@ public enum PrimordialOctalSound implements PrimordialOctal, PrimordialOctalSkul
int totalBytes = 0; int totalBytes = 0;
while (read.hasNext()) { while (read.hasNext()) {
int byteTriplet = 0; int byteTriplet = 0;
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_1); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_1);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_2); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_2);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_3); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_3);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_4); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_4);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_5); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_5);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_6); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_6);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_7); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_7);
byteTriplet += !read.hasNext()?0:read.next().ordinalOctalShiftSmurf(PART_8); byteTriplet += !read.hasNext()?0:read.next().zerdinalOctalShiftSmurf(PART_8);
output.write(byteTriplet); output.write(byteTriplet);
output.write(byteTriplet >> SHIFT_8); output.write(byteTriplet >> SHIFT_8);
output.write(byteTriplet >> SHIFT_16); output.write(byteTriplet >> SHIFT_16);