Merge pull request #27 from polystat/develop

Version 0.1
polystat · Oct 25, 2021 · aff2e5f · aff2e5f · 0pdd · Oct 25, 2021
2 parents 776acd2 + 448bf32
commit aff2e5f
Show file tree

Hide file tree

Showing 27 changed files with 2,222 additions and 1,659 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -12,7 +12,6 @@ jobs:
     strategy:
       matrix:
         os: [
-            ubuntu-latest,
             macos-latest,
             windows-latest
         ]
@@ -32,3 +31,28 @@ jobs:
         with:
           arguments: test
 
+  gradle_ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 16
+
+      - run: |
+          wget http://ftp.gnu.org/gnu/bison/bison-3.8.tar.gz
+          tar -zxvf bison-3.8.tar.gz
+          cd bison-3.8
+          ./configure
+          make
+          sudo make install
+          bison -V
+
+      - uses: gradle/gradle-build-action@v1
+        with:
+          arguments: build
+
+      - uses: gradle/gradle-build-action@v1
+        with:
+          arguments: test
diff --git a/README.md b/README.md
@@ -34,6 +34,17 @@ bugs in our code. It is also much easier to work with abstraction layer than wit
 
 ---
 
+## Requirements
+
+In order to compile project from source code, you need to have
+
+- Bison 3.7+
+- Java 15+
+
+installed. Bison is currently bundled with the project for Windows and macOS. On Linux, you may use package manager to easily install Bison (but check the Bison version; some distos, like Ubuntu, like to ship outdated versions of software).
+
+---
+
 ## Usage
 
 To build, run:

diff --git a/build.sh b/build.sh
@@ -1,4 +1,4 @@
 #/bin/sh
 
-./gradlew fatJar
+./gradlew fatJar test
 cp build/libs/* j2eo.jar
diff --git a/src/main/java/eotree/EOCopy.java b/src/main/java/eotree/EOCopy.java
@@ -15,7 +15,7 @@ public EOCopy(EOExpr trg, List<EOBnd> args) {
     @Override
     public String generateEO(int indent) {
         return trg.generateEO(indent) + args.stream()
-                .map(arg -> " " + arg.generateEO(indent + 1))
+                .map(arg -> "\n" + arg.generateEO(indent + 1))
                 .collect(Collectors.joining());
     }
 }
diff --git a/src/main/java/eotree/EOObject.java b/src/main/java/eotree/EOObject.java
@@ -24,7 +24,7 @@ public String generateEO(int indent) {
                        .map(attr -> attr.generateEO(indent))
                        .collect(Collectors.joining(" ")) +
                (varargAttr
-                       .map(attr -> " " + attr.generateEO(indent) + "...")
+                       .map(attr -> (freeAttrs.size() > 0 ? " " : "") + attr.generateEO(indent) + "...")
                        .orElse("")) +
                "]\n" +
                bndAttrs.stream()

diff --git a/src/main/java/eotree/EOProgram.java b/src/main/java/eotree/EOProgram.java
@@ -28,6 +28,6 @@ public String generateEO(int indent) {
                "\n" +
                bnds.stream()
                        .map(bnd -> bnd.generateEO(indent))
-                       .collect(Collectors.joining("\n"));
+                       .collect(Collectors.joining("\n")) + "\n";
     }
 }
diff --git a/src/main/java/eotree/data/EOFloatData.java b/src/main/java/eotree/data/EOFloatData.java
@@ -15,6 +15,6 @@ public EOFloatData(Float f) {
 
     @Override
     public String generateEO(int indent) {
-        return f.toString();
+        return indent(indent) + f.toString();
     }
 }
diff --git a/src/main/java/eotree/data/EOIntData.java b/src/main/java/eotree/data/EOIntData.java
@@ -15,6 +15,6 @@ public EOIntData(Integer i) {
 
     @Override
     public String generateEO(int indent) {
-        return i.toString();
+        return indent(indent) + i.toString();
     }
 }
diff --git a/src/main/java/eotree/data/EOStringData.java b/src/main/java/eotree/data/EOStringData.java
@@ -15,6 +15,6 @@ public EOStringData(String str) {
 
     @Override
     public String generateEO(int indent) {
-        return "\"" + str + "\"";
+        return indent(indent) + "\"" + str + "\"";
     }
 }
diff --git a/src/main/java/lexer/Scanner.java b/src/main/java/lexer/Scanner.java
@@ -9,9 +9,9 @@
 public class Scanner implements JavaParser.Lexer
 {
     private static String sourcePath;
-    private static char[] sourceText;
+    private char[] sourceText;
 
-    public static boolean read(String path)
+    public boolean read(String path)
     {
         sourcePath = path;
         try {
@@ -28,12 +28,12 @@ public static boolean read(String path)
 
     // Machinery for reading bytes from the source ///////////////////////
 
-    private static int currentLine = 0;
-    private static int currentPos = 0;
-    private static int globalPos = -1;
-    private static char currentChar = '\0';
+    private int currentLine = 0;
+    private int currentPos = 0;
+    private int globalPos = -1;
+    private char currentChar = '\0';
 
-    private static char getChar()
+    private char getChar()
     {
         if ( currentChar == '\0' )
         {
@@ -44,7 +44,7 @@ private static char getChar()
         return currentChar;
     }
 
-    private static void forgetChar()
+    private void forgetChar()
     {
         currentChar = '\0';
     }
@@ -77,18 +77,18 @@ public void yyerror(String msg) {
 
     // Detecting the current token //////////////////////////////
 
-    private static Token currentToken;
-    public static Token get()
+    private Token currentToken;
+    public Token get()
     {
         if ( currentToken == null ) currentToken = getToken();
         return currentToken;
     }
-    public static void forget()
+    public void forget()
     {
         currentToken = null;
     }
 
-    private static Token getToken()
+    private Token getToken()
     {
         char ch;
         TokenCode code;
@@ -330,17 +330,17 @@ else if ( Character.isDigit(ch) )
         return token;
     }
 
-    private static String scanShortComment()
+    private String scanShortComment()
     {
         return "";
     }
 
-    private static String scanLongComment()
+    private String scanLongComment()
     {
         return "";
     }
 
-    private static TokenCode detectKeyword(String identifier)
+    private TokenCode detectKeyword(String identifier)
     {
         switch ( identifier ) {
             case "abstract" : return TokenCode.Abstract;

diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java
@@ -47,14 +47,14 @@ public static void main(String[] args) throws FileNotFoundException {
 
 
         // Read, parse, map and print file
-        Scanner.read(inputFilepath);
         Scanner    scanner = new Scanner();
+        scanner.read(inputFilepath);
         JavaParser parser  = new JavaParser(scanner);
         try {
             boolean result = parser.parse();
             System.out.println(result ? "SUCCESS" : "FAIL");
             if (parser.ast != null) {
-                parser.ast.report(0);
+                //parser.ast.report(0);
                 var eoProgram  = Translator.translate(parser.ast);
                 var targetText = eoProgram.generateEO(0);