git.iko.soy/urbit.org
on master help sign in
thru 4k
35b7e29Henry Ault
docs/system/hoon/library/src/4g/gate/rash.md+3−2
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2
2
3Parse or crash
3Parse or crash
4
4
5−Parse a cord with a given [`++rule`]() and crash if the [`++cord`]() isn't entirely
5+Parse a cord with a given `++rule` and crash if the `++cord` isn't entirely
6parsed.
6parsed.
7
7
8Accepts
8Accepts
@@ -20,7 +20,8 @@ The value of the parse result, or crash.
20Source
20Source
21------
21------
22
22
23− ++ rash |*([naf=@ sab=_rule] (scan (trip naf) sab)) ::
23+ ++ rash |*({naf/@ sab/rule} (scan (trip naf) sab)) ::
24+
24
25
25Examples
26Examples
26--------
27--------
docs/system/hoon/library/src/4g/gate/rush.md+4−3
@@ -8,9 +8,9 @@ entirely parsed.
8Accepts
8Accepts
9-------
9-------
10
10
11−`naf` is an [atom]().
11+`naf` is an atom.
12
12
13−`sab` is a [rule]().
13+`sab` is a rule.
14
14
15Produces
15Produces
16--------
16--------
@@ -20,7 +20,8 @@ The value of the parse result, or null.
20Source
20Source
21------
21------
22
22
23− ++ rush |*([naf=@ sab=_rule] (rust (trip naf) sab))
23+ ++ rush |*({naf/@ sab/rule} (rust (trip naf) sab))
24+
24
25
25Examples
26Examples
26--------
27--------
docs/system/hoon/library/src/4g/gate/rust.md+3−2
@@ -2,7 +2,7 @@
2
2
3Parse tape or null
3Parse tape or null
4
4
5−Parse a [`++tape`]() with a given [`++rule`]() and produce null if the `++tape` isn't
5+Parse a `++tape` with a given `++rule` and produce null if the `++tape` isn't
6entirely parsed.
6entirely parsed.
7
7
8Accepts
8Accepts
@@ -20,10 +20,11 @@ A `(unit ,@t)`
20Source
20Source
21------
21------
22
22
23− ++ rust |* [los=tape sab=_rule]
23+ ++ rust |* {los/tape sab/rule}
24 =+ vex=((full sab) [[1 1] los])
24 =+ vex=((full sab) [[1 1] los])
25 ?~(q.vex ~ [~ u=p.u.q.vex])
25 ?~(q.vex ~ [~ u=p.u.q.vex])
26
26
27+
27Examples
28Examples
28--------
29--------
29
30
docs/system/hoon/library/src/4g/gate/scan.md+4−4
@@ -2,15 +2,15 @@
2
2
3Parse tape or crash
3Parse tape or crash
4
4
5−Parse a [`++tape`]() with a given [`++rule`]() and crash if the `++tape` isn't entirely
5+Parse a `++tape` with a given `++rule` and crash if the `++tape` isn't entirely
6parsed.
6parsed.
7
7
8Accepts
8Accepts
9-------
9-------
10
10
11−`los` is a [tape]().
11+`los` is a tape.
12
12
13−`sab` is a [rule]().
13+`sab` is a rule.
14
14
15Produces
15Produces
16--------
16--------
@@ -20,7 +20,7 @@ Either a `++tape` or a crash.
20Source
20Source
21------
21------
22
22
23− ++ scan |* [los=tape sab=_rule]
23+ ++ scan |* {los/tape sab/rule}
24 =+ vex=((full sab) [[1 1] los])
24 =+ vex=((full sab) [[1 1] los])
25 ?~ q.vex
25 ?~ q.vex
26 ~_ (show [%m '{%d %d}'] p.p.vex q.p.vex ~)
26 ~_ (show [%m '{%d %d}'] p.p.vex q.p.vex ~)
docs/system/hoon/library/src/4j/core/ab.md+53−53
@@ -22,7 +22,7 @@ Examples
22
22
23Parse hex pair
23Parse hex pair
24
24
25−Parsing [`++rule`](). Parses a pair of base-16 digits. Used in escapes.
25+Parsing `++rule`. Parses a pair of base-16 digits. Used in escapes.
26
26
27Accepts
27Accepts
28-------
28-------
@@ -55,7 +55,7 @@ Examples
55
55
56Parse phonetic pair
56Parse phonetic pair
57
57
58−Parsing [`++rule`](). Parses an atom of [odor]() [`@pE`](), a phrase of two bytes
58+Parsing `++rule`. Parses an atom of odor `@pE`, a phrase of two bytes
59encoded phonetically.
59encoded phonetically.
60
60
61Accepts
61Accepts
@@ -87,7 +87,7 @@ Examples
87
87
88Parse two phonetic pairs
88Parse two phonetic pairs
89
89
90−Parsing [`++rule`](). Parses and unscrambles an atom of odor [@pF](), a phrase
90+Parsing `++rule`. Parses and unscrambles an atom of odor @pF, a phrase
91of two two-byte pairs that are encoded (and scrambled) phonetically.
91of two two-byte pairs that are encoded (and scrambled) phonetically.
92
92
93Accepts
93Accepts
@@ -104,7 +104,7 @@ Source
104------
104------
105
105
106 ++ huf %+ cook
106 ++ huf %+ cook
107− |=([a=@ b=@] (wred:un ~(zug mu ~(zag mu [a b]))))
107+ |=([a/@ b/@] (wred:un ~(zug mu ~(zag mu [a b]))))
108 ;~(plug hif ;~(pfix hep hif))
108 ;~(plug hif ;~(pfix hep hif))
109
109
110Examples
110Examples
@@ -123,13 +123,13 @@ Examples
123
123
124Parse 8 phonetic bytes
124Parse 8 phonetic bytes
125
125
126−Parsing [`++rule`](). Parses an atom of odor [@pG](), a phrase of eight of
126+Parsing `++rule`. Parses an atom of odor @pG, a phrase of eight of
127phonetic bytes.
127phonetic bytes.
128
128
129Accepts
129Accepts
130-------
130-------
131
131
132−An atom of odor [`@pG`]()
132+An atom of odor `@pG`
133
133
134Produces
134Produces
135--------
135--------
@@ -155,12 +155,12 @@ Examples
155
155
156Parse \<= 5 base-32
156Parse \<= 5 base-32
157
157
158−Parsing [`++rule`](). Parses up to five base-32 digits without a leading zero.
158+Parsing `++rule`. Parses up to five base-32 digits without a leading zero.
159
159
160Accepts
160Accepts
161-------
161-------
162
162
163−Up to five [@uv]() (base 64) digits.
163+Up to five @uv (base 64) digits.
164
164
165Produces
165Produces
166--------
166--------
@@ -191,12 +191,12 @@ Examples
191
191
192Parse \<= 5 base-64
192Parse \<= 5 base-64
193
193
194−Parsing [`++rule`](). Parses up to five base-64 digits without a leading zero.
194+Parsing `++rule`. Parses up to five base-64 digits without a leading zero.
195
195
196Accepts
196Accepts
197-------
197-------
198
198
199−Up to five [@uw]() (base 64) digits.
199+Up to five @uw (base 64) digits.
200
200
201Produces
201Produces
202--------
202--------
@@ -230,7 +230,7 @@ Examples
230
230
231Parse 5 base-32
231Parse 5 base-32
232
232
233−Parsing [`++rule`](). Parses exactly five base-32 digits.
233+Parsing `++rule`. Parses exactly five base-32 digits.
234
234
235Accepts
235Accepts
236-------
236-------
@@ -258,7 +258,7 @@ Examples
258
258
259Parse 5 base-64
259Parse 5 base-64
260
260
261−Parsing [`++rule`](). Parses exactly five base-64 digits.
261+Parsing `++rule`. Parses exactly five base-64 digits.
262
262
263Accepts
263Accepts
264-------
264-------
@@ -266,8 +266,6 @@ Accepts
266Produces
266Produces
267--------
267--------
268
268
269−My name henry let's see how fast I can type.
270−
271Source
269Source
272------
270------
273
271
@@ -288,7 +286,7 @@ Examples
288
286
289Parse \<= 4 binary
287Parse \<= 4 binary
290
288
291−Parsing [`++rule`](). Parses a binary number of up to 4 digits in length without
289+Parsing `++rule`. Parses a binary number of up to 4 digits in length without
292a leading zero.
290a leading zero.
293
291
294Accepts
292Accepts
@@ -324,7 +322,7 @@ Examples
324
322
325Parse \<= 4 hex
323Parse \<= 4 hex
326
324
327−Parsing [`++rule`](). Parses a hexadecimal number of up to 4 digits in length
325+Parsing `++rule`. Parses a hexadecimal number of up to 4 digits in length
328without a leading zero.
326without a leading zero.
329
327
330Accepts
328Accepts
@@ -358,7 +356,7 @@ Examples
358
356
359Parse 4 binary
357Parse 4 binary
360
358
361−Parsing [`++rule`](). Parses exactly four binary digits.
359+Parsing `++rule`. Parses exactly four binary digits.
362
360
363Accepts
361Accepts
364-------
362-------
@@ -388,7 +386,7 @@ Examples
388
386
389Parse 4 hex
387Parse 4 hex
390
388
391−Parsing [`++rule`](). Parses exactly four hexadecimal digits.
389+Parsing `++rule`. Parses exactly four hexadecimal digits.
392
390
393Accepts
391Accepts
394-------
392-------
@@ -418,7 +416,7 @@ Examples
418
416
419Parse 1
417Parse 1
420
418
421−Parsing [`++rule`](). Parses the number 1.
419+Parsing `++rule`. Parses the number 1.
422
420
423Accepts
421Accepts
424-------
422-------
@@ -449,7 +447,7 @@ Examples
449
447
450Parse decimal
448Parse decimal
451
449
452−Parsing [`++rule`](). Parses a nonzero decimal digit.
450+Parsing `++rule`. Parses a nonzero decimal digit.
453
451
454Accepts
452Accepts
455-------
453-------
@@ -460,7 +458,7 @@ Produces
460Source
458Source
461------
459------
462
460
463− ++ sed (cook |=(a=@ (sub a '0')) (shim '1' '9'))
461+ ++ sed (cook |=(a/@ (sub a '0')) (shim '1' '9'))
464
462
465Examples
463Examples
466--------
464--------
@@ -477,7 +475,7 @@ Examples
477
475
478Parse base-32
476Parse base-32
479
477
480−Parsing [`++rule`](). Parses a nonzero base-32 digit
478+Parsing `++rule`. Parses a nonzero base-32 digit
481
479
482Accepts
480Accepts
483-------
481-------
@@ -505,7 +503,7 @@ Examples
505
503
506Parse base-64
504Parse base-64
507
505
508−Parsing [`++rule`](). Parses a nonzero base-64 digit
506+Parsing `++rule`. Parses a nonzero base-64 digit
509
507
510Accepts
508Accepts
511-------
509-------
@@ -533,7 +531,7 @@ Examples
533
531
534Parse hex
532Parse hex
535
533
536−Parsing [`++rule`](). Parses a nonzero hexadecimal digit.
534+Parsing `++rule`. Parses a nonzero hexadecimal digit.
537
535
538Accepts
536Accepts
539-------
537-------
@@ -561,7 +559,7 @@ Examples
561
559
562Parse binary
560Parse binary
563
561
564−Parsing [`++rule`](). Parses a binary digit.
562+Parsing `++rule`. Parses a binary digit.
565
563
566Accepts
564Accepts
567-------
565-------
@@ -572,7 +570,7 @@ Produces
572Source
570Source
573------
571------
574
572
575− ++ sib (cook |=(a=@ (sub a '0')) (shim '0' '1'))
573+ ++ sib (cook |=(a/@ (sub a '0')) (shim '0' '1'))
576
574
577Examples
575Examples
578--------
576--------
@@ -588,7 +586,7 @@ Examples
588
586
589Parse decimal
587Parse decimal
590
588
591−Parsing [`++rule`](). Parses a decimal digit.
589+Parsing `++rule`. Parses a decimal digit.
592
590
593Accepts
591Accepts
594-------
592-------
@@ -599,7 +597,7 @@ Produces
599Source
597Source
600------
598------
601
599
602− ++ sid (cook |=(a=@ (sub a '0')) (shim '0' '9'))
600+ ++ sid (cook |=(a/@ (sub a '0')) (shim '0' '9'))
603
601
604Examples
602Examples
605--------
603--------
@@ -613,7 +611,7 @@ Examples
613
611
614Parse base-32
612Parse base-32
615
613
616−Parsing [`++rule`](). Parses a base-32 digit.
614+Parsing `++rule`. Parses a base-32 digit.
617
615
618Accepts
616Accepts
619-------
617-------
@@ -638,7 +636,7 @@ Examples
638
636
639Parse base-64
637Parse base-64
640
638
641−Parsing [`++rule`](). Parses a base-64 digit.
639+Parsing `++rule`. Parses a base-64 digit.
642
640
643Accepts
641Accepts
644-------
642-------
@@ -663,7 +661,7 @@ Examples
663
661
664Parse hex
662Parse hex
665
663
666−Parsing [`++rule`](). Parses a hexadecimal digit.
664+Parsing `++rule`. Parses a hexadecimal digit.
667
665
668Accepts
666Accepts
669-------
667-------
@@ -688,7 +686,7 @@ Examples
688
686
689Parse base-32
687Parse base-32
690
688
691−Parsing [`++rule`](). Parses a base-32 letter.
689+Parsing `++rule`. Parses a base-32 letter.
692
690
693Accepts
691Accepts
694-------
692-------
@@ -699,7 +697,7 @@ Produces
699Source
697Source
700------
698------
701
699
702− ++ sov (cook |=(a=@ (sub a 87)) (shim 'a' 'v'))
700+ ++ sov (cook |=(a/@ (sub a 87)) (shim 'a' 'v'))
703
701
704Examples
702Examples
705--------
703--------
@@ -713,7 +711,7 @@ Examples
713
711
714Parse base-64
712Parse base-64
715
713
716−Parsing [`++rule`](). Parses a base-64 letter/symbol.
714+Parsing `++rule`. Parses a base-64 letter/symbol.
717
715
718Accepts
716Accepts
719-------
717-------
@@ -725,8 +723,8 @@ Source
725------
723------
726
724
727 ++ sow ;~ pose
725 ++ sow ;~ pose
728− (cook |=(a=@ (sub a 87)) (shim 'a' 'z'))
726+ (cook |=(a/@ (sub a 87)) (shim 'a' 'z'))
729− (cook |=(a=@ (sub a 29)) (shim 'A' 'Z'))
727+ (cook |=(a/@ (sub a 29)) (shim 'A' 'Z'))
730 (cold 62 (just '-'))
728 (cold 62 (just '-'))
731 (cold 63 (just '~'))
729 (cold 63 (just '~'))
732 ==
730 ==
@@ -743,7 +741,7 @@ Examples
743
741
744Parse hex letter
742Parse hex letter
745
743
746−Parsing [`++rule`](). Parses a hexadecimal letter.
744+Parsing `++rule`. Parses a hexadecimal letter.
747
745
748Accepts
746Accepts
749-------
747-------
@@ -754,7 +752,7 @@ Produces
754Source
752Source
755------
753------
756
754
757− ++ sox (cook |=(a=@ (sub a 87)) (shim 'a' 'f'))
755+ ++ sox (cook |=(a/@ (sub a 87)) (shim 'a' 'f'))
758
756
759Examples
757Examples
760--------
758--------
@@ -768,7 +766,7 @@ Examples
768
766
769Parse \<= 3 decimal
767Parse \<= 3 decimal
770
768
771−Parsing [`++rule`](). Parses a decimal number of up to 3 digits without a
769+Parsing `++rule`. Parses a decimal number of up to 3 digits without a
772leading zero.
770leading zero.
773
771
774Accepts
772Accepts
@@ -801,7 +799,7 @@ Examples
801
799
802Leading phonetic byte
800Leading phonetic byte
803
801
804−Parsing [`++rule`](). Parses the leading phonetic byte, which represents a
802+Parsing `++rule`. Parses the leading phonetic byte, which represents a
805syllable.
803syllable.
806
804
807Accepts
805Accepts
@@ -813,7 +811,7 @@ Produces
813Source
811Source
814------
812------
815
813
816− ++ tip (sear |=(a=@ (ins:po a)) til)
814+ ++ tip (sear |=(a/@ (ins:po a)) til)
817
815
818Examples
816Examples
819--------
817--------
@@ -829,7 +827,7 @@ Examples
829
827
830Trailing phonetic syllable
828Trailing phonetic syllable
831
829
832−Parsing [`++rule`](). Parses the trailing phonetic byte, which represents a
830+Parsing `++rule`. Parses the trailing phonetic byte, which represents a
833syllable.
831syllable.
834
832
835Accepts
833Accepts
@@ -841,7 +839,7 @@ Produces
841Source
839Source
842------
840------
843
841
844− ++ tiq (sear |=(a=@ (ind:po a)) til)
842+ ++ tiq (sear |=(a/@ (ind:po a)) til)
845
843
846Examples
844Examples
847--------
845--------
@@ -857,7 +855,7 @@ Examples
857
855
858Parse 3 decimal digits
856Parse 3 decimal digits
859
857
860−Parsing [`++rule`](). Parses exactly three decimal digits.
858+Parsing `++rule`. Parses exactly three decimal digits.
861
859
862Accepts
860Accepts
863-------
861-------
@@ -885,7 +883,7 @@ Examples
885
883
886Parse 3 lowercase
884Parse 3 lowercase
887
885
888−Parsing [`++rule`](). Parses exactly three lowercase letters.
886+Parsing `++rule`. Parses exactly three lowercase letters.
889
887
890Accepts
888Accepts
891-------
889-------
@@ -915,7 +913,7 @@ Examples
915
913
916Parse span characters
914Parse span characters
917
915
918−Parsing rule. Parses characters from an atom of the span odor [`@ta`]().
916+Parsing rule. Parses characters from an atom of the span odor `@ta`.
919
917
920Accepts
918Accepts
921-------
919-------
@@ -927,7 +925,7 @@ Source
927------
925------
928
926
929 ++ urs %+ cook
927 ++ urs %+ cook
930− |=(a=tape (rap 3 ^-((list ,@) a)))
928+ |=(a/tape (rap 3 ^-((list @) a)))
931 (star ;~(pose nud low hep dot sig cab))
929 (star ;~(pose nud low hep dot sig cab))
932
930
933Examples
931Examples
@@ -944,7 +942,7 @@ Examples
944
942
945Parse non-`_` span
943Parse non-`_` span
946
944
947−Parsing rule. Parses all characters of the span odor [`@ta`]() except
945+Parsing rule. Parses all characters of the span odor `@ta` except
948for cab, `_`.
946for cab, `_`.
949
947
950Accepts
948Accepts
@@ -957,7 +955,7 @@ Source
957------
955------
958
956
959 ++ urt %+ cook
957 ++ urt %+ cook
960− |=(a=tape (rap 3 ^-((list ,@) a)))
958+ |=(a/tape (rap 3 ^-((list @) a)))
961 (star ;~(pose nud low hep dot sig))
959 (star ;~(pose nud low hep dot sig))
962
960
963Examples
961Examples
@@ -1034,12 +1032,13 @@ Accepts
1034Produces
1032Produces
1035--------
1033--------
1036
1034
1037−`fel` is a [`rule`]().
1035+`fel` is a `rule`.
1038
1036
1039Source
1037Source
1040------
1038------
1041
1039
1042− ++ ape |*(fel=_rule ;~(pose (cold 0 (just '0')) fel))
1040+ ++ ape |*(fel/rule ;~(pose (cold 0 (just '0')) fel))
1041+
1043
1042
1044Examples
1043Examples
1045--------
1044--------
@@ -1078,7 +1077,7 @@ Examples
1078
1077
1079Parse IPv6
1078Parse IPv6
1080
1079
1081−Parsing rule. Parses a [`@is`](), an IPv6 address.
1080+Parsing rule. Parses a `@is`, an IPv6 address.
1082
1081
1083Accepts
1082Accepts
1084-------
1083-------
@@ -1119,6 +1118,7 @@ Source
1119
1118
1120 ++ dem (ape (bass 1.000 ;~(plug ted:ab (star ;~(pfix dog tid:ab)))))
1119 ++ dem (ape (bass 1.000 ;~(plug ted:ab (star ;~(pfix dog tid:ab)))))
1121
1120
1121+
1122Examples
1122Examples
1123--------
1123--------
1124
1124
@@ -1190,7 +1190,7 @@ Examples
1190
1190
1191Parse phonetic base
1191Parse phonetic base
1192
1192
1193−Parsing rule. Parses an atom of odor [`@p`](), the phonetic base.
1193+Parsing rule. Parses an atom of odor `@p`, the phonetic base.
1194
1194
1195Accepts
1195Accepts
1196-------
1196-------
docs/system/hoon/library/src/4j/core/mu.md+12−11
@@ -2,7 +2,7 @@
2
2
3Core used to scramble 16-bit atoms
3Core used to scramble 16-bit atoms
4
4
5−A [door]() that contains arms that are used to scramble two atoms, `top`
5+A door that contains arms that are used to scramble two atoms, `top`
6and `bot`. Used especially in the phonetic base to disguise the
6and `bot`. Used especially in the phonetic base to disguise the
7relationship between a destroyer and its cruiser.
7relationship between a destroyer and its cruiser.
8
8
@@ -12,15 +12,15 @@ Accepts
12Produces
12Produces
13--------
13--------
14
14
15−`bot` is an [atom]().
15+`bot` is an atom.
16
16
17−`top` is an [atom]().
17+`top` is an atom.
18
18
19Source
19Source
20------
20------
21
21
22 ++ mu
22 ++ mu
23− |_ [top=@ bot=@]
23+ |_ [top/@ bot/@]
24
24
25Examples
25Examples
26--------
26--------
@@ -44,15 +44,16 @@ Accepts
44Produces
44Produces
45--------
45--------
46
46
47−`bot` is an [atom]().
47+`bot` is an atom.
48
48
49−`top` is an [atom]().
49+`top` is an atom.
50
50
51Source
51Source
52------
52------
53
53
54 ++ zag [p=(end 4 1 (add top bot)) q=bot]
54 ++ zag [p=(end 4 1 (add top bot)) q=bot]
55
55
56+
56Examples
57Examples
57--------
58--------
58
59
@@ -65,7 +66,7 @@ Examples
65
66
66Subtract bottom from top
67Subtract bottom from top
67
68
68−The inverse of [`++zag`](). Produces the cell of `top` and `bot` with
69+The inverse of `++zag`. Produces the cell of `top` and `bot` with
69`top` unscrambled. The unscrambled `top` is the sum of the sample `top`
70`top` unscrambled. The unscrambled `top` is the sum of the sample `top`
70and the 16-bit complement of `bot`. Used to unscramble the name of the
71and the 16-bit complement of `bot`. Used to unscramble the name of the
71destroyer.
72destroyer.
@@ -76,9 +77,9 @@ Accepts
76Produces
77Produces
77--------
78--------
78
79
79−`bot` is an [atom]().
80+`bot` is an atom.
80
81
81−`top` is an [atom]().
82+`top` is an atom.
82
83
83Source
84Source
84------
85------
@@ -106,9 +107,9 @@ Accepts
106Produces
107Produces
107--------
108--------
108
109
109−`bot` is an [atom]().
110+`bot` is an atom.
110
111
111−`top` is an [atom]().
112+`top` is an atom.
112
113
113Source
114Source
114------
115------
docs/system/hoon/library/src/4j/core/ne.md+6−6
@@ -2,7 +2,7 @@
2
2
3Digit rendering engine
3Digit rendering engine
4
4
5−A [door]() containing arms that render digits at bases 10, 16, 32, and
5+A door containing arms that render digits at bases 10, 16, 32, and
664.
664.
7
7
8Accepts
8Accepts
@@ -11,13 +11,13 @@ Accepts
11Produces
11Produces
12--------
12--------
13
13
14−`tig` is an [`atom`]().
14+`tig` is an `atom`.
15
15
16Source
16Source
17------
17------
18
18
19 ++ ne
19 ++ ne
20− |_ tig=@
20+ |_ tig/@
21
21
22Examples
22Examples
23--------
23--------
@@ -39,7 +39,7 @@ Accepts
39Produces
39Produces
40--------
40--------
41
41
42−`tig` is an [`atom`]().
42+`tig` is an `atom`.
43
43
44Source
44Source
45------
45------
@@ -66,7 +66,7 @@ Accepts
66Produces
66Produces
67--------
67--------
68
68
69−`tig` is an [`atom`]().
69+`tig` is an `atom`.
70
70
71Source
71Source
72------
72------
@@ -124,7 +124,7 @@ Accepts
124Produces
124Produces
125--------
125--------
126
126
127−`tig` is an [`atom`]().
127+`tig` is an `atom`.
128
128
129Source
129Source
130------
130------