Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Switch evaluator for evalCtxt

  • Loading branch information...
commit 0a21a34fb95a1a7c20e6f9a537aa2ee0f87ab8ac 1 parent 5b4553c
Edwin Brady authored

Showing 2 changed files with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 1  Ivor/PatternDefs.lhs
  2. +2 1  Ivor/TT.lhs
3  Ivor/PatternDefs.lhs
@@ -351,7 +351,8 @@ fails, reporting which case isn't matched, if patterns don't cover.
351 351 > matches' (P x) (P y) | x == y = return [(y, P x)]
352 352 > matches' t (P n) = return [(n,t)]
353 353 > matches' (P nm@(MN ("INFER",_))) t = return []
354   -> matches' x y = if x == y then return [] else fail "With pattern does not match parent"
  354 +> matches' (Bind _ _ _) (Bind _ _ _) = return []
  355 +> matches' x y = if x == y then return [] else fail $ "With pattern does not match parent"
355 356
356 357
357 358 > expandClause :: Gamma Name -> RawScheme -> IvorM [RawScheme]
3  Ivor/TT.lhs
@@ -95,6 +95,7 @@
95 95 > import Ivor.Scopecheck
96 96 > import Ivor.Gadgets
97 97 > import Ivor.Nobby
  98 +> import Ivor.Evaluator
98 99 > import Ivor.SC
99 100 > import Ivor.Bytecode
100 101 > import Ivor.Datatype
@@ -763,7 +764,7 @@ Give a parseable but ugly representation of a term.
763 764 > DefaultGoal -> head (holequeue st)
764 765 > case (Tactics.findhole (defs st) (Just h) prf holeenv) of
765 766 > (Just env) -> do (tm, ty) <- tt $ Ivor.Typecheck.check (defs st) env rawtm Nothing
766   -> let tnorm = normaliseEnv env (defs st) tm
  767 +> let tnorm = eval_nf_env env (defs st) tm
767 768 > return $ Term (tnorm, ty)
768 769 > Nothing -> fail "No such goal"
769 770 > where holeenv :: Gamma Name -> Env Name -> Indexed Name -> Env Name

0 comments on commit 0a21a34

Please sign in to comment.
Something went wrong with that request. Please try again.