Convert annotations provided by the new parser to IR (#3784)

Builds on top of #3780 and converts the new `Tree.Annotated` to IR. [ci no changelog needed]
enso-org · Oct 10, 2022 · 5386a8b · 5386a8b
1 parent b3dd778
commit 5386a8b
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 1 deletion.
diff --git a/engine/runtime/src/main/java/org/enso/compiler/TreeToIr.java b/engine/runtime/src/main/java/org/enso/compiler/TreeToIr.java
@@ -30,6 +30,7 @@
 import org.enso.compiler.core.IR$Module$Scope$Import$Module;
 import org.enso.compiler.core.IR$Module$Scope$Import$Polyglot;
 import org.enso.compiler.core.IR$Module$Scope$Import$Polyglot$Java;
+import org.enso.compiler.core.IR$Name$Annotation;
 import org.enso.compiler.core.IR$Name$Blank;
 import org.enso.compiler.core.IR$Name$Literal;
 import org.enso.compiler.core.IR$Name$MethodReference;
@@ -151,6 +152,12 @@ IR.Module translateModule(Tree module) {
               var t = translateComment(app);
               bindings = cons(t, bindings);
             }
+            case Tree.Annotated anno -> {
+              var n = new IR$Name$Annotation("@" + anno.getAnnotation().codeRepr(), getIdentifiedLocation(anno), meta(), diag());
+              bindings = cons(n, bindings);
+              var t = translateModuleSymbol(anno.getExpression());
+              bindings = cons(t, bindings);
+            }
             case null -> {
             }
             default -> {
@@ -404,7 +411,7 @@ case Left(reason) =>
     }
     */
       }
-      default -> new IR$Error$Syntax(inputAst, new IR$Error$Syntax$UnexpectedExpression$(), meta(), diag());
+    default -> new IR$Error$Syntax(inputAst, new IR$Error$Syntax$UnexpectedExpression$(), meta(), diag());
     };
   }
 
@@ -817,6 +824,10 @@ yield switch (ast) {
       case Tree.Wildcard wild -> {
         yield new IR$Name$Blank(getIdentifiedLocation(wild), meta(), diag());
       }
+      case Tree.Annotated anno -> {
+        var ir = new IR$Name$Annotation("@" + anno.getAnnotation().codeRepr(), getIdentifiedLocation(anno), meta(), diag());
+        yield translateAnnotation(ir, anno.getExpression(), nil());
+      }
       default -> throw new UnhandledEntity(tree, "translateExpression");
     };
     /*
@@ -947,6 +958,30 @@ yield switch (ast) {
     */
   }
 
+  private IR$Application$Prefix translateAnnotation(IR$Name$Annotation ir, Tree expr, List<IR.CallArgument> callArgs) {
+    boolean insideTypeSignature = false;
+    return switch (expr) {
+      case Tree.App fn -> {
+        var fnAsArg = translateCallArgument(fn.getArg(), insideTypeSignature);
+        yield translateAnnotation(ir, fn.getFunc(), cons(fnAsArg, callArgs));
+      }
+      case Tree.ArgumentBlockApplication fn -> {
+        var fnAsArg = translateCallArgument(fn.getLhs(), insideTypeSignature);
+        var arg = translateCallArgument(expr, insideTypeSignature);
+        callArgs = cons(fnAsArg, cons(arg, callArgs));
+        yield translateAnnotation(ir, null, callArgs);
+      }
+      case null -> {
+        yield new IR$Application$Prefix(ir, callArgs, false, ir.location(), meta(), diag());
+      }
+      default -> {
+        var arg = translateCallArgument(expr, insideTypeSignature);
+        callArgs = cons(arg, callArgs);
+        yield translateAnnotation(ir, null, callArgs);
+      }
+    };
+  }
+
   IR.Expression translateDecimalLiteral(Tree.Number ast) {
     return translateDecimalLiteral(ast, ast.getInteger(), ast.getFractionalDigits());
   }

diff --git a/engine/runtime/src/test/java/org/enso/compiler/EnsoCompilerTest.java b/engine/runtime/src/test/java/org/enso/compiler/EnsoCompilerTest.java
@@ -103,6 +103,51 @@ public void testComments() throws Exception {
     """);
   }
 
+  @Test
+  public void testAnnotation0() throws Exception {
+    parseTest("""
+    dont_stop = @Tail_Call dont_stop
+    """);
+  }
+
+  @Test
+  public void testAnnotation1() throws Exception {
+    parseTest("""
+    go t = @Tail_Call go t-1
+    """);
+  }
+
+  @Test
+  public void testAnnotation2() throws Exception {
+    parseTest("""
+    go t x = @Tail_Call go t-1 x
+    """);
+  }
+
+  @Test
+  public void testAnnotationBlock() throws Exception {
+    parseTest("""
+    go a b = @Tail_Call go
+        a
+        b
+    """);
+  }
+
+  @Test
+  public void testBuiltinTypeAnnotation() throws Exception {
+    parseTest("""
+    @Builtin_Type
+    type Date
+    """);
+  }
+
+  @Test
+  public void testBuiltinMethodAnnotation() throws Exception {
+    parseTest("""
+    normalize x = @Builtin_Method "File.normalize"
+    """);
+  }
+
   @Test
   @Ignore
   public void testMetadataRaw() throws Exception {