eolang 0.4.1 → 0.6.1

package/README.md

@@ -8,7 +8,7 @@ and [Java SE](https://www.oracle.com/java/technologies/downloads/).
 Then, you install [eolang](https://www.npmjs.com/package/eolang) package:
 
 ```
-$ npm install eolang
+$ npm install -g eolang
 ```
 
 Then, you write a simple [EO](https://www.eolang.org) program in `hello.eo` file
@@ -38,12 +38,13 @@ You can also do many other things with `eoc` commands
   * `transpile` converts XMIR to target programming language
   * `compile` converts target language to binaries
   * `link` puts all binaries together into a single executable binary
-  * `dataize` executes the binary and dataize a single object
+  * `dataize` executes the binary and dataizes a single object
   * `test` executes all visible unit tests
 
 There are also commands that help manipulate with XMIR and EO sources (some of them are not implemented as of yet):
 
   * `audit` inspects all packages and report their status
+  * `foreign` inspects all objects found in the program after `assemble` step
   * <del>`translate` converts Java/C++/Python/etc. program to EO program</del>
   * <del>`demu` removes `cage` and `memory` objects</del>
   * <del>`dejump` removes `goto` objects</del>

package/itest/story.eo

@@ -24,6 +24,7 @@
   QQ.txt.sprintf > @
     "Hello, Mr. #%d!\n"
     as-int.
-      times.
-        random
-        100.0
+      QQ.math.number
+        times.
+          QQ.math.random
+          100.0

package/mvnw/pom.xml

@@ -30,6 +30,7 @@ SOFTWARE.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <eo.version>0.0.0</eo.version>
   </properties>
   <dependencies>
     <dependency>
@@ -56,6 +57,8 @@ SOFTWARE.
         <version>${eo.version}</version>
         <configuration>
           <excludeSources>.eoc/**</excludeSources>
+          <foreign>${project.build.directory}/eo-foreign.json</foreign>
+          <foreignFormat>json</foreignFormat>
         </configuration>
       </plugin>
       <plugin>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.4.1",
+  "version": "0.6.1",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",

package/src/commands/assemble.js

@@ -24,19 +24,21 @@
 
 const path = require('path');
 const mvnwSync = require('../mvnw');
+const parserVersion = require('../parser-version');
 
 /**
  * Command to assemble .XMIR files.
  * @param {Hash} opts - All options
  */
-module.exports = function assemble(opts) {
+module.exports = function(opts) {
   mvnwSync([
     'eo:assemble',
+    '-Deo.version=' + (opts.parserVersion ? opts.parserVersion : parserVersion()),
     opts.verbose ? '' : '--quiet',
+    opts.trackOptimizationSteps ? '-Deo.trackOptimizationSteps' : '',
+    opts.hash ? '-Deo.hash=' + opts.hash : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.outputDir=${path.resolve(opts.target, 'classes')}`,
-    `-Deo.foreign=${path.resolve(opts.target, 'eo-foreign.csv')}`,
-    `-Deo.foreignFormat=csv`,
     `-Deo.placed=${path.resolve(opts.target, 'eo-placed.csv')}`,
     `-Deo.placedFormat=csv`,
   ]);

package/src/commands/audit.js

@@ -28,6 +28,6 @@ const mvnwSync = require('../mvnw');
  * Command to audit all packages.
  * @param {Hash} opts - All options
  */
-module.exports = function audit(opts) {
+module.exports = function(opts) {
   mvnwSync(['--version']);
 };

package/src/commands/clean.js

@@ -29,8 +29,8 @@ const path = require('path');
  * Deletes all temporary files.
  * @param {Hash} opts - All options
  */
-module.exports = function clean(opts) {
+module.exports = function(opts) {
   const home = path.resolve(opts.target);
   fs.rmSync(home, {recursive: true, force: true});
-  console.debug('The directory %s deleted', home);
+  console.info('The directory %s deleted', home);
 };

package/src/commands/compile.js

@@ -29,7 +29,7 @@ const path = require('path');
  * Command to compile target language into binaries.
  * @param {Hash} opts - All options
  */
-module.exports = function compile(opts) {
+module.exports = function(opts) {
   const target = path.resolve(opts.target);
   mvnwSync([
     'compiler:compile',

package/src/commands/dataize.js

@@ -30,7 +30,7 @@ const path = require('path');
  * @param {String} obj - Name of object to dataize
  * @param {Hash} opts - All options
  */
-module.exports = function dataize(obj, opts) {
+module.exports = function(obj, opts) {
   spawn(
     `java`,
     [

package/src/commands/foreign.js

@@ -0,0 +1,39 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * Inspects and prints the list of foreign objects.
+ * @param {Hash} opts - All options
+ */
+module.exports = function(opts) {
+  const file = path.resolve(opts.target, 'eo-foreign.json');
+  const all = JSON.parse(fs.readFileSync(file, 'utf8'));
+  console.info('There are %d objects in %s:', all.length, file);
+  all.forEach((obj) => {
+    console.info('  %s', obj['id']);
+  });
+};

package/src/commands/link.js

@@ -29,7 +29,7 @@ const path = require('path');
  * Command to link binaries into a single executable binary.
  * @param {Hash} opts - All options
  */
-module.exports = function link(opts) {
+module.exports = function(opts) {
   mvnwSync([
     'jar:jar',
     opts.verbose ? '' : '--quiet',

package/src/commands/register.js

@@ -24,20 +24,20 @@
 
 const mvnwSync = require('../mvnw');
 const path = require('path');
+const parserVersion = require('../parser-version');
 
 /**
  * Command to register .EO sources.
  * @param {Hash} opts - All options
  */
-module.exports = function register(opts) {
-  const foreign = path.resolve(opts.target, 'eo-foreign.csv');
+module.exports = function(opts) {
+  const foreign = path.resolve(opts.target, 'eo-foreign.json');
   mvnwSync([
     'eo:register',
+    '-Deo.version=' + (opts.parserVersion ? opts.parserVersion : parserVersion()),
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.sourcesDir=${path.resolve(opts.sources)}`,
-    `-Deo.foreign=${foreign}`,
-    `-Deo.foreignFormat=csv`,
   ]);
   console.info('EO objects registered in %s', foreign);
 };

package/src/commands/test.js

@@ -29,7 +29,7 @@ const path = require('path');
  * Command to run all available unit tests.
  * @param {Hash} opts - All options
  */
-module.exports = function test(opts) {
+module.exports = function(opts) {
   mvnwSync([
     'surefire:test',
     `-Deo.targetDir=${path.resolve(opts.target)}`,

package/src/commands/transpile.js

@@ -23,21 +23,26 @@
  */
 
 const mvnwSync = require('../mvnw');
+const fs = require('fs');
 const path = require('path');
+const parserVersion = require('../parser-version');
 
 /**
  * Command to transpile XMIR files into target language.
  * @param {Hash} opts - All options
  */
-module.exports = function transpile(opts) {
+module.exports = function(opts) {
   const sources = path.resolve(opts.target, 'generated-sources');
+  if (fs.existsSync(sources)) {
+    fs.rmSync(sources, {recursive: true, force: true});
+    console.info('Previously existed Java sources deleted in %s', sources);
+  }
   mvnwSync([
     'eo:transpile',
+    '-Deo.version=' + (opts.parserVersion ? opts.parserVersion : parserVersion()),
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.generatedDir=${sources}`,
-    `-Deo.foreign=${path.resolve(opts.target, 'eo-foreign.csv')}`,
-    `-Deo.foreignFormat=csv`,
   ]);
   console.info('Java sources generated in %s', sources);
 };

package/src/eoc.js

@@ -33,6 +33,7 @@ const transpile = require('./commands/transpile');
 const compile = require('./commands/compile');
 const link = require('./commands/link');
 const dataize = require('./commands/dataize');
+const foreign = require('./commands/foreign');
 const test = require('./commands/test');
 
 if (process.argv.includes('--verbose')) {
@@ -43,13 +44,17 @@ if (process.argv.includes('--verbose')) {
 
 program
   .name('eoc')
-  .description('EO command-line toolkit')
+  .description('EO command-line toolkit (' + require('./version') + ')')
   .version(require('./version'));
 
 program
   .option('-s, --sources <path>', 'directory with .EO sources', '.')
   .option('-t, --target <path>', 'directory with all generated files', '.eoc')
+  .option('--hash <hex>', 'hash in objectionary/home to compile against')
+  .option('--parser <version>', 'set the version of parser to use')
   .option('--alone', 'just run a single command without dependencies')
+  .option('--no-color', 'disable colorization of console messages')
+  .option('--track-optimization-steps', 'save intermediate XMIR files')
   .option('--verbose', 'print debug messages and full output of child processes');
 
 program.command('audit')
@@ -58,6 +63,12 @@ program.command('audit')
     audit(program.opts());
   });
 
+program.command('foreign')
+  .description('inspects and prints the list of foreign objects')
+  .action((str, opts) => {
+    foreign(program.opts());
+  });
+
 program.command('clean')
   .description('delete all temporary files')
   .action((str, opts) => {

package/src/mvnw.js

@@ -24,44 +24,17 @@
 
 const path = require('path');
 const {spawnSync} = require('child_process');
-const XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
-const {XMLParser} = require('fast-xml-parser');
-
-let version = '';
-
-/**
- * Load the latest version from GitHub releases.
- * @return {String} Latest version, for example '0.23.1'
- */
-function latest() {
-  const repo = 'org/eolang/eo-maven-plugin';
-  if (version === '') {
-    const url = 'https://repo.maven.apache.org/maven2/' + repo + '/maven-metadata.xml';
-    const xhr = new XMLHttpRequest();
-    xhr.open('GET', url, false);
-    xhr.send(null);
-    if (xhr.status != 200) {
-      throw new Error('Invalid response status ' + xhr.status + ' from ' + url);
-    }
-    const xml = new XMLParser().parse(xhr.responseText);
-    version = xml.metadata.versioning.release;
-    console.debug('The latest version of %s at %s is %s', repo, url, version);
-  }
-  console.debug('Current version of %s is %s', repo, version);
-  return version;
-}
 
 /**
  * Run mvnw with provided commands.
  * @param {Hash} args - All arguments to pass to it
  */
-module.exports = function mvnwSync(args) {
+module.exports = function(args) {
   const home = path.resolve(__dirname, '../mvnw');
   const bin = path.resolve(home, 'mvnw') + (process.platform == 'win32' ? '.cmd' : '');
   const params = args.filter(function(t) {
     return t != '';
   }).concat([
-    '-Deo.version=' + latest(),
     '--errors',
     '--batch-mode',
     '--update-snapshots',

package/src/parser-version.js

@@ -0,0 +1,50 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+const XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
+const {XMLParser} = require('fast-xml-parser');
+
+let version = '';
+
+/**
+ * Load the latest version from GitHub releases.
+ * @return {String} Latest version, for example '0.23.1'
+ */
+module.exports = function() {
+  const repo = 'org/eolang/eo-maven-plugin';
+  if (version === '') {
+    const url = 'https://repo.maven.apache.org/maven2/' + repo + '/maven-metadata.xml';
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', url, false);
+    xhr.send(null);
+    if (xhr.status != 200) {
+      throw new Error('Invalid response status ' + xhr.status + ' from ' + url);
+    }
+    const xml = new XMLParser().parse(xhr.responseText);
+    version = xml.metadata.versioning.release;
+    console.debug('The latest version of %s at %s is %s', repo, url, version);
+  }
+  console.debug('Current version of %s is %s', repo, version);
+  return version;
+};

package/src/version.js

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.4.1';
+module.exports = '0.6.1';