Skip to content

Commit 264a5f7

Browse files
committed
refactor: restructure UnicodeData dir
1 parent 4ed1e4b commit 264a5f7

66 files changed

Lines changed: 374 additions & 305025 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

UnicodeBasic.lean

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
44
-/
55
module
66
public import UnicodeBasic.Types
7-
import UnicodeData.BidiBrackets
8-
import UnicodeData.BidiMirroring
9-
import UnicodeData.Blocks
10-
import UnicodeData.EastAsianWidth
11-
import UnicodeData.VerticalOrientation
7+
import UnicodeData.Core.BidiBrackets
8+
import UnicodeData.Core.BidiMirroring
9+
import UnicodeData.Core.Blocks
10+
import UnicodeData.Extracted.DerivedEastAsianWidth
11+
import UnicodeData.Core.VerticalOrientation
1212
public import UnicodeBasic.TableLookup
1313

1414
/-!

UnicodeBasic/TableLookup.lean

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import UnicodeBasic.CharacterDatabase
77
import UnicodeBasic.Hangul
88
public import UnicodeBasic.Types
99
public import UnicodeData.Basic
10-
public import UnicodeData.DerivedName
11-
import UnicodeData.DerivedBidiClass
12-
import UnicodeData.DerivedCombiningClass
13-
import UnicodeData.DerivedBinaryProperties
14-
public import UnicodeData.DerivedGeneralCategory
15-
import UnicodeData.DerivedLineBreak
16-
public import UnicodeData.DerivedNumericType
17-
public import UnicodeData.DerivedNumericValues
10+
public import UnicodeData.Extracted.DerivedName
11+
import UnicodeData.Extracted.DerivedBidiClass
12+
import UnicodeData.Extracted.DerivedCombiningClass
13+
import UnicodeData.Extracted.DerivedBinaryProperties
14+
public import UnicodeData.Extracted.DerivedGeneralCategory
15+
import UnicodeData.Extracted.DerivedLineBreak
16+
public import UnicodeData.Extracted.DerivedNumericType
17+
public import UnicodeData.Extracted.DerivedNumericValues
1818

1919
namespace Unicode
2020

UnicodeData.lean

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,60 @@ Released under Apache 2.0 license as described in the file LICENSE.
44
-/
55

66
module
7-
public import UnicodeData.Aliases
87
public import UnicodeData.Basic
98
public import UnicodeData.UcdParse
10-
public import UnicodeData.ArabicShaping
11-
public import UnicodeData.CJKRadicals
12-
public import UnicodeData.CompositionExclusions
13-
public import UnicodeData.DerivedBidiClass
14-
public import UnicodeData.DerivedCombiningClass
15-
public import UnicodeData.DerivedBinaryProperties
16-
public import UnicodeData.DerivedGeneralCategory
17-
public import UnicodeData.DerivedLineBreak
18-
public import UnicodeData.DerivedAge
19-
public import UnicodeData.DerivedDecompositionType
20-
public import UnicodeData.DerivedJoiningGroup
21-
public import UnicodeData.DerivedJoiningType
22-
public import UnicodeData.DerivedName
23-
public import UnicodeData.DerivedNormalizationProps
24-
public import UnicodeData.DerivedNumericType
25-
public import UnicodeData.DerivedNumericValues
26-
public import UnicodeData.EmojiSources
27-
public import UnicodeData.EquivalentUnifiedIdeograph
28-
public import UnicodeData.EmojiVariationSequences
29-
public import UnicodeData.HangulSyllableType
30-
public import UnicodeData.IndicPositionalCategory
31-
public import UnicodeData.IndicSyllabicCategory
32-
public import UnicodeData.Jamo
33-
public import UnicodeData.NameAliases
34-
-- public import UnicodeData.NamesList
35-
-- public import UnicodeData.DoNotEmit
36-
public import UnicodeData.NamedSequences
37-
public import UnicodeData.NamedSequencesProv
38-
public import UnicodeData.NormalizationCorrections
39-
public import UnicodeData.SpecialCasing
40-
public import UnicodeData.StandardizedVariants
41-
public import UnicodeData.TangutSources
42-
public import UnicodeData.NushuSources
43-
public import UnicodeData.Unikemet
44-
public import UnicodeData.USourceData
45-
public import UnicodeData.UnihanDictionaryIndices
46-
public import UnicodeData.UnihanDictionaryLikeData
47-
public import UnicodeData.UnihanIRGSources
48-
public import UnicodeData.UnihanNumericValues
49-
public import UnicodeData.UnihanOtherMappings
50-
public import UnicodeData.UnihanRadicalStrokeCounts
51-
public import UnicodeData.UnihanReadings
52-
public import UnicodeData.UnihanVariants
53-
public import UnicodeData.BidiBrackets
54-
public import UnicodeData.BidiMirroring
55-
public import UnicodeData.Blocks
56-
public import UnicodeData.EastAsianWidth
57-
public import UnicodeData.PropList
58-
public import UnicodeData.VerticalOrientation
59-
public import UnicodeData.Scripts
60-
public import UnicodeData.ScriptExtensions
61-
public import UnicodeData.DerivedCoreProperties
62-
public import UnicodeData.CaseFolding
63-
public import UnicodeData.BreakProperties
64-
public import UnicodeData.Emoji
9+
public import UnicodeData.Auxiliary.BreakProperties
10+
public import UnicodeData.Core.ArabicShaping
11+
public import UnicodeData.Core.BidiBrackets
12+
public import UnicodeData.Core.BidiMirroring
13+
public import UnicodeData.Core.Blocks
14+
public import UnicodeData.Core.CJKRadicals
15+
public import UnicodeData.Core.CaseFolding
16+
public import UnicodeData.Core.CompositionExclusions
17+
public import UnicodeData.Core.DerivedAge
18+
public import UnicodeData.Core.DerivedCoreProperties
19+
public import UnicodeData.Core.DerivedNormalizationProps
20+
public import UnicodeData.Core.EmojiSources
21+
public import UnicodeData.Core.EquivalentUnifiedIdeograph
22+
public import UnicodeData.Core.HangulSyllableType
23+
public import UnicodeData.Core.IndicPositionalCategory
24+
public import UnicodeData.Core.IndicSyllabicCategory
25+
public import UnicodeData.Core.Jamo
26+
public import UnicodeData.Core.NameAliases
27+
public import UnicodeData.Core.NamedSequences
28+
public import UnicodeData.Core.NamedSequencesProv
29+
public import UnicodeData.Core.NormalizationCorrections
30+
public import UnicodeData.Core.NushuSources
31+
public import UnicodeData.Core.PropertyAliases
32+
public import UnicodeData.Core.PropertyValueAliases
33+
public import UnicodeData.Core.PropList
34+
public import UnicodeData.Core.ScriptExtensions
35+
public import UnicodeData.Core.Scripts
36+
public import UnicodeData.Core.SpecialCasing
37+
public import UnicodeData.Core.StandardizedVariants
38+
public import UnicodeData.Core.TangutSources
39+
public import UnicodeData.Core.USourceData
40+
public import UnicodeData.Core.Unikemet
41+
public import UnicodeData.Core.VerticalOrientation
42+
public import UnicodeData.Emoji.Emoji
43+
public import UnicodeData.Emoji.EmojiVariationSequences
44+
public import UnicodeData.Extracted.DerivedBidiClass
45+
public import UnicodeData.Extracted.DerivedBinaryProperties
46+
public import UnicodeData.Extracted.DerivedCombiningClass
47+
public import UnicodeData.Extracted.DerivedDecompositionType
48+
public import UnicodeData.Extracted.DerivedEastAsianWidth
49+
public import UnicodeData.Extracted.DerivedGeneralCategory
50+
public import UnicodeData.Extracted.DerivedJoiningGroup
51+
public import UnicodeData.Extracted.DerivedJoiningType
52+
public import UnicodeData.Extracted.DerivedLineBreak
53+
public import UnicodeData.Extracted.DerivedName
54+
public import UnicodeData.Extracted.DerivedNumericType
55+
public import UnicodeData.Extracted.DerivedNumericValues
56+
public import UnicodeData.Unihan.UnihanDictionaryIndices
57+
public import UnicodeData.Unihan.UnihanDictionaryLikeData
58+
public import UnicodeData.Unihan.UnihanIRGSources
59+
public import UnicodeData.Unihan.UnihanNumericValues
60+
public import UnicodeData.Unihan.UnihanOtherMappings
61+
public import UnicodeData.Unihan.UnihanRadicalStrokeCounts
62+
public import UnicodeData.Unihan.UnihanReadings
63+
public import UnicodeData.Unihan.UnihanVariants

UnicodeData/Aliases.lean

Lines changed: 0 additions & 125 deletions
This file was deleted.

UnicodeData/BreakProperties.lean renamed to UnicodeData/Auxiliary/BreakProperties.lean

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ public structure BreakProperty where
1717
deriving Inhabited, Repr
1818

1919
/-- Raw string from `GraphemeBreakProperty.txt` -/
20-
def GraphemeBreakProperty.txt := include_str "../data/ucd/auxiliary/GraphemeBreakProperty.txt"
20+
def GraphemeBreakProperty.txt := include_str "../../data/ucd/auxiliary/GraphemeBreakProperty.txt"
2121
/-- Raw string from `WordBreakProperty.txt` -/
22-
def WordBreakProperty.txt := include_str "../data/ucd/auxiliary/WordBreakProperty.txt"
22+
def WordBreakProperty.txt := include_str "../../data/ucd/auxiliary/WordBreakProperty.txt"
2323
/-- Raw string from `SentenceBreakProperty.txt` -/
24-
def SentenceBreakProperty.txt := include_str "../data/ucd/auxiliary/SentenceBreakProperty.txt"
24+
def SentenceBreakProperty.txt := include_str "../../data/ucd/auxiliary/SentenceBreakProperty.txt"
2525
/-- Raw string from `LineBreak.txt` -/
26-
def LineBreak.txt := include_str "../data/ucd/core/LineBreak.txt"
26+
def LineBreak.txt := include_str "../../data/ucd/core/LineBreak.txt"
2727

2828
public unsafe initialize BreakProperties.data : BreakProperty ← do
2929
let mut list : BreakProperty := {}

UnicodeData/Basic.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module
66
import UnicodeBasic.CharacterDatabase
77
import UnicodeBasic.Hangul
88
public import UnicodeBasic.Types
9-
import UnicodeData.DerivedNumericValues
9+
import UnicodeData.Extracted.DerivedNumericValues
1010

1111
namespace Unicode
1212

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import UnicodeData.UcdParse
99
namespace Unicode
1010

1111
/-- Raw string from `ArabicShaping.txt` -/
12-
def ArabicShaping.txt := include_str "../data/ucd/core/ArabicShaping.txt"
12+
def ArabicShaping.txt := include_str "../../data/ucd/core/ArabicShaping.txt"
1313

1414
/-- A raw Arabic shaping record. -/
1515
public structure ArabicShapingEntry where
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public structure BidiBracket where
1515
deriving Inhabited, Repr
1616

1717
/-- Raw string from `BidiBrackets.txt` -/
18-
def BidiBrackets.txt := include_str "../data/ucd/core/BidiBrackets.txt"
18+
def BidiBrackets.txt := include_str "../../data/ucd/core/BidiBrackets.txt"
1919

2020
private partial def find (c : UInt32) (t : USize → UInt32) (lo hi : USize) : USize :=
2121
let mid := (lo + hi) / 2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UnicodeBasic.CharacterDatabase
1010
namespace Unicode
1111

1212
/-- Raw string from `BidiMirroring.txt` -/
13-
def BidiMirroring.txt := include_str "../data/ucd/core/BidiMirroring.txt"
13+
def BidiMirroring.txt := include_str "../../data/ucd/core/BidiMirroring.txt"
1414

1515
/-- Parsed `BidiMirroring.txt` mappings. -/
1616
public def BidiMirroring.data : Std.HashMap UInt32 UInt32 := Id.run do
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import UnicodeBasic.CharacterDatabase
99
namespace Unicode
1010

1111
/-- Raw string from `Blocks.txt` -/
12-
def Blocks.txt := include_str "../data/ucd/core/Blocks.txt"
12+
def Blocks.txt := include_str "../../data/ucd/core/Blocks.txt"
1313

1414
private partial def find (c : UInt32) (t : USize → UInt32) (lo hi : USize) : USize :=
1515
let mid := (lo + hi) / 2

0 commit comments

Comments
 (0)