Merge pull request #42 from polystat/develop

Release 0.2

.github/workflows/gradle-build.yml

@@ -27,9 +27,9 @@ jobs:
         with:
           arguments: build --info
 
-      - uses: gradle/gradle-build-action@v1
-        with:
-          arguments: test --info
+          #      - uses: gradle/gradle-build-action@v1
+          #        with:
+          #          arguments: test --info
 
   gradle_ubuntu:
     runs-on: ubuntu-latest
@@ -53,6 +53,35 @@ jobs:
         with:
           arguments: build --info
 
-      - uses: gradle/gradle-build-action@v1
+          #      - uses: gradle/gradle-build-action@v1
+          #        with:
+          #          arguments: test --info
+
+      - name: Generate JaCoCo Badge
+        uses: cicirello/jacoco-badge-generator@v2
+        with:
+          generate-branches-badge: true
+          jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv
+
+      - name: Log coverage percentage
+        run: |
+          echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+          echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
+
+      - name: Clean Bison directory
+        run: |
+          pwd
+          rm -r ./bison-3.8
+
+      - name: Commit and push the badge (if it changed)
+        uses: EndBug/add-and-commit@v7
+        with:
+          default_author: user_info
+          message: 'commit badge'
+          add: '*.svg'
+
+      - name: Upload JaCoCo coverage report
+        uses: actions/upload-artifact@v2
         with:
-          arguments: test --info
+          name: jacoco-report
+          path: target/site/jacoco/

.gitignore

@@ -2,5 +2,7 @@ out
 .gradle
 .idea
 build
+src/main/java/parser/JavaParser.java
 compile_and_run_tests.bat
-j2eo.jar
+j2eo.jar
+output.eo

README.md

@@ -6,6 +6,8 @@
 <br>
 
 [![Gradle Build](https://github.com/polystat/j2eo/actions/workflows/gradle-build.yml/badge.svg)](https://github.com/polystat/j2eo/actions/workflows/gradle-build.yml)
+![Coverage](.github/badges/jacoco.svg)
+![Branches](.github/badges/branches.svg)
 
 This is a translator of **Java** programming language to [EOLANG](https://www.eolang.org) programming language.
 
@@ -32,7 +34,7 @@ cat <.java filepath> | docker run --rm -i polystat/j2eo java -jar j2eo.jar -
 
 1. Make sure you have installed:
     - **Java 16+** (make sure command `java -version` shows 16+ version of Java in terminal if you have multiple Java version installed)
-    - **Maven 3.3+** (be aware of [possible conflicts](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980467) of the latest versions of Maven and Java on some OSs)
+    - **Maven 3.8+** (be aware of [possible conflicts](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980467) of the latest versions of Maven and Java on some OSs)
     - **Bison 3.7+** [3.7.5 recommended] (make sure the path to Bison executable is added to the `PATH` environmental variable)
 2. Clone the repo into your folder:
 
@@ -106,21 +108,21 @@ bugs in our code. It is also much easier to work with abstraction layer than wit
 
 ## NOT covered Java features list
 
-- Type Erasure
-- Subtyping
-- Conversions
-- Casting
-- Modules
-- Exceptions
-- Asserts
-- Throws
+- Type Erasure  - Zouev
+- Subtyping     - discuss with Yegor
+- Conversions   - remove
+- Casting       - remove
+- Modules      
+- Exceptions     - remove
+- Asserts        - remove
+- Throws         - remove
 - ``synchronized`` blocks
-- ``try``/``catch`` blocks
+- ``try``/``catch`` blocks  - remove
 - ``yeild`` feature
-- Threads and Locks
-- Generics (all kinds of them)
-- Native methods
-- break and continue statements
-- RTTI (instanceof operator) ??????
+- Threads and Locks 
+- Generics (all kinds of them) - remove
+- Native methods 
+- break and continue statements - remove
+- RTTI (instanceof operator) ??????  - remove
 
 In general, we cover **91 feature of 112** described in the Java language specification.

bin/README.md

@@ -0,0 +1,3 @@
+# ⚠️ NOTICE ⚠️
+
+This directory contains binaries provided by GNU Bison project, thus, not implemented by us. We distribute it here to ease the process of setting up the development environment. Feel free to delete them/replace by files located in your local system.

build.gradle.kts

@@ -1,18 +1,29 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 import java.security.MessageDigest
 import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 plugins {
     java
     jacoco
     pmd
     checkstyle
+    kotlin("jvm") version "1.6.0"
 }
 
 group = "org.eolang"
 version = "0.1"
 
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "15"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "15"
+}
+
 // The Java grammar source file for Bison
 val javaGrammarFilePath = "src/main/resources/Java_16_Grammar.y"
 
@@ -31,10 +42,17 @@ repositories {
 }
 
 dependencies {
+    // Library for command-line arguments support
     implementation("commons-cli:commons-cli:1.4")
+    // Functional stuff
+    implementation("io.arrow-kt:arrow-core:1.0.1")
+    // Kotlin logger
+    implementation("org.slf4j:slf4j-simple:1.7.29")
+    implementation("io.github.microutils:kotlin-logging-jvm:2.1.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    implementation(kotlin("stdlib-jdk8"))
 }
 
 
@@ -48,6 +66,7 @@ val fatJar = task("fatJar", type = Jar::class) {
     // Include dependencies
     from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
     with(tasks["jar"] as CopySpec)
+    duplicatesStrategy = org.gradle.api.file.DuplicatesStrategy.INCLUDE
 }
 
 tasks {
@@ -143,6 +162,7 @@ tasks.withType<JacocoReport> {
             }
         }))
     }
+    reports.csv.required.set(true)
 }
 
 /**
@@ -200,7 +220,7 @@ fun runBison() =
                     )
                 }
             else ->
-                throw kotlin.UnsupportedOperationException("Your OS is not yet supported. File a GitHub or issue or " +
+                throw UnsupportedOperationException("Your OS is not yet supported. File a GitHub or issue or " +
                         "provide a Pull Request with support for Bison execution for your OS.")
         }
     } catch (e: Exception) {

src/main/java/eotree/EOBnd.kt

@@ -0,0 +1,3 @@
+package eotree
+
+abstract class EOBnd(var expr: EOExpr) : EONode()

src/main/java/eotree/EOBndExpr.kt

@@ -0,0 +1,19 @@
+package eotree
+
+import arrow.core.prependTo
+import arrow.core.tail
+
+class EOBndExpr(expr: EOExpr, var bndName: String) : EOBnd(expr) {
+    override fun generateEO(indent: Int): String {
+        val lines = expr.generateEO(indent).split("\n")
+
+        // Append attribute name to the first line
+        return lines
+            .first()
+            .let { line -> "$line > $bndName" }
+            .prependTo(lines.tail())
+            .joinToString("\n")
+    }
+
+    override fun toString(): String = "[expr] > $bndName"
+}

src/main/java/eotree/EOComment.kt

@@ -0,0 +1,15 @@
+package eotree
+
+/**
+ * EBNF representation:
+ * `
+ * '#' ANY EOL
+` *
+ */
+class EOComment(var comment: String) : EONode() {
+    override fun generateEO(indent: Int): String =
+        "# $comment"
+
+    override fun toString(): String =
+        "# $comment"
+}