eolang 0.22.0 → 0.23.0

package/README.md

@@ -40,28 +40,30 @@ That's it.
 You can also do many other things with `eoc` commands
 (the flow is explained in [this blog post][blog]):
 
-* `register` finds necessary EO files and registers them in a JSON catalog
-* `assemble` parses EO files into XMIR, optimizes them,
+* `register` finds necessary `.eo` files and registers them in a JSON catalog
+* `assemble` parses `.eo` files into `.xmir`, optimizes them,
   and pulls foreign EO objects
-* `transpile` converts XMIR to target programming language (Java by default)
-* `compile` converts target language sources to binaries
+* `transpile` converts `.xmir` files to the target programming
+language (Java by default)
+* `compile` converts target language sources (e.g., `.java`)
+to binaries (e.g., `.class`)
 * `link` puts all binaries together into a single executable binary
 * `dataize` dataizes a single object from the executable binary
 * `test` dataizes all visible unit tests
-* `jeo:disassemble` convert Java `.class` files to `.xmir`
+* `jeo:disassemble` converts Java `.class` files to `.xmir`
 (via [jeo](https://github.com/objectionary/jeo-maven-plugin))
-* `jeo:assemble` convert `.xmir` files to Java `.class` files
+* `jeo:assemble` converts `.xmir` files to Java `.class` files
 (via [jeo](https://github.com/objectionary/jeo-maven-plugin))
 
 There are also commands that help manipulate with XMIR and EO sources
 (the list is not completed, while some of them are not implemented as of yet):
 
 * `audit` inspects all required packages and reports their status
-* `foreign` inspects all objects found in the program after `assemble` step
-* `sodg` generates SODG from XMIR, further rederable as XML or [Dot][dot]
-* `phi` generates PHI files from XMIR
-* `unphi` generates XMIR files from PHI files
-* `print` generates EO files from PHI files
+* `foreign` inspects all objects found in the program after the `assemble` step
+* `sodg` generates `.sodg` from `.xmir`, further rederable as XML or [Dot][dot]
+* `phi` generates `.phi` files from `.xmir` files
+* `unphi` generates `.xmir` files from `.phi` files
+* `print` generates `.eo` files from `.phi` files
 * ~~`translate` converts Java/C++/Python/etc. program to EO program~~
 * ~~`demu` removes `cage` and `memory` objects~~
 * ~~`dejump` removes `goto` objects~~

package/eo-version.txt

@@ -1 +1 @@
-0.39.2
+0.40.3

package/home-tag.txt

@@ -1 +1 @@
-0.38.2
+55e56e3bb2bdfa3d3e8e139028115790e820f0c1

package/mvnw/pom.xml

@@ -29,7 +29,7 @@ SOFTWARE.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <eo.version>undefined</eo.version>
-    <jeo.version>undefined</jeo.version>
+    <jeo.version>0.6.12</jeo.version>
   </properties>
   <dependencies>
     <dependency>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -47,7 +47,7 @@
     "grunt-contrib-clean": "2.0.1",
     "grunt-eslint": "24.3.0",
     "grunt-mocha-cli": "^7.0.0",
-    "mocha": "^10.7.3"
+    "mocha": "^10.8.0"
   },
   "scripts": {
     "test": "mocha --timeout 1200000"

package/src/commands/jeo/assemble.js

@@ -38,10 +38,10 @@ module.exports = function(opts) {
       .concat(
         [
           `-Djeo.version=${opts.jeoVersion}`,
-          `-Djeo.unroll-phi.sourcesDir=${path.resolve(opts.xmirs)}`,
-          `-Djeo.unroll-phi.outputDir=${path.resolve(opts.unrolled)}`,
-          `-Djeo.assemble.sourcesDir=${path.resolve(opts.unrolled)}`,
-          `-Djeo.assemble.outputDir=${path.resolve(opts.classes)}`,
+          `-Djeo.unroll-phi.sourcesDir=${path.resolve(opts.target, opts.xmirs)}`,
+          `-Djeo.unroll-phi.outputDir=${path.resolve(opts.target, opts.unrolled)}`,
+          `-Djeo.assemble.sourcesDir=${path.resolve(opts.target, opts.unrolled)}`,
+          `-Djeo.assemble.outputDir=${path.resolve(opts.target, opts.classes)}`,
         ]
       ),
     opts.target, opts.batch

package/src/commands/jeo/disassemble.js

@@ -38,8 +38,8 @@ module.exports = function(opts) {
       .concat(
         [
           `-Djeo.version=${opts.jeoVersion}`,
-          `-Djeo.disassemble.sourcesDir=${path.resolve(opts.classes)}`,
-          `-Djeo.disassemble.outputDir=${path.resolve(opts.xmirs)}`,
+          `-Djeo.disassemble.sourcesDir=${path.resolve(opts.target, opts.classes)}`,
+          `-Djeo.disassemble.outputDir=${path.resolve(opts.target, opts.xmirs)}`,
         ]
       ),
     opts.target, opts.batch

package/src/eoc.js

@@ -210,7 +210,7 @@ program.command('phi')
         .then((r) => coms().assemble(program.opts()))
         .then((r) => coms().phi({...program.opts(), ...str}));
     } else {
-      coms().phi(program.opts());
+      coms().phi({...program.opts(), ...str});
     }
   });
 
@@ -350,8 +350,16 @@ program.command('test')
 program.command('jeo:disassemble')
   .description('Disassemble .class files to .xmir files')
   .option('--jeo-version <version>', 'Version of JEO to use', '0.6.11')
-  .option('--classes <dir>', 'Directory with .class files (reading from it)', 'target/classes')
-  .option('--xmirs <dir>', 'Directory with .xmir files (writing into it)', 'target/xmir')
+  .option(
+    '--classes <dir>',
+    'Directory with .class files (relative to --target)',
+    'classes'
+  )
+  .option(
+    '--xmirs <dir>',
+    'Directory with .xmir files (relative to --target)',
+    'xmir'
+  )
   .action((str, opts) => {
     coms().jeo_disassemble({...program.opts(), ...str});
   });
@@ -359,9 +367,21 @@ program.command('jeo:disassemble')
 program.command('jeo:assemble')
   .description('Assemble .xmir files to .class files')
   .option('--jeo-version <version>', 'Version of JEO to use', '0.6.11')
-  .option('--xmirs <dir>', 'Directory with .xmir files (reading from it)', 'target/xmir')
-  .option('--unrolled <dir>', 'Directory with unrolled .xmir files', 'target/unrolled')
-  .option('--classes <dir>', 'Directory with .class files (writing into it)', 'target/classes')
+  .option(
+    '--xmirs <dir>',
+    'Directory with .xmir files (relative to --target)',
+    'xmir'
+  )
+  .option(
+    '--unrolled <dir>',
+    'Directory with unrolled .xmir files (relative to --target)',
+    'unrolled'
+  )
+  .option(
+    '--classes <dir>',
+    'Directory with .class files (relative to --target)',
+    'classes'
+  )
   .action((str, opts) => {
     coms().jeo_assemble({...program.opts(), ...str});
   });

package/src/version.js

@@ -25,6 +25,6 @@
 // The values here are replaced automatically by the .rultor.yml script,
 // at the "release" pipeline:
 module.exports = {
-  what: '0.22.0',
-  when: '2024-10-25'
+  what: '0.23.0',
+  when: '2024-10-30'
 };