feat(objectionary#976): ugly solution for hex convertation

volodya-lombrozo · Jan 22, 2025 · 3516b8f · 3516b8f
1 parent fde473c
commit 3516b8f
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java b/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java
@@ -303,9 +303,9 @@ Stream<String> checks(final String root) {
                 Stream.of(
                     instruction.concat("/@base"),
                     String.format(
-                        "%s/o[contains(@base,'int')]/o[@base='org.eolang.bytes' and text()='%s']/@base",
+                        "%s/o[contains(@base,'int')]/o[contains(@base,'number')]/o[contains(@base,'bytes') and text()='%s']/@base",
                         instruction,
-                        new DirectivesValue(this.opcode).hex()
+                        new DirectivesValue((double) this.opcode).hex()
                     )
                 ),
                 this.arguments(instruction)
@@ -322,16 +322,30 @@ private Stream<String> arguments(final String instruction) {
                 .map(
                     arg -> {
                         final String result;
-                        final DirectivesValue hex = new DirectivesValue(arg);
-                        if (arg instanceof BytecodeLabel) {
+                        if (arg instanceof Number) {
+                            final DirectivesValue simple = new DirectivesValue(
+                                arg
+                            );
+                            final DirectivesValue hex = new DirectivesValue(
+                                ((Number) arg).doubleValue()
+                            );
+                            result = String.format(
+                                "%s/o[contains(@base,'%s')]/o[contains(@base,'number')]/o[contains(@base,'bytes') and text()='%s']/@base",
+                                instruction,
+                                simple.type(),
+                                hex.hex()
+                            );
+                        } else if (arg instanceof BytecodeLabel) {
+                            final DirectivesValue hex = new DirectivesValue(arg);
                             result = String.format(
-                                "%s/o[contains(@base,'%s')]/o[@base='org.eolang.bytes']/@base",
+                                "%s/o[contains(@base,'%s')]/o[contains(@base,'bytes')]/@base",
                                 instruction,
                                 hex.type()
                             );
                         } else {
+                            final DirectivesValue hex = new DirectivesValue(arg);
                             result = String.format(
-                                "%s/o[contains(@base,'%s')]/o[@base='org.eolang.bytes' and text()='%s']/@base",
+                                "%s/o[contains(@base,'%s')]/o[contains(@base,'bytes') and text()='%s']/@base",
                                 instruction,
                                 hex.type(),
                                 hex.hex()