Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: toothbrush/apa-proj2
base: a35290b95e
...
head fork: toothbrush/apa-proj2
compare: feb4338a27
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 5 additions and 1 deletion.
  1. +1 −0  src/APA2/AG.ag
  2. +3 −0  src/APA2/AG/Infer.ag
  3. +1 −1  src/Components.hs
View
1  src/APA2/AG.ag
@@ -9,6 +9,7 @@ import Debug.Trace
import Data.Map (Map)
import qualified Data.Map as DM
import qualified Data.Map as Map
+import qualified Data.Map
import Data.MultiSet (MultiSet)
import qualified Data.MultiSet as DMS
import qualified Data.Set as DS
View
3  src/APA2/AG/Infer.ag
@@ -1,5 +1,6 @@
imports
{
+
}
ATTR MH
@@ -145,6 +146,8 @@ SEM MH
loc.substitution = @loc.theta `dot` @c2.substitution `dot` @c1.substitution `dot` @e.substitution
+ -- | Similar to the if the final annotation for this expression is subeffected by the
+ -- alternative bindings.
loc.constraints =
let cs = @e.constraints `DS.union` @c1.constraints `DS.union` @c2.constraints `DS.union`
(@loc.betaf' <:? @c1.annotation) `DS.union`
View
2  src/Components.hs
@@ -89,7 +89,7 @@ analysisResult tm =
solutionSubst :: Constraints -> SimpleSubstitution
solutionSubst cs =
- DM.foldWithKey (\var result next -> Dot (AnnSub var result) next) Identity (worklist cs)
+ DM.foldrWithKey (\var result next -> Dot (AnnSub var result) next) Identity (worklist cs)
printExpressions' :: (Show a1, Show a) => [(a1, a)] -> String
printExpressions' =

No commit comments for this range

Something went wrong with that request. Please try again.