Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow more letters in identifiers #333

Merged
merged 4 commits into from
Nov 17, 2024
Merged

allow more letters in identifiers #333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d64bad2
allow more letters in identifiers
fblanqui Nov 6, 2024
47784aa
wip
fblanqui Nov 8, 2024
cb7bc1d
wip
fblanqui Nov 8, 2024
8375301
wip
fblanqui Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@fblanqui
fblanqui committed Nov 8, 2024
commit 47784aaa4c002deda75f9c02f67ca73bb9e159bf
2 changes: 1 addition & 1 deletion libraries/theories/ott.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ coh : A : type -> B : type -> Q : Proof (EQ A B) -> a : term A ->
b1 a1 (a0 a1 Qa) (Qb a1 (a0 a1 Qa) (H a1 Qa)) (x (a0 a1 Qa)))
(fst (proof (EQ A1 A0))
(__ : Proof (EQ A1 A0) =>
proof (all A1 (x1 : term A1=> all A0 (x0 : term A0 =>
proof (all A1 (x1 : term A1 => all A0 (x0 : term A0 =>
imp (eq A1 x1 A0 x0) (EQ (B0 x0) (B1 x1))))))
Q)
(a1 : term A1 => Q : Proof (EQ A1 A0) => coe A1 A0 Q a1)
Expand Down
2 changes: 1 addition & 1 deletion parsing/lexer.mll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}

let space = [' ' '\t' '\r']
let letter = ['a'-'z' 'A'-'Z' '0'-'9' '_' '!' '?' '\'' '+' '*' '~' '&' '^' '@' '=' '$' '%' '/']
let letter = ['a'-'z' 'A'-'Z' '0'-'9' '_' '!' '?' '\'' '+' '*' '~' '&' '^' '@' '=' '$' '%' '/' '<']
let mident = ['a'-'z' 'A'-'Z' '0'-'9' '_']+
let ident = letter+

Expand Down
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must* or *may* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (b x a)) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t y ) --> A.
def d : X:(A -> A->A) -> Y:(A -> A) -> (x:A->y:A-> T (b x a)) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t y ) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ def b : A -> A -> A.
See SR_sat.dk for examples of satisfiable constraints.
;)

def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (b x a)) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c a (c a y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (b x a)) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c a (c a y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_a1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must* or *may* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x y)) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (b x x)) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x y)) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (b x x)) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_a2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must* or *may* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x y)) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c x (Y x))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x y)) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c x (Y x))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_a2_2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must* or *may* contain y ;)
def a2 : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c (c (c a x) a) (c a y))) -> Type.
[X,Y] a2 (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y x) (Y y))) --> A.
def a2 : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c (c (c a x) a) (c a y))) -> Type.
[X,Y] a2 (x => y => X x y) (y => Y y) (x => y => t (c (Y x) (Y y))) --> A.
(; From the following constraints:
Y x = c (c a x) a
Y y = c a y
Expand Down
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_b1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must*, *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c y x)) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c y x)) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_b2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must*, *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y y) y)) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (Y y) y)) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_b3.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *must*, *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y y) (b y y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x (X (c y y) a))) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (Y y) (b y y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_c1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x (b x x))) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y x) (c x y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x (b x x))) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (Y x) (c x y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_c2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must* or *may* contain x
and *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (c x (b x x))) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y y) (b x y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (c x (b x x))) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (Y y) (b x y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_e1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must*, *may* or *may not* contain x
and *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (b x a )) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (Y x) (c a y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (b x a )) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (Y x) (c a y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_e2.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ def b : A -> A -> A.
are convertible with
terms that *must*, *may* or *may not* contain x
and *may* or *may not* contain y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (b x a )) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c y (c a y))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (b x a )) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c y (c a y))) --> A.
4 changes: 2 additions & 2 deletions tests/KO/SR_unsat_f1.dk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ def b : A -> A -> A.
(; Terms that *may not* contain x or y
are convertible with
terms that *may* or *may not* contain x or y ;)
def d : X:(A->A->A) -> Y:(A->A) -> (x:A->y:A-> T (b a a)) -> Type.
[X,Y] d (x=>y=>X x y) (y=>Y y) ( x => y => t (c (c a y) (b a a))) --> A.
def d : X:(A -> A -> A) -> Y:(A -> A) -> (x:A -> y:A -> T (b a a)) -> Type.
[X,Y] d (x => y => X x y) (y => Y y) (x => y => t (c (c a y) (b a a))) --> A.
Loading