majestic: fix bubblin 8000 g + type annotations for option metadata #180
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I looked at the conflict. The problem is in the bubble function. I like that you made a function, but your implementation seems to always propagate the variants to the top level. It is essential that in bubble variants are propagated upwards only if variants with the same choice id appear in more than one place. This happens in addVariants but you seem to miss that. |
|
Rebased onto current diff --git a/src/compiler/api/GF/Compile/Repl.hs b/src/compiler/api/GF/Compile/Repl.hs
index 066ee1dc1..36a169904 100644
--- a/src/compiler/api/GF/Compile/Repl.hs
+++ b/src/compiler/api/GF/Compile/Repl.hs
@@ -59,6 +59,8 @@ import GF.Infra.Option (noOptions)
import GF.Infra.UseIO (justModuleName)
import GF.Text.Pretty (render)
+import Debug.Trace
+
data ReplOpts = ReplOpts
{ lang :: Lang
, noPrelude :: Bool
@@ -275,7 +277,16 @@ runRepl' opts@ReplOpts { lang, evalToFlat } gl@(Gl g _) = do
doEval st t opts = inferLType gl t >>= \case
[] -> fail $ "No result while checking type: " ++ render (ppTerm Unqualified 0 t)
- ((t', _):_) -> runEvalMWithOpts gl opts (value2termM evalToFlat [] (eval gl [] unit t' []))
+ ((t', _):_) -> runEvalMWithOpts gl opts $ do
+ let v = eval gl [] unit t' []
+ traceM $ ("EVAL\n" ++) $ render $ ppValue Unqualified 0 v
+
+ let v' = bubble v
+ traceM $ ("BUBBLE\n" ++) $ render $ ppValue Unqualified 0 v'
+
+ tv <- value2termM evalToFlat [] v'
+ traceM $ ("VALUE2TERM\n" ++) $ render $ ppTerm Unqualified 0 tv
+ return tv
outputResults rs =
forM_ (zip [1..] rs) $ \(i, ResultState r _ opts _) ->$ gfci --lang=nlg --no-flat |
09e98ed
into
GrammaticalFramework:majestic
1 of 17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.