Fix bugs in right hand side method call in IR translation, bug in TC

yangdanny97 · May 16, 2019 · 00af981 · 00af981
1 parent 20a20e5
commit 00af981
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/kc875/ast/visit/IRTranslationVisitor.java b/src/main/java/kc875/ast/visit/IRTranslationVisitor.java
@@ -975,7 +975,8 @@ public IRStmt visit(StmtDeclAssign node) {
         List<IRStmt> declsInitIR = new ArrayList<>();
         List<IRStmt> moveRetIR = new ArrayList<>();
 
-        if (node.getRhs() instanceof ExprFunctionCall) {
+        if (node.getRhs() instanceof ExprFunctionCall
+                || node.getRhs() instanceof ExprMethodCall) {
             for (int i = 0; i < decls.size(); ++i) {
                 TypeDecl di = decls.get(i);
                 // if di is an underscore, the _RETi is ignored, i.e., don't

diff --git a/src/main/java/kc875/ast/visit/TypeCheckVisitor.java b/src/main/java/kc875/ast/visit/TypeCheckVisitor.java
@@ -1020,23 +1020,31 @@ private void collectTauClass(ClassDefn c) {
                 ClassDecl decl = interfaceClasses.get(cName);
                 // Convert list of methods to a set since ordering doesn't
                 // matter for typechecking
-                // method name -> ([(param, paramtype), ...], output)
-                Map<String, Pair<List<Pair<String, TypeTTau>>, TypeT>> declMeths =
+                // method name -> ([paramtype, ...], output)
+                Map<String, Pair<List<TypeTTau>, TypeT>> declMeths =
                         decl.getMethodDecls().stream()
                                 .collect(Collectors.toMap(
                                         Func::getName,
                                         (Func f) -> new Pair<>(
-                                                f.getParams(), f.getOutput()
+                                                f.getParams().stream()
+                                                        .map(Pair::part2)
+                                                        .collect(Collectors.toList()),
+                                                f.getOutput()
                                         )
                                 ));
-                Map<String, Pair<List<Pair<String, TypeTTau>>, TypeT>> cMeths =
+                Map<String, Pair<List<TypeTTau>, TypeT>> cMeths =
                         c.getMethodDecls().stream()
                                 .collect(Collectors.toMap(
                                         Func::getName,
                                         (Func f) -> new Pair<>(
-                                                f.getParams(), f.getOutput()
+                                                f.getParams().stream()
+                                                        .map(Pair::part2)
+                                                        .collect(Collectors.toList()),
+                                                f.getOutput()
                                         )
                                 ));
+                System.out.println(declMeths);
+                System.out.println(cMeths);
                 if (!declMeths.equals(cMeths)) {
                     throw new SemanticError(
                             "Different methods in declaration and definition " +