Merge pull request #26 from egorklementev/master

FEATURE: class decl. translation
polystat · Oct 25, 2021 · 448bf32 · 448bf32
2 parents abb8d4f + 3fc2695
commit 448bf32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/translator/Declarations.java b/src/main/java/translator/Declarations.java
@@ -2,14 +2,19 @@
 
 import eotree.EOBnd;
 import eotree.EOBndExpr;
+import tree.Declaration.ClassDeclaration;
 import tree.Declaration.Declaration;
 import tree.Declaration.MethodDeclaration;
+import tree.Declaration.NormalClassDeclaration;
 
 public class Declarations {
 
     public static EOBndExpr mapDeclaration(Declaration dec) {
         if (dec instanceof MethodDeclaration) {
             return Methods.mapMethodDeclaration((MethodDeclaration) dec);
+        }
+        else if (dec instanceof NormalClassDeclaration) {
+            return (EOBndExpr) Classes.mapClass((ClassDeclaration) dec);
         } else
             throw new IllegalArgumentException("Declaration of type " +
                                                dec.getClass().getSimpleName()

diff --git a/src/test/java/common/TestJ2EO.java b/src/test/java/common/TestJ2EO.java
@@ -138,7 +138,8 @@ private ArrayList<DynamicTest> testChapter(String chapterPath) {
 
     private static DynamicTest testFile(Path path) {
         return DynamicTest.dynamicTest(
-                path.getFileName().toString(), () -> {
+                path.getParent().getFileName().toString() + "/" +
+                        path.getFileName().toString(), () -> {
                     // Compile and execute Java file
                     String javaExecOutput = compileAndExecuteJava(path);