Skip to content

Commit adee7b1

Browse files
committed
fix: makeTables
1 parent d97721f commit adee7b1

2 files changed

Lines changed: 53 additions & 52 deletions

File tree

UnicodeBasic/Types.lean

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -127,55 +127,55 @@ public instance : HasSubset GC where
127127

128128
public instance (x y : GC) : Decidable (x ⊆ y) := inferInstanceAs (Decidable (_ == _))
129129

130-
public protected def none : GC := (0x00000000 : UInt32)
131-
public protected def univ : GC := (0x3FFFFFFF : UInt32)
132-
133-
public protected def Lu : GC := (0x00000001 : UInt32)
134-
public protected def Ll : GC := (0x00000002 : UInt32)
135-
public protected def Lt : GC := (0x00000004 : UInt32)
136-
public protected def Lm : GC := (0x00000008 : UInt32)
137-
public protected def Lo : GC := (0x00000010 : UInt32)
138-
public protected def LC : GC := .Lu ||| .Ll ||| .Lt
139-
public protected def L : GC := .Lu ||| .Ll ||| .Lt ||| .Lm ||| .Lo
140-
141-
public protected def Mn : GC := (0x00000020 : UInt32)
142-
public protected def Mc : GC := (0x00000040 : UInt32)
143-
public protected def Me : GC := (0x00000080 : UInt32)
144-
public protected def M : GC := .Mn ||| .Mc ||| .Me
145-
146-
public protected def Nd : GC := (0x00000100 : UInt32)
147-
public protected def Nl : GC := (0x00000200 : UInt32)
148-
public protected def No : GC := (0x00000400 : UInt32)
149-
public protected def N : GC := .Nd ||| .Nl ||| .No
150-
151-
public protected def Pc : GC := (0x00000800 : UInt32)
152-
public protected def Pd : GC := (0x00001000 : UInt32)
153-
public protected def Ps : GC := (0x00002000 : UInt32)
154-
public protected def Pe : GC := (0x00004000 : UInt32)
155-
public protected def Pi : GC := (0x00008000 : UInt32)
156-
public protected def Pf : GC := (0x00010000 : UInt32)
157-
public protected def Po : GC := (0x00020000 : UInt32)
158-
public protected def PG : GC := .Ps ||| .Pe
159-
public protected def PQ : GC := .Pi ||| .Pf
160-
public protected def P : GC := .Pc ||| .Pd ||| .Ps ||| .Pe ||| .Pi ||| .Pf ||| .Po
161-
162-
public protected def Sm : GC := (0x00040000 : UInt32)
163-
public protected def Sc : GC := (0x00080000 : UInt32)
164-
public protected def Sk : GC := (0x00100000 : UInt32)
165-
public protected def So : GC := (0x00200000 : UInt32)
166-
public protected def S : GC := .Sm ||| .Sc ||| .Sk ||| .So
167-
168-
public protected def Zs : GC := (0x00400000 : UInt32)
169-
public protected def Zl : GC := (0x00800000 : UInt32)
170-
public protected def Zp : GC := (0x01000000 : UInt32)
171-
public protected def Z : GC := .Zs ||| .Zl ||| .Zp
172-
173-
public protected def Cc : GC := (0x02000000 : UInt32)
174-
public protected def Cf : GC := (0x04000000 : UInt32)
175-
public protected def Cs : GC := (0x08000000 : UInt32)
176-
public protected def Co : GC := (0x10000000 : UInt32)
177-
public protected def Cn : GC := (0x20000000 : UInt32)
178-
public protected def C : GC := .Cc ||| .Cf ||| .Cs ||| .Co ||| .Cn
130+
public protected abbrev none : GC := (0x00000000 : UInt32)
131+
public protected abbrev univ : GC := (0x3FFFFFFF : UInt32)
132+
133+
public protected abbrev Lu : GC := (0x00000001 : UInt32)
134+
public protected abbrev Ll : GC := (0x00000002 : UInt32)
135+
public protected abbrev Lt : GC := (0x00000004 : UInt32)
136+
public protected abbrev Lm : GC := (0x00000008 : UInt32)
137+
public protected abbrev Lo : GC := (0x00000010 : UInt32)
138+
public protected abbrev LC : GC := .Lu ||| .Ll ||| .Lt
139+
public protected abbrev L : GC := .Lu ||| .Ll ||| .Lt ||| .Lm ||| .Lo
140+
141+
public protected abbrev Mn : GC := (0x00000020 : UInt32)
142+
public protected abbrev Mc : GC := (0x00000040 : UInt32)
143+
public protected abbrev Me : GC := (0x00000080 : UInt32)
144+
public protected abbrev M : GC := .Mn ||| .Mc ||| .Me
145+
146+
public protected abbrev Nd : GC := (0x00000100 : UInt32)
147+
public protected abbrev Nl : GC := (0x00000200 : UInt32)
148+
public protected abbrev No : GC := (0x00000400 : UInt32)
149+
public protected abbrev N : GC := .Nd ||| .Nl ||| .No
150+
151+
public protected abbrev Pc : GC := (0x00000800 : UInt32)
152+
public protected abbrev Pd : GC := (0x00001000 : UInt32)
153+
public protected abbrev Ps : GC := (0x00002000 : UInt32)
154+
public protected abbrev Pe : GC := (0x00004000 : UInt32)
155+
public protected abbrev Pi : GC := (0x00008000 : UInt32)
156+
public protected abbrev Pf : GC := (0x00010000 : UInt32)
157+
public protected abbrev Po : GC := (0x00020000 : UInt32)
158+
public protected abbrev PG : GC := .Ps ||| .Pe
159+
public protected abbrev PQ : GC := .Pi ||| .Pf
160+
public protected abbrev P : GC := .Pc ||| .Pd ||| .Ps ||| .Pe ||| .Pi ||| .Pf ||| .Po
161+
162+
public protected abbrev Sm : GC := (0x00040000 : UInt32)
163+
public protected abbrev Sc : GC := (0x00080000 : UInt32)
164+
public protected abbrev Sk : GC := (0x00100000 : UInt32)
165+
public protected abbrev So : GC := (0x00200000 : UInt32)
166+
public protected abbrev S : GC := .Sm ||| .Sc ||| .Sk ||| .So
167+
168+
public protected abbrev Zs : GC := (0x00400000 : UInt32)
169+
public protected abbrev Zl : GC := (0x00800000 : UInt32)
170+
public protected abbrev Zp : GC := (0x01000000 : UInt32)
171+
public protected abbrev Z : GC := .Zs ||| .Zl ||| .Zp
172+
173+
public protected abbrev Cc : GC := (0x02000000 : UInt32)
174+
public protected abbrev Cf : GC := (0x04000000 : UInt32)
175+
public protected abbrev Cs : GC := (0x08000000 : UInt32)
176+
public protected abbrev Co : GC := (0x10000000 : UInt32)
177+
public protected abbrev Cn : GC := (0x20000000 : UInt32)
178+
public protected abbrev C : GC := .Cc ||| .Cf ||| .Cs ||| .Co ||| .Cn
179179

180180
def reprAux (x : GC) (extra := false) : List String := Id.run do
181181
let mut c := #[]
@@ -440,7 +440,7 @@ public inductive CompatibilityTag
440440
| public compat
441441
deriving Inhabited, DecidableEq, Repr
442442

443-
instance : ToString CompatibilityTag where
443+
public instance : ToString CompatibilityTag where
444444
toString
445445
| .font => "<font>"
446446
| .noBreak => "<noBreak>"
@@ -632,7 +632,7 @@ public def BidiClass.ofAbbrev! (abbr : String.Slice) : BidiClass :=
632632
| some bc => bc
633633
| none => panic! "invalid bidi class abbreviation"
634634

635-
instance : Repr BidiClass where
635+
public instance : Repr BidiClass where
636636
reprPrec bc _ := s!"Unicode.BidiClass.{bc.toAbbrev}"
637637

638638
/-!

makeTables.lean

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
Copyright © 2024-2025 François G. Dorais. All rights reserved.
33
Released under Apache 2.0 license as described in the file LICENSE.
44
-/
5-
5+
module
66
import UnicodeData
7+
public import UnicodeBasic
78

89
open Unicode
910

0 commit comments

Comments
 (0)