Skip to content

Commit 3a9dee3

Browse files
tomijagatomijaga
authored
Merge pull request #36 from NatLabs/submodules
Submodules
2 parents a514cf0 + 03b97a2 commit 3a9dee3

File tree

39 files changed

+1504
-94
lines changed

39 files changed

+1504
-94
lines changed

‎mops.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "serde"
3-
version = "3.3.0"
3+
version = "3.3.1"
44
description = "A serialisation and deserialisation library for Motoko."
55
repository = "https://github.com/NatLabs/serde"
66
keywords = ["json", "candid", "cbor", "urlencoded", "serialization"]
@@ -11,13 +11,12 @@ base = "0.14.14"
1111
itertools = "0.2.2"
1212
candid = "1.1.1"
1313
xtended-numbers = "0.4.0"
14-
json-float = "https://github.com/NatLabs/json.mo#float@f3c8e7d418a7a8f2d6c0d7e2d276a0a82c2046ff"
15-
parser-combinators = "https://github.com/aviate-labs/parser-combinators.mo#v0.1.2@6a331bf78e9dcd7623977f06c8e561fd1a8c0103"
1614
cbor = "2.0.0"
1715
map = "9.0.1"
18-
sha2 = "0.1.4"
16+
sha2 = "0.1.6"
1917
fuzz = "1.0.0"
2018
byte-utils = "0.0.1"
19+
"base@0.7.3" = "0.7.3"
2120

2221
[dev-dependencies]
2322
test = "2.1.1"

‎src/Candid/Text/Parser/Array.mo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import List "mo:base/List";
22

3-
import C "mo:parser-combinators/Combinators";
4-
import P "mo:parser-combinators/Parser";
3+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
4+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
55

66
import Candid "../../Types";
77

@@ -17,7 +17,7 @@ module {
1717
C.map(
1818
C.right(
1919
ignoreSpace(
20-
C.String.string("vec"),
20+
C.String.string("vec")
2121
),
2222
ignoreSpace(
2323
C.bracket(
@@ -26,16 +26,16 @@ module {
2626
C.sepBy(
2727
P.delay(valueParser),
2828
ignoreSpace(C.Character.char(';')),
29-
),
29+
)
3030
),
3131
C.oneOf([
3232
C.right(
3333
ignoreSpace(C.Character.char(';')),
3434
ignoreSpace(C.String.string("}")),
3535
),
3636
ignoreSpace(C.String.string("}")),
37-
])
38-
),
37+
]),
38+
)
3939
),
4040
),
4141
func(list : List<Candid>) : Candid {

‎src/Candid/Text/Parser/Blob.mo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import Blob "mo:base/Blob";
22
import Iter "mo:base/Iter";
33
import List "mo:base/List";
44

5-
import C "mo:parser-combinators/Combinators";
6-
import P "mo:parser-combinators/Parser";
5+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
6+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
77

88
import Candid "../../Types";
99
import { ignoreSpace; hexChar; fromHex } "Common";
@@ -37,7 +37,7 @@ module {
3737
C.String.string(""), // escapes char: '\'
3838
),
3939
C.String.string("\""),
40-
),
40+
)
4141
),
4242
),
4343
func(chars : List<Nat8>) : Candid {

‎src/Candid/Text/Parser/Bool.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import List "mo:base/List";
22

3-
import C "mo:parser-combinators/Combinators";
4-
import P "mo:parser-combinators/Parser";
3+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
4+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
55

66
import Candid "../../Types";
7-
import { ignoreSpace; } "Common";
7+
import { ignoreSpace } "Common";
88

99
module {
1010
type Candid = Candid.Candid;
@@ -22,7 +22,7 @@ module {
2222
C.oneOf([
2323
C.String.string("true"),
2424
C.String.string("false"),
25-
]),
25+
])
2626
),
2727
func(t : Text) : Bool {
2828
switch (t) {

‎src/Candid/Text/Parser/Common.mo

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import List "mo:base/List";
44
import Nat32 "mo:base/Nat32";
55
import Text "mo:base/Text";
66

7-
import C "mo:parser-combinators/Combinators";
8-
import P "mo:parser-combinators/Parser";
7+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
8+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
99
import NatX "mo:xtended-numbers/NatX";
1010

1111
import Candid "../../Types";
@@ -31,7 +31,7 @@ module {
3131
C.sepBy1<Char, List<A>, Char>(
3232
C.many1(parser),
3333
C.Character.char('_'),
34-
),
34+
)
3535
),
3636
func(nested_lists : List<List<A>>) : List<A> {
3737
List.flatten(nested_lists);
@@ -41,15 +41,15 @@ module {
4141

4242
public func any<T>() : Parser<T, T> {
4343
C.sat<T>(
44-
func(c : T) : Bool { true },
44+
func(c : T) : Bool { true }
4545
);
4646
};
4747

4848
public func hexChar() : Parser<Char, Char> {
4949
C.sat(
5050
func(x : Char) : Bool {
5151
'0' <= x and x <= '9' or 'a' <= x and x <= 'f' or 'A' <= x and x <= 'F';
52-
},
52+
}
5353
);
5454
};
5555

@@ -109,11 +109,11 @@ module {
109109
0,
110110
func(n : Nat, c : Char) : Nat {
111111
let digit = Nat32.toNat(
112-
Char.toNat32(c) - Char.toNat32('0'),
112+
Char.toNat32(c) - Char.toNat32('0')
113113
);
114114

115115
(10 * n) + digit;
116116
},
117117
);
118118
};
119-
};
119+
};

‎src/Candid/Text/Parser/Float.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import Float "mo:base/Float";
22
import List "mo:base/List";
33

4-
import C "mo:parser-combinators/Combinators";
5-
import P "mo:parser-combinators/Parser";
4+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
5+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
66

77
import Candid "../../Types";
88

99
import { listToNat } "Common";
1010
import { parseInt } "Int";
1111

12-
module{
12+
module {
1313
type Candid = Candid.Candid;
1414
type List<A> = List.List<A>;
1515

@@ -51,4 +51,4 @@ module{
5151
),
5252
);
5353
};
54-
}
54+
};

‎src/Candid/Text/Parser/Int.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Int "mo:base/Int";
22
import List "mo:base/List";
33

4-
import C "mo:parser-combinators/Combinators";
5-
import P "mo:parser-combinators/Parser";
4+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
5+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
66

77
import Candid "../../Types";
88

‎src/Candid/Text/Parser/IntX.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import Int16 "mo:base/Int16";
55
import Int32 "mo:base/Int32";
66
import Int64 "mo:base/Int64";
77

8-
import C "mo:parser-combinators/Combinators";
9-
import P "mo:parser-combinators/Parser";
8+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
9+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
1010

1111
import Candid "../../Types";
1212
import { ignoreSpace } "Common";
@@ -37,11 +37,11 @@ module {
3737
func parseIntX() : Parser<Char, (Int, Text)> {
3838
C.seq(
3939
ignoreSpace(
40-
parseInt(),
40+
parseInt()
4141
),
4242
C.right(
4343
ignoreSpace(
44-
C.Character.char(':'),
44+
C.Character.char(':')
4545
),
4646
ignoreSpace(
4747
C.oneOf([
@@ -50,7 +50,7 @@ module {
5050
C.String.string("int16"),
5151
C.String.string("int8"),
5252
C.String.string("int"),
53-
]),
53+
])
5454
),
5555
),
5656
);

‎src/Candid/Text/Parser/Nat.mo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import Iter "mo:base/Iter";
22
import List "mo:base/List";
33
import Nat64 "mo:base/Nat64";
44

5-
import C "mo:parser-combinators/Combinators";
6-
import P "mo:parser-combinators/Parser";
5+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
6+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
77
import NatX "mo:xtended-numbers/NatX";
88

99
import Candid "../../Types";
@@ -35,7 +35,7 @@ module {
3535
func parseNatWithUnderscore() : Parser<Char, Nat> {
3636
C.map(
3737
ignoreSpace(
38-
removeUnderscore(C.Character.digit()),
38+
removeUnderscore(C.Character.digit())
3939
),
4040
listToNat,
4141
);

‎src/Candid/Text/Parser/NatX.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import Nat16 "mo:base/Nat16";
55
import Nat32 "mo:base/Nat32";
66
import Nat64 "mo:base/Nat64";
77

8-
import C "mo:parser-combinators/Combinators";
9-
import P "mo:parser-combinators/Parser";
8+
import C "../../../../submodules/parser-combinators.mo/src/Combinators";
9+
import P "../../../../submodules/parser-combinators.mo/src/Parser";
1010

1111
import Candid "../../Types";
1212
import { ignoreSpace } "Common";
@@ -48,11 +48,11 @@ module {
4848
C.String.string("nat16"),
4949
C.String.string("nat8"),
5050
C.String.string("nat"),
51-
]),
51+
])
5252
),
53-
),
53+
)
5454
),
55-
),
55+
)
5656
);
5757
};
5858
};

0 commit comments

Comments
 (0)