Commit Graph

339 Commits

Author SHA1 Message Date
rhiannon morris bb8d2464af add fst and snd 2023-09-18 21:53:38 +02:00
rhiannon morris e6c06a5c81 pass the subject quantity through equality etc
in preparation for non-linear η laws
2023-09-18 21:53:38 +02:00
rhiannon morris 3fe9b96f05 make function types with an empty domain subsingletons
this is useful for the base cases of W types when i try those again

closes #23
2023-09-17 20:10:51 +02:00
rhiannon morris 244b33d786 fix some comments 2023-09-17 19:11:20 +02:00
rhiannon morris b85dcb5402 η for box
fixes #27
2023-09-17 19:11:12 +02:00
rhiannon morris e1257560b7 Show for contexts, etc 2023-09-17 19:09:54 +02:00
rhiannon morris 4c88918ade stop throwing names away 2023-09-17 19:08:49 +02:00
rhiannon morris 8221d71416 some refactors 2023-09-17 14:41:20 +02:00
rhiannon morris 7b53d56072 a few basic fv tests to make sure it's not reversed or whatever 2023-09-16 13:34:11 +02:00
rhiannon morris fa14ce1a02 add FreeVars, and split only on used dvars in Equal 2023-09-12 09:56:49 +02:00
rhiannon morris 9973f8d07b refactor elim equality error stuff 2023-09-12 06:48:51 +02:00
rhiannon morris 1e8932690b untangle big mutual block in Equal 2023-08-28 22:07:57 +02:00
rhiannon morris d5d30ee198 loosen pushCoe's type slightly 2023-08-28 20:03:06 +02:00
rhiannon morris add2eb400c make Elim.compare0 able to pass a type to isSubSing
it now recovers from (most) errors and always returns a type, so that
isSubSing doesn't have to recalculate it

it already assumed the inputs had the same type. now it just leans on
that assumption harder
2023-08-28 20:00:54 +02:00
rhiannon morris 6f9d31aa0a add displacement to Definition 2023-08-28 19:59:36 +02:00
rhiannon morris 32f6e5a3b1 make displace total (with a few asserts) 2023-08-28 19:57:02 +02:00
rhiannon morris 72609bc12f Elim.compare0 infers the type
instead of calling computeElimType over and over. now there's just one
at the start
2023-08-27 19:05:25 +02:00
rhiannon morris 3e3bf1b67f factor out this `case !mode of {..}` stuff 2023-08-27 19:04:30 +02:00
rhiannon morris 2340b14407 partly improve coercions over constant lines
still needs a real quality check, or something, for stuff like
e : (x ≡ x : A) ⊢ coe (𝑖 ⇒ e @𝑖) x
2023-08-27 18:28:08 +02:00
rhiannon morris edfe30ff63 update compare0 for type-directed whnf 2023-08-26 21:32:15 +02:00
rhiannon morris ba77c45c64 always print the direction in coe/comp 2023-08-26 21:19:40 +02:00
rhiannon morris f3f74d581a fix Main 2023-08-26 21:07:10 +02:00
rhiannon morris 22db2724ce make coercion computation type-directed like it should be 2023-08-26 21:00:19 +02:00
rhiannon morris 0bcb8c24db make an optional Loc non-optional 2023-08-26 20:59:39 +02:00
rhiannon morris a221380d61 more effect stuff, incl. ST 2023-08-25 18:59:54 +02:00
rhiannon morris 4b6b3853a1 make uses of eff more consistent 2023-08-24 19:55:57 +02:00
rhiannon morris 8264a1bb81 split up whnf module 2023-08-24 18:42:26 +02:00
rhiannon morris a24ebe0702 tycasePi etc don't actually need a scope of (S d) 2023-08-24 17:45:37 +02:00
rhiannon morris 688204f1a4 make some things private 2023-08-24 17:45:20 +02:00
rhiannon morris 09e39d6224 add some comments 2023-08-24 17:45:12 +02:00
rhiannon morris 00d92d3f25 add missing parens in pretty printer 2023-08-12 10:25:07 +02:00
rhiannon morris 932469a91e make quantities optional and default to 1 2023-07-18 23:12:04 +02:00
rhiannon morris 349cf2f477 remove unused Tighten impl 2023-07-17 18:10:13 +02:00
rhiannon morris b6264f388d fix #11 the easy way
tightening just pushes substitutions all the way through. bleh
2023-07-17 03:50:16 +02:00
rhiannon morris 612fb33663 bump again 2023-07-13 21:28:39 +02:00
rhiannon morris fa09aaf228 squash warnings 2023-06-23 18:32:05 +02:00
rhiannon morris f0d3529f63 fix subtype stuff for Eq 2023-06-22 22:20:12 +02:00
rhiannon morris cd330c1092 remove a noLoc 2023-06-11 19:25:38 +02:00
rhiannon morris 865772d512 remove stale todos 2023-06-11 19:25:32 +02:00
rhiannon morris 00e79d4264 quote names in Show 2023-05-25 18:34:13 +02:00
rhiannon morris 3bbf0366c8 make 0 in ★₀ optional 2023-05-21 20:34:05 +02:00
rhiannon morris 282565c7a3 Whnf ⇒ CanWhnf; WhnfM ⇒ Eff Whnf 2023-05-21 20:34:05 +02:00
rhiannon morris 2af8ee20ea those were not meant to stay there 2023-05-21 20:34:05 +02:00
rhiannon morris 42aa07c9c8 crude but effective stratification 2023-05-21 20:34:05 +02:00
rhiannon morris e4a20cc632 remove redundancy in equality check 2023-05-20 21:38:23 +02:00
rhiannon morris 64de93a13c remove square brackets around type lines
(parens are needed if they are anything other than a `term arg`)
2023-05-16 18:14:42 +02:00
rhiannon morris d631b86be3 make p,q in coe/comp optional and default to @0 @1 2023-05-15 20:06:40 +02:00
rhiannon morris 7b93a913c7 rewrite pretty printer 2023-05-15 17:13:14 +02:00
rhiannon morris f6abf084b3 qty lub is total actually (usually ω) 2023-05-12 17:28:29 +02:00
rhiannon morris 8d6ae6cc32 move location to the start of type errors 2023-05-02 19:03:05 +02:00
rhiannon morris d5f4a012c5 add source locations to inner syntax 2023-05-02 03:06:25 +02:00
rhiannon morris 30fa93ab4e refactor core syntax slightly to derive Eq/Show
add a new `WithSubst tm env to` record that packages a `tm from`
with a `Subst env from to`, and write instances for just that. the
rest of the AST can be derived
2023-04-27 21:37:20 +02:00
rhiannon morris 7e079a9668 add file locations to Parser.Syntax
they're immediately thrown away currently. but one step at a time
2023-04-26 06:12:03 +02:00
rhiannon morris b5f42cde64 remove big mutual blocks in parser 2023-04-26 02:28:08 +02:00
rhiannon morris adebfe090c error message tweaks 2023-04-24 23:19:15 +02:00
rhiannon morris b74ffa0077 rewrite parser
previously it backtracked too much, so instead of giving a useful
parse error, it just said "expected end of input" at the beginning of
the problem toplevel. which, if it's a namespace, could be way off.
2023-04-24 22:25:04 +02:00
rhiannon morris a4ffd74625 fix the most embarrassing quantity mistake ever 2023-04-20 19:29:57 +02:00
rhiannon morris 3f06e8d68b allow multiple names in a binder
e.g. "(x y : ℕ) × plus x y ≡ 10 : ℕ"

fixes #2
2023-04-19 21:37:51 +02:00
rhiannon morris b666bc20cf do scope checking in FromParser where it belongs 2023-04-18 22:55:23 +02:00
rhiannon morris 55c0bf9974 fix skipping files 2023-04-18 00:10:53 +02:00
rhiannon morris 4578b30c79 namespaces work now 2023-04-18 00:10:53 +02:00
rhiannon morris 4db373a84f use constraints when checking δ
when checking δ 𝑖 ⇒ s, add 𝑖=ε to Ψ instead of checking s‹ε/𝑖›.
this has the same effect but an error message will show "𝑖, 𝑖=ε" in
the context
2023-04-17 22:02:40 +02:00
rhiannon morris ac85dc9352 don't put a ∷ℕ on nat literals that's silly 2023-04-17 22:02:40 +02:00
rhiannon morris 06b159973f pretty printing fixes 2023-04-17 21:45:05 +02:00
rhiannon morris 682965eebd 0∨1 is not undefined it's ω 2023-04-17 21:42:33 +02:00
rhiannon morris 6428d39ce1 semicolons between decls in namespaces 2023-04-17 21:41:00 +02:00
rhiannon morris 3fb8580f85 re-add tightening and use it when messing with scopes
e.g. "coe [_ ⇒ A] @p @q s" should immediately reduce to "s",
but if the "_ ⇒ A" happened to use an SY it didn't.

this will still happen if a wrong SY sneaks in but the alternative is
re-traversing the term over and over every time whnf runs
2023-04-17 20:56:31 +02:00
rhiannon morris a5ccf0215a coercions and compositions 2023-04-15 15:13:01 +02:00
rhiannon morris a42e82c355 type-case 2023-04-03 17:46:23 +02:00
rhiannon morris 1211272420 factor out some pretty printing stuff 2023-04-02 15:52:55 +02:00
rhiannon morris e1dbf272df rename EqualE to just Equal & add runEqual 2023-04-02 15:52:55 +02:00
rhiannon morris 38dbd275a1 add `case0` to syntax since that is possible sometimes 2023-04-02 15:52:55 +02:00
rhiannon morris ba2818a865 remove IsQty interface 2023-04-01 19:16:43 +02:00
rhiannon morris 924fd991f9 fix equality types 2023-04-01 16:02:02 +02:00
rhiannon morris 15f6f4c8a4 fix nat elim quantities 2023-04-01 16:01:53 +02:00
rhiannon morris 036e2bd4a5 fix case-box typing 2023-04-01 16:01:31 +02:00
rhiannon morris 1fce4d80f6 add box patterns to the parser oops 2023-04-01 15:59:16 +02:00
rhiannon morris a17752f31c fix up tests 2023-03-31 23:43:25 +02:00
rhiannon morris 5e220da2f4 a half-implemented verified dimeq 2023-03-31 19:34:24 +02:00
rhiannon morris 1ab0e42605 print a slightly better error if 'case' has no qty 2023-03-31 19:33:40 +02:00
rhiannon morris c8fbd73ea4 use names when pretty printing contexts 2023-03-31 19:30:55 +02:00
rhiannon morris ad942b2fd8 printing for most of FromParserError 2023-03-31 19:29:15 +02:00
rhiannon morris 2b2f79fca9 fix some typing mistakes 2023-03-31 19:26:55 +02:00
rhiannon morris 36609713ac mtl ⇒ eff 2023-03-31 19:26:24 +02:00
rhiannon morris 8a9b4c23dd box type 2023-03-31 19:26:24 +02:00
rhiannon morris 7d36a7ff54 allow matching at 0 where appropriate
(for pairs, and for enums with 0 or 1 constructors)
2023-03-27 00:08:09 +02:00
rhiannon morris 137962c176 add missing %default total 2023-03-27 00:07:39 +02:00
rhiannon morris 773f6372ea quantities in case don't need to be *exactly* the same
...as long as they are all compatible with the target.
for example, given ω.n : ℕ:
```
  case double_it? return ℕ of {
    'true  ⇒ plus n n;
    'false ⇒ n
  }
```
2023-03-27 00:01:32 +02:00
rhiannon morris f620dda639 fix error message 2023-03-26 16:15:30 +02:00
rhiannon morris 5df2a4538c more tests 2023-03-26 16:15:19 +02:00
rhiannon morris 5560cb6708 move 'enum' to Syntax.Base 2023-03-26 16:14:58 +02:00
rhiannon morris e6c4203b46 print ; between case branches 2023-03-26 16:13:36 +02:00
rhiannon morris 46e13c8ca2 don't print empty contexts in errors 2023-03-26 16:11:11 +02:00
rhiannon morris 84e1cc78cc use a SnocVect for subN 2023-03-26 16:09:47 +02:00
rhiannon morris 7e3a8e72bd clean up printing of contexts
- just π.x : A instead of π.(x : A)
- skip the " |" if the dctx is empty
2023-03-26 14:41:48 +02:00
rhiannon morris 78e48911d0 check that an enum case head has the right type
haha oops
2023-03-26 14:41:20 +02:00
rhiannon morris 9250789219 natural numbers 2023-03-26 14:40:54 +02:00
rhiannon morris fae534dae0 tweaks in equality checking 2023-03-26 14:38:37 +02:00
rhiannon morris 5053e9b234 remove inject stuff
injecting from m to (n+m) is just id ::: id ::: ... ::: shift n.
specifically, injecting from 0 is just the shift. so.
2023-03-25 22:44:30 +01:00
rhiannon morris 5945265867 some DimEq tests 2023-03-25 20:55:38 +01:00
rhiannon morris 75376619f9 move pretty stuff for DimEq 2023-03-25 20:54:31 +01:00
rhiannon morris ab73c474c3 add DimEq.wf and export some things to make it work 2023-03-25 20:51:10 +01:00
rhiannon morris 5a994ac0e2 derive Eq,Ord,Show for DimEq 2023-03-25 20:51:10 +01:00
rhiannon morris ab82883214 add weakD 2023-03-25 20:48:49 +01:00
rhiannon morris 100063ab91 add runPrettyWith, etc 2023-03-25 20:48:26 +01:00
rhiannon morris 443da20c4b print non-dependent function types as "π.A → B" 2023-03-18 23:33:18 +01:00
rhiannon morris 8f0f0c1891 "1.(x: A) → B" instead of "(1.x: A) → B"
also "1.A → B"
2023-03-18 23:27:27 +01:00
rhiannon morris ebf6aefb1d parser tweaks
qtys and dims don't allow useless parens any more. everything else
should be the same
2023-03-18 20:03:01 +01:00
rhiannon morris ea24d00544 print non-dependent products (easy mode)
only if the AST uses SN, like with Eq
2023-03-18 02:46:41 +01:00
rhiannon morris 958bc2f8b8 quote tags in printing if they're not identifiers 2023-03-18 02:45:43 +01:00
rhiannon morris f2272da4b4 replace '≔' and '·' with '=' and (only) '.' 2023-03-18 02:43:58 +01:00
rhiannon morris 8cf260ee2e reorder some imports 2023-03-17 21:50:04 +01:00
rhiannon morris f814b01c5c quote tags in printer when needed 2023-03-16 18:39:24 +01:00
rhiannon morris be94422668 move name lexing stuff to Quox.Name 2023-03-16 18:34:49 +01:00
rhiannon morris b9825fee55 ?????? 2023-03-16 18:20:33 +01:00
rhiannon morris f5fa63a6df some pretty printing tests 2023-03-16 18:19:17 +01:00
rhiannon morris 6dc7177be5 use NContext/SnocVect for scope name lists etc 2023-03-16 18:18:49 +01:00
rhiannon morris 32f38238ef pretty printing errors 2023-03-15 15:54:51 +01:00
rhiannon morris 54ba4e237f use snoclists in pretty printing
i think the names were in the wrong sometimes!!!
2023-03-15 15:53:39 +01:00
rhiannon morris c9b9f66693 rename 'prettyTerm' to 'prettyIO'
it meant pretty*Terminal*, but,
2023-03-15 15:42:28 +01:00
rhiannon morris 86d21caf24 put names into contexts, and contexts into errors 2023-03-14 16:04:41 +01:00
rhiannon morris f4af1a5a78 split up Quox.Typing 2023-03-13 21:41:57 +01:00
rhiannon morris ecd3be8bda "WhnfErr" ⇒ "WhnfError" 2023-03-13 19:39:29 +01:00
rhiannon morris 765c62866a more FromParser 2023-03-13 19:33:09 +01:00
rhiannon morris 90232dd1f8 rename some things to get rid of warnings 2023-03-13 19:32:52 +01:00
rhiannon morris 7f46537cbc "abstract" ⇒ "postulate"
abstracts still have a body, just not always visible. which i will deal
with Later
2023-03-13 19:31:05 +01:00
rhiannon morris 8e9b0abb34 Show Telescope 2023-03-13 18:25:07 +01:00
rhiannon morris c81aabcc14 more parser/FromParser stuff
- top level semicolons optional
- type optional [the def will need to be an elim]
- `load` statement
- namespaces
2023-03-12 18:28:37 +01:00
rhiannon morris d9bc68446f more fromparser stuff 2023-03-10 21:52:29 +01:00
rhiannon morris 426c138c2b clean up some old unused stuff 2023-03-08 22:33:52 +01:00
rhiannon morris 88985405ce change some single-character constructor names 2023-03-08 17:13:51 +01:00
rhiannon morris 47fca359f4 fix weird IsReserved issue 2023-03-06 12:04:43 +01:00
rhiannon morris 757ea89b0f add definitions to parser 2023-03-06 12:04:29 +01:00
rhiannon morris ab2508e0ce add fromPTerm, etc 2023-03-05 16:50:05 +01:00
rhiannon morris b7acf39c39 remove universe type 2023-03-05 16:48:29 +01:00
rhiannon morris 0cae84c75b add module Parser.Syntax with PTerm and toPTerm 2023-03-05 14:55:04 +01:00
rhiannon morris 02b94ab705 split check and checkType. UAny is kill 2023-03-05 13:14:25 +01:00
rhiannon morris 21da2d1d21 add - as an idCont char 2023-03-05 12:18:39 +01:00
rhiannon morris edeee68cb7 parser 2023-03-04 21:35:09 +01:00
rhiannon morris 95a6644a6c rename <&&>/<||> to andM/orM 2023-03-03 12:19:15 +01:00
rhiannon morris 841564f69f fix typo in comment 2023-03-02 19:56:22 +01:00
rhiannon morris 0a2d05818e fix fixities 2023-03-02 19:56:16 +01:00
rhiannon morris fc3c2dc8ab sop → elab-util 2023-03-02 19:52:32 +01:00
rhiannon morris dbe248be9a lexer 2023-02-28 20:51:54 +01:00
rhiannon morris cacb3225a2 unicode stuff 2023-02-27 07:27:27 +01:00
rhiannon morris 28356200c1 pretty printer refactoring 2023-02-26 14:54:18 +01:00
rhiannon morris 75ef078b4b don't print substitutions by default 2023-02-26 11:25:11 +01:00
rhiannon morris 8447098f28 look through substitutions in Q.S.T.Split 2023-02-26 11:24:28 +01:00
rhiannon morris e896b24f58 print ` before enum types 2023-02-26 11:23:43 +01:00
rhiannon morris eaf679edf7 print dimension app with an @ 2023-02-26 11:22:44 +01:00