eolang 0.8.2 → 0.8.4

package/README.md

@@ -52,6 +52,7 @@ There are also commands that help manipulate with XMIR and EO sources (some of t
 
   * `audit` inspects all required packages and reports their status
   * `foreign` inspects all objects found in the program after `assemble` step
+  * `gmi` generates GMI from XMIR, further rederable as XML or [Dot](https://en.wikipedia.org/wiki/DOT_%28graph_description_language%29)
   * <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

@@ -26,5 +26,5 @@
     as-int.
       QQ.math.number
         times.
-          QQ.math.random
+          QQ.math.random.pseudo
           100.0

package/mvnw/pom.xml

@@ -34,12 +34,12 @@ SOFTWARE.
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.2</version>
+      <version>5.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.6.2</version>
+      <version>5.9.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -55,13 +55,15 @@ SOFTWARE.
         <version>${eo.version}</version>
         <configuration>
           <excludeSources>.eoc/**</excludeSources>
+          <gmiIncludes>${eo.gmiIncludes}</gmiIncludes>
+          <gmiExcludes>${eo.gmiExcludes}</gmiExcludes>
           <foreign>${project.build.directory}/eo-foreign.json</foreign>
           <foreignFormat>json</foreignFormat>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.8.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -69,7 +71,7 @@ SOFTWARE.
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
         <configuration>
           <archive>
             <manifest>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -23,15 +23,15 @@
   "dependencies": {
     "colors": "1.4.0",
     "commander": "9.4.0",
-    "fast-xml-parser": "4.0.9",
+    "fast-xml-parser": "4.0.10",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "5.16.0",
+    "eslint": "8.23.1",
     "eslint-config-google": "0.14.0",
     "grunt": "1.5.3",
     "grunt-contrib-clean": "2.0.1",
-    "grunt-eslint": "21.1.0",
+    "grunt-eslint": "24.0.0",
     "grunt-mocha-cli": "7.0.0",
     "mocha": "^10.0.0"
   },

package/renovate.json

@@ -2,5 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base"
-  ]
+  ],
+  "ignoreDeps": ["maven-compiler-plugin", "eo-maven-plugin"]
 }

package/src/commands/compile.js

@@ -24,6 +24,7 @@
 
 const mvnwSync = require('../mvnw');
 const path = require('path');
+const parserVersion = require('../parser-version');
 
 /**
  * Command to compile target language into binaries.
@@ -38,6 +39,7 @@ module.exports = function(opts) {
     `-Dmaven.compiler.target=1.8`,
     `-Deo.targetDir=${target}`,
     `-Deo.generatedDir=${path.resolve(opts.target, 'generated-sources')}`,
+    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
   ]);
   console.info('Java .class files compiled into %s', target);
 };

package/src/commands/gmi.js

@@ -31,15 +31,36 @@ const parserVersion = require('../parser-version');
  * @param {Hash} opts - All options
  */
 module.exports = function(opts) {
-  mvnwSync([
+  const argv = [
     'eo:gmi',
     '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
     opts.verbose ? '' : '--quiet',
-    opts.gmiXml ? '-Deo.generateGmiXmlFiles' : '',
-    opts.gmiXembly ? '-Deo.generateXemblyFiles' : '',
-    opts.gmiGraph ? '-Deo.generateGraphFiles' : '',
-    opts.gmiDot ? '-Deo.generateDotFiles' : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
-  ]);
+  ];
+  if (opts.include) {
+    argv.push('-Deo.gmiIncludes=' + opts.include);
+  }
+  if (opts.exclude) {
+    argv.push('-Deo.gmiExcludes=' + opts.exclude);
+  }
+  if (opts.xml) {
+    argv.push('-Deo.generateGmiXmlFiles');
+  }
+  if (opts.xembly) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+  }
+  if (opts.graph) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+    argv.push('-Deo.generateGraphFiles');
+  }
+  if (opts.dot) {
+    argv.push('-Deo.generateGmiXmlFiles');
+    argv.push('-Deo.generateXemblyFiles');
+    argv.push('-Deo.generateGraphFiles');
+    argv.push('-Deo.generateDotFiles');
+  }
+  mvnwSync(argv);
   console.info('GMI files generated in %s', path.resolve(opts.target));
 };

package/src/commands/link.js

@@ -24,6 +24,7 @@
 
 const mvnwSync = require('../mvnw');
 const path = require('path');
+const parserVersion = require('../parser-version');
 
 /**
  * Command to link binaries into a single executable binary.
@@ -34,6 +35,7 @@ module.exports = function(opts) {
     'jar:jar',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
+    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
   ]);
   console.info('Executable JAR created at %s', path.resolve(opts.target, 'eoc.jar'));
 };

package/src/eoc.js

@@ -95,10 +95,12 @@ program.command('assemble')
 
 program.command('gmi')
   .description('generate GMI files from XMIR')
-  .option('--gmi-xml', 'generate .gmi.xml files')
-  .option('--gmi-xembly', 'generate .gmi.xe files')
-  .option('--gmi-graph', 'generate .gmi.graph files')
-  .option('--gmi-dot', 'generate .gmi.dot files')
+  .option('--xml', 'generate .gmi.xml files')
+  .option('--xembly', 'generate .gmi.xe files')
+  .option('--graph', 'generate .gmi.graph files')
+  .option('--dot', 'generate .gmi.dot files')
+  .option('--include <names>', 'generate GMI for these object names (using mask)')
+  .option('--exclude <names>', 'don\'t generate GMI for these objects')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts());

package/src/parser-version.js

@@ -45,6 +45,6 @@ module.exports = function() {
     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);
+  console.info('EO version is %s', version);
   return version;
 };

package/src/version.js

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.8.2';
+module.exports = '0.8.4';