Merge pull request #19 from polystat/develop

Working version

.gitignore

@@ -2,3 +2,5 @@ out
 .gradle
 .idea
 build
+compile_and_run_tests.bat
+j2eo.jar

README.md

@@ -36,10 +36,16 @@ bugs in our code. It is also much easier to work with abstraction layer than wit
 
 ## Usage
 
-> ⚠️ NOTE: for now, the entire pipeline is not available. Project is Work In Progress.
+To build, run:
 
 ```shell
-java -jar j2eo.jar <source package directory> -o <output directory>
+./build.sh
+```
+
+To execute, run:
+
+```shell
+java -jar j2eo.jar <source .java file> -o <output .eo file>
 ```
 
 ---
@@ -50,6 +56,10 @@ java -jar j2eo.jar <source package directory> -o <output directory>
 - Then, for each file, translator converts Java AST to EO AST.
 - Then, EO AST is printed out as a source code to output directory in the same directory structure.
 
+## What's inside
+
+
+
 ## NOT covered Java features list
 
 - Type Erasure
@@ -64,5 +74,9 @@ java -jar j2eo.jar <source package directory> -o <output directory>
 - ``try``/``catch`` blocks
 - ``yeild`` feature
 - Threads and Locks
+- Generics (all kinds of them)
+- Native methods
+- break and continue statements
+- RTTI (instanceof operator) ??????
 
 In general, we cover **91 feature of 112** described in the Java language specification.

build.gradle.kts

@@ -1,5 +1,6 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 import java.security.MessageDigest
+import org.gradle.jvm.tasks.Jar
 
 
 plugins {
@@ -27,8 +28,29 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.0")
+    implementation("commons-cli:commons-cli:1.4")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+}
+
+
+val fatJar = task("fatJar", type = Jar::class) {
+//    baseName = "${project.name}-fat"
+    // manifest Main-Class attribute is optional.
+    // (Used only to provide default main class for executable jar)
+    manifest {
+        attributes["Main-Class"] = "main.Main" // fully qualified class name of default main class
+    }
+    // Include dependencies
+    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    with(tasks["jar"] as CopySpec)
+}
+
+tasks {
+    "build" {
+        dependsOn(fatJar)
+    }
 }
 
 tasks.withType(JavaCompile::class).configureEach {
@@ -72,45 +94,49 @@ fun createOutDirs() {
  * Runs Bison using OS-specific shell command.
  */
 fun runBison() =
-    when {
-        Os.isFamily(Os.FAMILY_WINDOWS) ->
-            exec {
-                workingDir = File(".")
-                executable = "bin/win_bison.exe"
-                args = mutableListOf(
-                    "--report=states,lookaheads",
-                 // "-r", "all",
-                 // "--debug", "--help", "--stacktrace",
-                    "--report-file=${reportFilePath}",
-                    "--output=${javaParserFilePath}",
-                    javaGrammarFilePath
-                )
-            }
-        Os.isFamily(Os.FAMILY_MAC) ->
-            exec {
-                workingDir = File(".")
-                executable = "bin/bison_mac"
-                args = mutableListOf(
-                    "-r", "all",
-                    "--report-file=${reportFilePath}",
-                    "--output=${javaParserFilePath}",
-                    javaGrammarFilePath
-                )
-            }
-        Os.isFamily(Os.FAMILY_UNIX) ->
-            exec {
-                workingDir = File(".")
-                executable = "bison"
-                args = mutableListOf(
-                    "-r", "all",
-                    "--report-file=${reportFilePath}",
-                    "--output=${javaParserFilePath}",
-                    javaGrammarFilePath
-                )
-            }
-        else ->
-            throw kotlin.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.")
+    try {
+        when {
+            Os.isFamily(Os.FAMILY_WINDOWS) ->
+                exec {
+                    workingDir = File(".")
+                    executable = "bin/win_bison.exe"
+                    args = mutableListOf(
+                        "--report=states,lookaheads",
+                        // "-r", "all",
+                        // "--debug", "--help", "--stacktrace",
+                        "--report-file=${reportFilePath}",
+                        "--output=${javaParserFilePath}",
+                        javaGrammarFilePath
+                    )
+                }
+            Os.isFamily(Os.FAMILY_MAC) ->
+                exec {
+                    workingDir = File(".")
+                    executable = "bin/bison_mac"
+                    args = mutableListOf(
+                        "--report=states,lookaheads",
+                        "--report-file=${reportFilePath}",
+                        "--output=${javaParserFilePath}",
+                        javaGrammarFilePath
+                    )
+                }
+            Os.isFamily(Os.FAMILY_UNIX) ->
+                exec {
+                    workingDir = File(".")
+                    executable = "bison"
+                    args = mutableListOf(
+                        "--report=states,lookaheads",
+                        "--report-file=${reportFilePath}",
+                        "--output=${javaParserFilePath}",
+                        javaGrammarFilePath
+                    )
+                }
+            else ->
+                throw kotlin.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) {
+        e.printStackTrace()
     }
 
 

build.sh

@@ -0,0 +1,4 @@
+#/bin/sh
+
+./gradlew fatJar
+cp build/libs/* j2eo.jar

src/main/java/eotree/EOBndExpr.java

@@ -1,5 +1,9 @@
 package eotree;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class EOBndExpr extends EOBnd {
     public EOBndName bndName;
 
@@ -10,6 +14,15 @@ public EOBndExpr(EOExpr expr, EOBndName bndName) {
 
     @Override
     public String generateEO(int indent) {
-        return expr.generateEO(indent) + " > " + bndName.generateEO(0);
+        var lines = expr.generateEO(indent).split("\n");
+        // Append attribute name to the first line
+        return Stream.concat(
+                Arrays.stream(lines)
+                        .findFirst()
+                        .map(line -> line + " > " + bndName.generateEO(0))
+                        .stream(),
+                Arrays.stream(lines)
+                        .skip(1)
+        ).collect(Collectors.joining("\n"));
     }
 }

src/main/java/eotree/EOMeta.java

@@ -3,7 +3,7 @@
 /**
  * EBNF representation:
  * <code>
- * '+' name '␣' ANY EOL
+ * '+' name ' ' ANY EOL
  * </code>
  */
 public class EOMeta extends EONode {

src/main/java/eotree/EOObject.java

@@ -8,16 +8,13 @@ public class EOObject extends EOExpr {
     public List<EOBndName>     freeAttrs;
     public Optional<EOBndName> varargAttr;
     public List<EOBndExpr>     bndAttrs;
-    public Optional<String>    name;
 
     public EOObject(List<EOBndName> freeAttrs,
                     Optional<EOBndName> varargAttr,
-                    List<EOBndExpr> bndAttrs,
-                    Optional<String> name) {
+                    List<EOBndExpr> bndAttrs) {
         this.freeAttrs = freeAttrs;
         this.varargAttr = varargAttr;
         this.bndAttrs = bndAttrs;
-        this.name = name;
     }
 
     @Override
@@ -29,11 +26,7 @@ public String generateEO(int indent) {
                (varargAttr
                        .map(attr -> " " + attr.generateEO(indent) + "...")
                        .orElse("")) +
-               "]" +
-               (name
-                       .map(n -> " > " + name.get())
-                       .orElse("")
-               ) + "\n" +
+               "]\n" +
                bndAttrs.stream()
                        .map(attr -> attr.generateEO(indent + 1))
                        .collect(Collectors.joining("\n"));

src/main/java/lexer/Scanner.java

@@ -1,10 +1,12 @@
 package lexer;
 
+import parser.JavaParser;
+
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-public class Scanner
+public class Scanner implements JavaParser.Lexer
 {
     private static String sourcePath;
     private static char[] sourceText;
@@ -47,6 +49,32 @@ private static void forgetChar()
         currentChar = '\0';
     }
 
+    // PUBLIC SCANNER INTERFACE /////////////////////////////
+
+    private Token lastToken;
+
+    public int yylex()
+    {
+        lastToken = getToken();
+
+        System.out.println(lastToken.code);
+
+        return lastToken.code.value();
+    }
+
+    public Token getLVal()
+    {
+        return lastToken;
+    }
+
+    @Override
+    public void yyerror(String msg) {
+        System.out.println(msg);
+    }
+
+    /////////////////////////////////////////////////////////////
+
+
     // Detecting the current token //////////////////////////////
 
     private static Token currentToken;
@@ -79,6 +107,23 @@ private static Token getToken()
         }
         switch ( ch )
         {
+            case '"':  // String literal
+                forgetChar();
+                String str = "";
+                while ( true )
+                {
+                    ch = getChar();
+                    if ( ch == '"' )
+                    {
+                        forgetChar();
+                        break;
+                    }
+                    str += ""+ch;
+                    forgetChar();
+                }
+                code = TokenCode.StringLiteral;
+                image = str;
+                break;
             case ':' :  //  :  ::
                 forgetChar(); ch = getChar();
                 if ( ch == ':' ) { forgetChar(); code = TokenCode.DoubleColon; image = "::"; }
@@ -106,7 +151,7 @@ private static Token getToken()
             case ']': forgetChar(); code = TokenCode.RightBracket; image = "]"; break;
             case '{': forgetChar(); code = TokenCode.LeftBrace ;   image = "{"; break;
             case '}': forgetChar(); code = TokenCode.RightBrace;   image = "}"; break;
-            case '@': forgetChar(); code = TokenCode.Ampersand;    image = "@"; break;
+            case '@': forgetChar(); code = TokenCode.At;           image = "@"; break;
             case '~': forgetChar(); code = TokenCode.Tilde;        image = "~"; break;
 
             case '*':  //  *  *=
@@ -303,12 +348,11 @@ private static TokenCode detectKeyword(String identifier)
             case "boolean"  : return TokenCode.Boolean;
             case "break"    : return TokenCode.Break;
             case "byte"     : return TokenCode.Byte;
-            case "base"     : return TokenCode.Base;
             case "catch"    : return TokenCode.Catch;
             case "case"     : return TokenCode.Case;
             case "char"     : return TokenCode.Char;
             case "class"    : return TokenCode.Class;
-            case "const"    : return TokenCode.Const;   // not actually used
+ //         case "const"    : return TokenCode.Const;   // not actually used
             case "continue" : return TokenCode.Continue;
             case "default"  : return TokenCode.Default;
             case "do"       : return TokenCode.Do;
@@ -320,7 +364,7 @@ private static TokenCode detectKeyword(String identifier)
             case "finally"  : return TokenCode.Finally;
             case "float"    : return TokenCode.Float;
             case "for"      : return TokenCode.For;
-            case "goto"     : return TokenCode.Goto; // not actually used
+ //         case "goto"     : return TokenCode.Goto; // not actually used
             case "if"       : return TokenCode.If;
             case "implements": return TokenCode.Implements;
             case "import"   : return TokenCode.Import;
@@ -354,6 +398,8 @@ private static TokenCode detectKeyword(String identifier)
             case "false"    : return TokenCode.False;
             case "null"     : return TokenCode.Null;
             case "var"      : return TokenCode.Var;
+            case "yield"    : return TokenCode.Yield;
+            case "record"   : return TokenCode.Record;
 
            /*
                     open,