Merge pull request #51 from maxonfjvipon/fix/#50/package

fix(#50): fix package
objectionary · Jan 22, 2024 · 51f01a2 · 51f01a2
2 parents d315a85 + 5e84f98
commit 51f01a2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/...ark-example/src/main/xmir/com/exam/A.xmir → ...src/main/xmir/org/eolang/benchmark/A.xmir b/...ark-example/src/main/xmir/com/exam/A.xmir → ...src/main/xmir/org/eolang/benchmark/A.xmir
@@ -12,8 +12,8 @@
    <metas>
       <meta>
          <head>package</head>
-         <tail>com.exam</tail>
-         <part>com.exam</part>
+         <tail>org.eolang.benchmark</tail>
+         <part>org.eolang.benchmark</part>
       </meta>
       <meta>
          <head>alias</head>

diff --git a/...k-example/src/main/xmir/com/exam/App.xmir → ...c/main/xmir/org/eolang/benchmark/App.xmir b/...k-example/src/main/xmir/com/exam/App.xmir → ...c/main/xmir/org/eolang/benchmark/App.xmir
@@ -12,8 +12,8 @@
    <metas>
       <meta>
          <head>package</head>
-         <tail>com.exam</tail>
-         <part>com.exam</part>
+         <tail>org.eolang.benchmark</tail>
+         <part>org.eolang.benchmark</part>
       </meta>
       <meta>
          <head>alias</head>
@@ -70,9 +70,9 @@
                <o base="tuple">
                   <o base=".bar">
                      <o base=".new">
-                        <o base="com/exam/B"/>
+                        <o base="org/eolang/benchmark/B"/>
                         <o base=".new">
-                           <o base="com/exam/A"/>
+                           <o base="org/eolang/benchmark/A"/>
                            <o base="int" data="bytes">00 00 00 00 00 00 00 2A</o>
                         </o>
                      </o>

diff --git a/...ark-example/src/main/xmir/com/exam/B.xmir → ...src/main/xmir/org/eolang/benchmark/B.xmir b/...ark-example/src/main/xmir/com/exam/B.xmir → ...src/main/xmir/org/eolang/benchmark/B.xmir
@@ -12,8 +12,8 @@
    <metas>
       <meta>
          <head>package</head>
-         <tail>com.exam</tail>
-         <part>com.exam</part>
+         <tail>org.eolang.benchmark</tail>
+         <part>org.eolang.benchmark</part>
       </meta>
       <meta>
          <head>alias</head>
@@ -42,7 +42,7 @@
             <o base="string" data="bytes" name="descriptor">28 4C 63 6F 6D 2F 65 78 61 6D 2F 46 3B 29 56</o>
             <o base="string" data="bytes" name="signature"/>
             <o base="tuple" data="tuple" name="exceptions"/>
-            <o abstract="" name="arg__Lcom/exam/F;__0"/>
+            <o abstract="" name="arg__Lorg/eolang/benchmark/F;__0"/>
             <o base="seq" name="@">
                <o base="tuple">
                   <o base="label">

diff --git a/...ark-example/src/main/xmir/com/exam/F.xmir → ...src/main/xmir/org/eolang/benchmark/F.xmir b/...ark-example/src/main/xmir/com/exam/F.xmir → ...src/main/xmir/org/eolang/benchmark/F.xmir
@@ -12,8 +12,8 @@
    <metas>
       <meta>
          <head>package</head>
-         <tail>com.exam</tail>
-         <part>com.exam</part>
+         <tail>org.eolang.benchmark</tail>
+         <part>org.eolang.benchmark</part>
       </meta>
       <meta>
          <head>alias</head>

diff --git a/src/it/benchmark-example/verify.groovy b/src/it/benchmark-example/verify.groovy
@@ -24,7 +24,7 @@
 
 import groovy.xml.XmlSlurper
 
-file = new File(basedir, 'target/generated-sources/fused-xmir/com/exam/BA.xmir')
+file = new File(basedir, 'target/generated-sources/fused-xmir/org/eolang/benchmark/BA.xmir')
 assert file.exists()
 
 true
diff --git a/src/main/java/org/eolang/ineo/FuseMojo.java b/src/main/java/org/eolang/ineo/FuseMojo.java
@@ -113,9 +113,12 @@ public void execute() {
                 Logger.info(this, "Found fuse optimization in %s", file.getFileName());
                 try {
                     final String pckg = this.sourcesDir.toPath().relativize(file).toString()
-                        .replace(String.format("%s%s", File.separator, file.getFileName()), "");
+                        .replace(String.format("%s%s", File.separator, file.getFileName()), "")
+                        .replace(File.separator, ".");
                     final Path generated = this.outputDir.toPath().resolve(
-                        String.join(File.separator, pckg, "BA.xmir")
+                        String.join(
+                            File.separator, pckg.replace(".", File.separator), "BA.xmir"
+                        )
                     );
                     new Home(
                         new Saved(after, path),