support toplevel value declarations for #37

jvasileff · Oct 16, 2016 · 02780ea · 02780ea
1 parent 9ee476d
commit 02780ea
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/ceylon-dart-compiler/source/com/vasileff/ceylon/dart/compiler/core/TopLevelVisitor.ceylon b/ceylon-dart-compiler/source/com/vasileff/ceylon/dart/compiler/core/TopLevelVisitor.ceylon
@@ -110,7 +110,8 @@ import com.vasileff.ceylon.dart.compiler.nodeinfo {
     objectDefinitionInfo,
     valueDefinitionInfo,
     valueGetterDefinitionInfo,
-    callableParameterInfo
+    callableParameterInfo,
+    valueDeclarationInfo
 }
 
 "For Dart TopLevel declarations."
@@ -132,7 +133,17 @@ class TopLevelVisitor(CompilationContext ctx)
             return;
         }
 
-        super.visitValueDeclaration(that);
+        value info = valueDeclarationInfo(that);
+
+        "toplevel ValueDeclarations are always late and never transient."
+        assert (!info.declarationModel.transient);
+
+        addAll {
+            DartTopLevelVariableDeclaration {
+                generateForValueDeclarationRaw(info, info.declarationModel);
+            },
+            *generateForwardingGetterSetter(that)
+        };
     }
 
     shared actual
@@ -1788,15 +1799,18 @@ class TopLevelVisitor(CompilationContext ctx)
         // toplevel interface aliases are not reified
     }
 
-    [DartFunctionDeclaration*] generateForwardingGetterSetter
-            (ValueDefinition | ValueGetterDefinition | ObjectDefinition that) {
+    [DartFunctionDeclaration*] generateForwardingGetterSetter(
+            ValueDeclaration | ValueDefinition | ValueGetterDefinition |
+                    ObjectDefinition that) {
 
         value info = nodeInfo(that);
 
         value declarationModel =
             switch (that)
             case (is ValueDefinition)
                 valueDefinitionInfo(that).declarationModel
+            case (is ValueDeclaration)
+                valueDeclarationInfo(that).declarationModel
             case (is ValueGetterDefinition)
                 valueGetterDefinitionInfo(that).declarationModel
             case (is ObjectDefinition)