From 9ffd3f87e5a7a3e13d100cf8aa60492f53f6def7 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 22 Jul 2019 11:51:06 -0400 Subject: [PATCH] Annotate the entire prelude, not just the composition with ann. --- semantic-core/src/Analysis/Eval.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semantic-core/src/Analysis/Eval.hs b/semantic-core/src/Analysis/Eval.hs index 100f6706d..188440e6a 100644 --- a/semantic-core/src/Analysis/Eval.hs +++ b/semantic-core/src/Analysis/Eval.hs @@ -132,7 +132,7 @@ prog6 = ] ruby :: File (Term Core User) -ruby = fromBody . ann . rec (named' __semantic_global) $ Core.record +ruby = fromBody $ ann (rec (named' __semantic_global) (Core.record [ ("Class", ann (Core.record [ (__semantic_super, pure __semantic_global ... "Object") , ("new", lam (named' "self") @@ -184,7 +184,7 @@ ruby = fromBody . ann . rec (named' __semantic_global) $ Core.record , ("false", pure __semantic_global ... "FalseClass" $$$ "new") , ("require", lam (named' "path") (Core.load (pure "path"))) - ] + ])) where self $$$ method = annWith callStack $ named' "_x" :<- self >>>= pure "_x" ... method $$ pure "_x" record ... field = annWith callStack $ record Core.... field