diff --git a/uppsrc/Core/src.tpp/AIndex$en-us.tpp b/uppsrc/Core/src.tpp/AIndex$en-us.tpp index 126de1137..f0ede50cd 100644 --- a/uppsrc/Core/src.tpp/AIndex$en-us.tpp +++ b/uppsrc/Core/src.tpp/AIndex$en-us.tpp @@ -10,9 +10,10 @@ topic "AIndex"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_}%EN-US -[s0;i448;a25;kKO9;:noref:%- [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T], -[@(0.0.255) class]_[*@4 V], [@(0.0.255) class]_[*@4 HashFn]>&] -[s1;:`:`:AIndex`:`:class:%- [@(0.0.255) class]_[* AIndex]&] +[s0;i448;a25;kKO9; [*@3;4 AIndex]&] +[s1;:noref:%- [@(0.0.255)3 template][3 _<][@(0.0.255)3 class][3 _][*@4;3 T][3 , +][@(0.0.255)3 class][3 _][*@4;3 V][3 , ][@(0.0.255)3 class][3 _][*@4;3 HashFn][@(0.0.255)3 >]&] +[s1;:AIndex`:`:class:%- [@(0.0.255) class]_[* AIndex]&] [s8; [*C@4 T]-|Type of elements to store. T must satisfy requirements for container flavor identified by parameter V and must have [*C operator`=`=] defined.&] @@ -55,9 +56,37 @@ restore ordering using [* Sweep] method.&] oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ pick and optional deep copy] transfer semantics, although these features are more important in derived concrete index flavors.&] +[s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] +[s3;%- &] +[s5;:AIndex`:`:AIndex`(`):%- [* AIndex]()&] +[s2; Default constructor.&] +[s3;%- &] +[s4;%- &] +[s5;:AIndex`:`:AIndex`(const AIndex`&`,int`):%- [* AIndex]([@(0.0.255) const]_[* AIndex][@(0.0.255) `& +]_[*@3 s], [@(0.0.255) int])&] +[s2; Optional deep copy constructor.&] +[s6; -|Requires T to have deep copy constructor or optional deep copy +constructor.&] +[s3; &] +[s4; &] +[s5;:AIndex`:`:AIndex`(pick`_ V`&`):%- [* AIndex]([@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `& +]_[*@3 s])&] +[s2; Pick`-constructs [* AIndex] from a basic random access container +[%-*@3 s]. Transfers the source container in short constant time, +but destroys it by picking.&] +[s3; &] +[s4;%- &] +[s5;:AIndex`:`:AIndex`(const V`&`,int`):%- [* AIndex]([@(0.0.255) const]_[*@4 V][@(0.0.255) `& +]_[*@3 s], [@(0.0.255) int])&] +[s2; Deep`-copy constructs AIndex from basic random access container.&] +[s6; Requires T to have deep copy constructor or optional deep copy +constructor.&] +[s3; &] [s0; &] [ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&] -[s4;H0;%- &] +[s3;%- &] [s5;:AIndex`:`:Add`(const T`&`,unsigned`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 T ][@(0.0.255) `&]_[*@3 x], [@(0.0.255) unsigned]_[*@3 `_hash])&] [s2; Adds a new element [%-*@3 x] with a precomputed hash value [%-*@3 `_hash]. @@ -284,6 +313,8 @@ tor`[`]]([@(0.0.255) int]_[*@3 i])_[@(0.0.255) const]&] [s4;%- &] [s5;:AIndex`:`:ClearIndex`(`):%- [@(0.0.255) void]_[* ClearIndex]()&] [s2; Restores multi`-key ordering.&] +[s3; &] +[s4; &] [s5;:`:`:AIndex`:`:UnlinkKey`(const T`&`,unsigned`):%- [@(0.0.255) int]_[* UnlinkKey]([@(0.0.255) c onst]_[*@4 T][@(0.0.255) `&]_[*@3 k], [@(0.0.255) unsigned]_[*@3 `_hash])&] [s2; Unlinks all elements with value [%-*@3 k] using precomputed [%-*@3 `_hash]. @@ -420,56 +451,34 @@ onst]&] of elements.&] [s3;%- &] [s4;%- &] -[s5;:AIndex`:`:operator`=`(pick`_ V`&`):%- AIndex[@(0.0.255) `&]_[* operator`=]([@(0.128.128) p -ick`_]_[*@4 V][@(0.0.255) `&]_[*@3 s])&] +[s5;:AIndex`:`:operator`=`(pick`_ V`&`):%- [_^AIndex^ AIndex][@(0.0.255) `&]_[* operator`=]( +[@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `&]_[*@3 s])&] [s2; Assigns basic random access container to AIndex. Transfers the source container in short constant time, but destroys it by picking.&] [s3;%- &] [s4;%- &] -[s5;:AIndex`:`:operator`<`<`=`(const V`&`):%- AIndex[@(0.0.255) `&]_[* operator<<`=]([@(0.0.255) c -onst]_[*@4 V][@(0.0.255) `&]_[*@3 s])&] +[s5;:AIndex`:`:operator`<`<`=`(const V`&`):%- [_^AIndex^ AIndex][@(0.0.255) `&]_[* operator +<<`=]([@(0.0.255) const]_[*@4 V][@(0.0.255) `&]_[*@3 s])&] [s2; Assigns the basic random access container to AIndex, while preserving the value of the source container.&] [s6; Requires T to have deep copy constructor or optional deep copy.&] [s3;%- &] [s4;%- &] -[s5;:AIndex`:`:AIndex`(pick`_ V`&`):%- [* AIndex]([@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `& -]_[*@3 s])&] -[s2; Pick`-constructs AIndex from a basic random access container. -Transfers the source container in short constant time, but destroys -it by picking.&] -[s3;%- &] -[s4;%- &] -[s5;:AIndex`:`:AIndex`(const V`&`,int`):%- [* AIndex]([@(0.0.255) const]_[*@4 V][@(0.0.255) `& -]_[*@3 s], [@(0.0.255) int])&] -[s2; Deep`-copy constructs AIndex from basic random access container.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor.&] -[s3;%- &] -[s4;%- &] -[s5;:AIndex`:`:Begin`(`)const:%- ConstIterator_[* Begin]()_[@(0.0.255) const]&] +[s5;:AIndex`:`:Begin`(`)const:%- [_^AIndex`:`:ConstIterator^ ConstIterator]_[* Begin]()_[@(0.0.255) c +onst]&] [s2; Returns a constant iterator to the first element in AIndex.&] [s3;%- &] [s4;%- &] -[s5;:AIndex`:`:End`(`)const:%- ConstIterator_[* End]()_[@(0.0.255) const]&] +[s5;:AIndex`:`:End`(`)const:%- [_^AIndex`:`:ConstIterator^ ConstIterator]_[* End]()_[@(0.0.255) c +onst]&] [s2; Returns a constant iterator to the position just beyond the last element in AIndex.&] [s3;%- &] [s4;%- &] -[s5;:AIndex`:`:GetIter`(int`)const:%- ConstIterator_[* GetIter]([@(0.0.255) int]_[*@3 pos]) -_[@(0.0.255) const]&] +[s5;:AIndex`:`:GetIter`(int`)const:%- [_^AIndex`:`:ConstIterator^ ConstIterator]_[* GetIt +er]([@(0.0.255) int]_[*@3 pos])_[@(0.0.255) const]&] [s2; Returns a constant iterator to the element at specified position. Same as [* Begin() `+ i]. The benefit of this method is that [* pos] is range checked in debug mode.&] [s3;%- &] -[s4;%- &] -[s5;:AIndex`:`:AIndex`(`):%- [* AIndex]()&] -[s2; Default constructor.&] -[s3;%- &] -[s4;%- &] -[s5;:AIndex`:`:AIndex`(const AIndex`&`,int`):%- [* AIndex]([@(0.0.255) const]_[* AIndex][@(0.0.255) `& -]_[*@3 s], [@(0.0.255) int])&] -[s2; Optional deep copy constructor.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor.&] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/AMap$en-us.tpp b/uppsrc/Core/src.tpp/AMap$en-us.tpp index a83178999..e13628847 100644 --- a/uppsrc/Core/src.tpp/AMap$en-us.tpp +++ b/uppsrc/Core/src.tpp/AMap$en-us.tpp @@ -10,10 +10,11 @@ topic "AMap"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_}%EN-US -[s5;:noref:%- [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 K], [@(0.0.255) class]_[*@4 T], -[@(0.0.255) class]_[*@4 V], [@(0.0.255) class]_[*@4 HashFn][@(0.0.255) >]&] -[s1;:`:`:AMap`:`:class:%- [@(0.0.255) class]_[* AMap]&] -[s0;*%- &] +[s5; [*@3;4 AMap]&] +[s1;:noref:%- [@(0.0.255)3 template][3 _<][@(0.0.255)3 class][3 _][*@4;3 K][3 , +][@(0.0.255)3 class][3 _][*@4;3 T][3 , ][@(0.0.255)3 class][3 _][*@4;3 V][3 , +][@(0.0.255)3 class][3 _][*@4;3 HashFn][@(0.0.255)3 >]&] +[s1;:AMap`:`:class:%- [@(0.0.255) class]_[* AMap]&] [s8; [*@4 K]-|Type of keys. K must have deep copy constructor, be [/^dpp`:`/`/SourceDoc`/Containers`/Moveable^ m oveable] and must have operator`=`= defined.&] [s8; [*@4 T]-|Type of values. T must satisfy requirements for container @@ -31,6 +32,38 @@ oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick and optional deep copy] transfer semantics, although these features are more important in derived concrete index flavors.&] [s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] +[s3; &] +[s5;:AMap`:`:AMap`(`):%- [* AMap]()&] +[s2; Constructor. Constructs an empty AMap.&] +[s3;%- &] +[s4;%- &] +[s5;:AMap`:`:AMap`(const AMap`&`,int`):%- [* AMap]([@(0.0.255) const]_[* AMap][@(0.0.255) `&]_ +[*@3 s], [@(0.0.255) int])&] +[s2; Optional deep copy constructor.&] +[s6; Requires T to have deep copy constructor or optional deep copy +constructor.&] +[s7; [*C s]-|Source AMap.&] +[s4; &] +[s5;:AMap`:`:AMap`(pick`_ Index``&`,pick`_ V`&`):%- [* AMap]([@(0.128.128) pi +ck`_]_Index[@(0.0.255) <][*@4 K], [*@4 HashFn][@(0.0.255) >`&]_[*@3 ndx], +[@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `&]_[*@3 val])&] +[s2; This form of constructors creates AMap by picking Index of keys +[%-*@3 ndx] and basic random access container of values. Both containers +must have same number of elements [%-*@3 val].&] +[s3;%- &] +[s4;%- &] +[s5;:AMap`:`:AMap`(pick`_ Vector``&`,pick`_ V`&`):%- [* AMap]([@(0.128.128) pick`_]_V +ector[@(0.0.255) <][*@4 K][@(0.0.255) >`&]_[*@3 ndx], [@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `& +]_[*@3 val])&] +[s2; This form of constructors creates AMap by picking Vector of +keys and basic random access container of values. Both containers +must have same number of elements.&] +[s7; [*C@3 ndx]-|Keys.&] +[s7; [*@3 val]-|Values.&] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&] [s3;%- &] [s5;:AMap`:`:Add`(const K`&`,const T`&`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 K @@ -650,7 +683,7 @@ position.&] [*@3 s])&] [s2; Serializes the content of AMap to/from Stream. Works only if NTL is used as part of UPP.&] -[s0; Requires T to have serialization operator defined.&] +[s6; Requires T to have serialization operator defined.&] [s7; [*C@3 s]-|Target/source stream.&] [s3;%- &] [s4;%- &] @@ -700,35 +733,6 @@ by picking.&] [s7; [*/ Return value]-|Basic random access container of values.&] [s3;%- &] [s4;%- &] -[s5;:AMap`:`:AMap`(`):%- [* AMap]()&] -[s2; Constructor. Constructs an empty AMap.&] -[s3;%- &] -[s4;%- &] -[s5;:AMap`:`:AMap`(const AMap`&`,int`):%- [* AMap]([@(0.0.255) const]_[* AMap][@(0.0.255) `&]_ -[*@3 s], [@(0.0.255) int])&] -[s2; Optional deep copy constructor.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor.&] -[s7; [*C s]-|Source AMap.&] -[s4; &] -[s5;:AMap`:`:AMap`(pick`_ Index``&`,pick`_ V`&`):%- [* AMap]([@(0.128.128) pi -ck`_]_Index[@(0.0.255) <][*@4 K], [*@4 HashFn][@(0.0.255) >`&]_[*@3 ndx], -[@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `&]_[*@3 val])&] -[s2; This form of constructors creates AMap by picking Index of keys -[%-*@3 ndx] and basic random access container of values. Both containers -must have same number of elements [%-*@3 val].&] -[s3;%- &] -[s4;%- &] -[s5;:AMap`:`:AMap`(pick`_ Vector``&`,pick`_ V`&`):%- [* AMap]([@(0.128.128) pick`_]_V -ector[@(0.0.255) <][*@4 K][@(0.0.255) >`&]_[*@3 ndx], [@(0.128.128) pick`_]_[*@4 V][@(0.0.255) `& -]_[*@3 val])&] -[s2; This form of constructors creates AMap by picking Vector of -keys and basic random access container of values. Both containers -must have same number of elements.&] -[s7; [*C@3 ndx]-|Keys.&] -[s7; [*C@3 val]-|Values.&] -[s3;%- &] -[s4;%- &] [s5;:AMap`:`:KeyType`:`:typedef:%- [@(0.0.255) typedef]_K_[* KeyType]&] [s2; Typedef of K for use in templated algorithms.&] [s3;%- &] @@ -795,4 +799,5 @@ Same as [* Begin() `+ i]. Benefit of this methods is that in debug mode [* pos] is range checked.&] [s7; [*C@3 i]-|Required position.&] [s7; [*/ Return value]-|Constant value iterator.&] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/AMap$en-us.tppi b/uppsrc/Core/src.tpp/AMap$en-us.tppi index c5cbda025..73e8e93d3 100644 --- a/uppsrc/Core/src.tpp/AMap$en-us.tppi +++ b/uppsrc/Core/src.tpp/AMap$en-us.tppi @@ -1,22 +1,22 @@ TITLE("AMap") COMPRESSED -120,156,237,93,121,115,219,182,18,255,42,152,73,219,145,243,100,155,212,97,201,86,155,73,154,164,105,198,73,234,137,157,244,15,143,98,209,34,100,241,153,34,85,130,242,241,122,124,246,183,11,128,167,120,128,148,236,88,169,123,216,178,136,99,143,223,46,22,192,2,60,109,145,239,190,211,154,218,19,173,228,159,131,87,116,98,44,108,127,120,106,117,58,253,129,209,234,14,46,15,127,219,31,96,125,29,234,183,123,122,187,223,109,235,157,214,30,252,208,219,122,171,219,106,119,244,126,107,191,211,111,183,251,218,193,216,54,24,27,158,218,173,126,159,87,106,65,165,86,175,219,210,123,157,126,167,175,183,123,253,22,212,109,105,90,75,235,181,186,122,167,221,111,117,15,76,202,198,195,83,13,138,183,161,248,254,94,123,95,211,53,173,167,235,90,187,213,211,218,221,142,174,183,91,208,68,171,215,210,181,238,1,117,204,225,233,175,123,3,172,208,65,166,186,123,64,250,30,180,214,233,104,208,58,86,235,180,245,182,214,106,119,245,253,238,222,193,57,189,176,156,44,150,186,165,44, -245,180,3,203,167,51,201,145,209,25,60,125,222,29,232,80,117,175,185,247,164,7,221,118,186,208,217,62,114,212,134,106,173,214,94,119,95,239,118,128,164,142,214,58,240,232,31,11,203,163,51,234,248,178,5,75,215,91,250,224,92,239,13,128,132,127,254,249,103,71,239,104,66,82,61,160,69,215,128,238,150,14,223,1,31,61,189,187,175,237,119,251,122,95,107,247,58,173,110,15,88,159,27,158,49,147,156,156,119,90,3,201,71,191,217,127,178,167,239,129,68,181,62,208,223,221,135,6,52,96,2,126,131,32,187,240,95,187,127,224,203,202,88,15,43,237,55,247,159,128,144,218,93,173,183,175,245,58,189,110,7,56,105,233,123,58,8,82,67,254,65,13,7,142,235,205,12,123,120,250,231,217,223,223,191,254,176,253,233,152,156,178,238,0,191,166,147,131,239,183,201,233,243,134,182,163,237,64,159,91,4,228,52,183,13,159,14,207,126,140,127,45,32,113,118,250,244,121,135,28,14,155,36,239,217,73,193,179,207,5,207,126,53,216,244,23,80,111,236,241,179,225,15,195,83,166, -15,14,70,240,239,139,247,198,28,127,243,58,105,154,195,134,8,22,227,213,180,193,83,40,132,159,250,3,34,169,222,254,235,228,118,78,137,59,33,151,244,150,237,144,67,50,91,48,159,76,141,43,74,76,74,231,100,236,206,111,225,135,195,124,111,49,246,93,175,73,206,41,57,221,253,98,206,177,239,221,209,238,177,187,240,198,244,149,59,30,237,190,116,29,223,176,28,234,177,209,238,123,247,138,26,231,54,253,66,102,242,211,144,24,142,25,107,222,157,83,207,128,22,71,63,141,126,130,190,38,80,209,220,137,83,119,18,163,238,202,176,23,20,232,59,17,13,48,195,183,216,228,150,196,112,200,200,196,245,144,82,65,2,153,216,198,21,124,97,153,240,204,154,88,212,36,231,183,132,35,133,250,240,248,115,162,171,207,177,174,206,13,102,141,137,7,196,186,51,98,140,199,148,177,168,217,68,45,169,160,237,191,240,131,229,92,8,161,239,144,247,49,17,114,182,200,194,97,214,5,126,8,152,110,108,53,184,80,201,225,232,7,114,179,69,128,168,169,107,2,63,254,194,115,176,169, -41,52,41,184,230,124,81,91,48,185,35,20,73,196,47,180,179,142,190,55,224,58,38,22,35,134,32,129,248,83,195,7,162,103,231,208,59,35,111,29,147,222,4,58,38,215,150,63,45,102,50,18,120,19,59,159,33,61,51,232,64,136,20,24,124,235,99,103,11,6,12,25,12,219,162,178,95,169,130,49,240,65,227,85,0,228,79,201,103,138,0,66,52,242,63,95,120,158,113,139,127,113,92,192,23,199,244,66,62,223,73,177,247,206,186,164,80,234,150,184,254,20,200,251,112,242,46,34,182,25,50,127,250,116,247,139,239,206,173,177,0,230,75,48,229,209,46,243,198,38,98,51,192,227,232,59,234,140,182,23,44,134,75,168,71,200,208,71,245,115,217,20,182,3,95,95,142,206,162,86,240,111,206,128,59,247,45,215,49,236,200,108,134,196,7,1,179,9,80,204,232,204,0,24,142,65,16,134,13,154,94,92,76,65,71,20,228,54,161,6,168,28,148,100,120,32,49,232,138,88,179,185,235,249,80,156,88,14,52,230,89,87,32,230,80,168,22,215,101,160,9,148,83,155,163,129, -252,249,167,142,3,221,47,13,189,213,223,122,195,127,62,215,9,7,11,200,246,104,113,110,131,194,223,11,152,189,179,152,63,28,254,253,183,168,46,157,2,120,191,192,163,188,48,205,81,132,207,81,83,124,60,129,143,91,105,63,115,229,90,166,112,51,166,57,108,36,60,16,86,10,221,99,252,201,232,7,254,117,155,92,166,189,95,172,202,73,118,149,155,225,22,18,219,26,96,135,8,120,192,52,151,191,176,149,185,97,121,196,119,81,184,28,23,92,66,128,160,183,14,60,183,76,112,226,140,192,184,199,109,144,97,193,23,220,56,130,98,39,101,238,175,188,189,156,78,97,88,161,30,117,192,208,176,20,119,182,165,165,66,131,9,220,31,214,232,161,62,95,114,225,109,255,117,72,111,147,95,222,192,151,159,177,240,78,66,183,157,108,37,31,33,152,227,138,22,232,46,215,52,86,172,175,109,192,38,254,191,69,68,119,235,85,56,225,236,163,63,8,172,79,186,126,52,212,152,38,209,186,108,247,90,124,133,214,230,91,51,10,163,219,194,231,109,49,62,172,201,78,160,49,8,229, -124,207,189,149,67,84,10,42,233,182,55,1,37,85,112,18,199,136,192,69,158,194,106,186,129,12,21,199,116,202,213,45,134,70,124,26,178,31,148,25,187,30,120,208,185,235,152,56,82,153,34,210,143,244,65,37,86,178,141,60,85,248,97,43,111,151,124,228,98,16,165,225,233,199,184,44,174,212,20,250,11,140,33,153,74,141,233,198,114,184,206,136,44,187,130,74,129,96,207,162,87,200,46,168,106,238,50,11,199,73,12,49,38,150,7,221,203,200,70,12,189,220,242,230,116,44,2,54,132,1,88,41,210,221,132,104,3,149,107,144,185,71,33,176,153,47,80,173,81,144,4,145,33,182,158,249,76,168,27,194,86,222,58,196,127,24,180,224,231,88,17,30,48,93,187,11,219,12,10,2,162,16,24,64,167,8,243,32,234,153,64,75,182,111,141,182,145,48,215,195,177,25,72,2,231,224,184,208,190,231,94,82,71,196,184,56,140,67,139,192,165,67,51,24,68,18,68,183,244,6,70,98,22,49,137,143,193,41,129,175,137,36,101,33,102,132,12,77,78,4,22,10,26,53,93,42, -186,231,45,69,13,25,196,161,23,16,36,3,196,157,197,236,28,66,16,209,12,96,7,91,249,228,216,150,115,9,82,10,226,74,30,126,64,136,10,148,155,203,190,226,80,216,35,196,178,169,135,83,120,120,148,173,144,124,204,30,197,48,16,240,1,254,56,70,178,244,186,209,99,41,99,201,158,26,196,19,248,230,31,139,64,94,7,225,103,203,85,214,10,250,71,200,165,32,247,16,160,212,12,230,114,119,3,170,100,64,28,244,37,31,79,235,97,206,161,55,89,144,67,76,240,96,138,133,15,13,63,133,198,160,153,117,65,17,58,80,135,225,133,7,147,35,192,17,111,44,162,9,155,141,35,148,52,152,43,154,14,106,50,114,129,52,221,18,182,56,103,244,143,5,18,48,54,108,155,15,185,168,152,15,40,17,142,63,160,153,141,169,136,28,56,83,91,59,228,247,41,176,130,51,77,202,203,56,174,224,41,4,46,231,69,46,61,112,131,109,174,13,250,86,54,168,21,77,96,89,209,145,225,171,33,253,157,193,252,186,104,199,186,95,9,241,113,180,219,198,99,84,177,108,91,194, -150,10,157,252,3,112,240,15,61,166,72,155,199,157,25,69,45,63,95,1,249,119,141,59,190,170,242,64,145,247,90,246,246,96,194,11,64,251,213,168,1,168,81,192,19,150,77,226,73,62,229,131,71,45,216,128,127,187,178,220,5,219,132,16,97,25,76,24,52,220,117,136,128,251,120,171,199,8,235,67,241,106,81,66,182,190,171,70,10,155,182,130,112,47,35,237,122,38,82,184,8,230,208,235,204,149,172,148,25,82,220,121,152,44,175,146,89,62,139,25,102,57,180,54,113,89,172,166,3,111,80,139,239,34,77,220,5,10,207,67,121,83,115,171,22,234,139,118,70,86,55,128,202,155,35,150,99,249,155,104,54,229,107,16,197,8,174,108,89,178,96,51,107,147,7,58,153,120,238,140,195,137,11,180,89,201,216,54,119,39,41,59,28,231,34,144,155,5,88,2,100,136,241,14,135,72,34,214,33,183,84,117,4,90,139,41,30,45,252,74,251,87,137,40,74,212,189,167,45,172,71,179,172,106,150,201,13,181,245,91,228,195,223,176,219,32,99,20,32,144,19,152,220,93,99,81, -170,96,234,34,237,67,148,83,154,111,132,232,195,76,54,194,124,227,54,4,47,223,199,5,145,72,40,98,160,143,249,35,104,251,50,7,39,64,70,89,80,141,98,94,240,142,202,37,1,110,165,106,116,0,85,238,55,109,66,216,164,156,182,160,76,22,75,54,28,26,38,58,12,151,151,159,9,195,159,219,198,88,72,115,201,51,237,70,251,241,59,81,39,150,240,8,75,125,8,231,146,172,198,11,35,230,130,125,221,192,186,69,254,146,88,170,147,91,204,217,219,252,162,72,225,112,91,107,92,206,112,180,15,207,99,212,78,4,169,59,144,222,239,32,250,21,17,236,96,43,233,78,138,17,156,26,159,42,34,56,111,120,170,58,132,125,243,184,173,144,152,82,207,209,46,97,14,53,156,1,185,8,113,150,95,10,52,25,170,164,178,88,194,84,163,104,73,72,1,132,114,232,87,68,29,25,98,215,169,20,154,242,244,153,207,75,164,213,95,51,216,48,76,22,103,220,44,103,31,85,88,65,203,196,111,254,132,229,1,172,160,173,39,220,159,47,252,242,245,45,96,94,232,61,194,47, -202,160,96,145,235,113,25,171,210,220,185,206,50,214,61,5,171,119,50,95,94,51,118,213,86,144,130,233,234,74,24,126,92,60,122,92,60,218,16,99,200,91,183,121,180,131,7,104,7,111,104,149,248,25,74,175,37,2,201,200,223,86,193,238,87,91,240,140,109,236,171,47,124,126,140,109,252,134,137,66,209,164,20,245,117,109,49,42,39,11,182,123,97,141,9,245,60,80,94,195,96,140,122,104,58,124,223,249,124,113,1,252,152,116,171,110,232,240,49,63,210,87,12,85,211,48,201,76,81,40,27,213,235,194,71,37,159,193,136,206,112,196,160,53,165,143,216,218,52,108,197,227,208,251,132,89,229,8,213,92,1,153,2,30,98,81,234,27,132,167,140,29,226,169,47,177,49,46,56,210,211,204,180,89,55,197,252,210,146,8,52,193,124,106,152,21,134,94,51,62,238,158,211,88,83,137,241,151,143,158,170,88,23,67,109,44,35,140,45,230,115,59,164,88,9,247,213,142,85,137,10,107,26,128,255,149,160,44,5,228,58,210,110,82,193,141,229,127,203,201,53,107,113,255,101,9, -53,235,183,136,21,246,206,202,98,142,111,53,156,173,100,62,138,43,35,55,195,38,252,36,195,245,88,212,6,207,13,111,148,38,134,247,96,135,229,11,34,37,198,248,85,118,3,31,109,178,138,77,230,46,208,172,211,28,55,53,187,230,97,88,98,181,109,77,81,225,49,48,188,67,43,82,223,175,10,234,20,172,115,62,70,136,43,218,67,165,8,241,222,179,171,54,210,154,238,223,146,42,198,136,107,54,174,199,96,113,117,147,92,45,88,252,90,169,99,143,230,89,205,60,139,194,197,245,14,121,143,49,99,109,131,60,166,62,144,39,242,175,155,5,249,68,97,42,182,168,144,159,138,157,63,254,41,68,147,60,239,141,113,25,196,54,41,243,179,184,147,251,164,101,7,27,3,125,124,0,148,98,23,85,210,173,124,47,47,174,62,27,61,13,246,246,125,111,77,177,244,220,5,145,82,47,188,151,105,67,79,120,40,166,2,124,248,244,238,93,200,114,221,99,173,85,18,162,210,194,245,82,36,172,120,34,59,133,21,133,205,168,149,49,84,113,67,233,17,95,27,138,47,65,48,247, -216,153,247,172,228,165,30,133,245,238,224,142,21,9,180,224,236,141,97,219,169,147,236,203,48,146,153,234,169,139,58,70,219,194,35,103,168,5,207,231,68,119,67,240,3,58,49,77,101,159,208,97,247,113,3,75,30,70,98,167,126,86,187,156,228,131,56,237,31,141,103,44,76,228,174,9,151,59,1,73,13,20,172,79,207,170,74,88,175,112,223,178,128,254,162,251,55,206,93,215,230,210,141,138,215,186,130,227,132,162,115,188,158,82,158,175,85,26,26,241,59,150,227,172,100,134,73,5,162,129,80,58,125,55,73,5,209,56,152,43,146,19,85,230,206,237,68,173,59,9,45,69,211,120,252,162,108,132,195,49,43,247,22,208,162,3,133,39,83,60,50,136,195,44,195,171,97,67,120,54,9,229,197,193,34,110,81,127,78,112,183,182,41,72,64,64,51,106,120,227,105,26,210,123,131,32,95,135,193,116,7,240,188,1,235,123,136,46,33,236,156,40,61,102,158,22,47,87,27,77,74,55,75,223,1,166,86,57,63,89,9,134,2,114,249,23,12,220,12,31,6,30,31,246,146,88, -77,68,102,79,210,85,33,251,145,226,13,241,101,199,154,69,169,242,99,205,162,28,75,4,187,247,173,249,7,162,201,156,67,214,30,151,144,186,94,132,235,64,237,60,29,53,171,43,41,48,250,180,222,112,26,7,132,50,59,229,36,34,165,58,75,74,117,150,99,16,110,225,98,158,117,98,205,248,236,44,84,8,76,163,64,123,204,182,46,166,62,124,48,233,156,58,38,131,111,57,28,162,198,132,68,162,208,234,223,14,139,176,56,40,39,49,71,51,240,85,18,193,186,109,116,195,87,88,187,153,113,207,103,178,69,39,59,146,140,250,39,21,113,41,248,29,253,136,192,124,86,56,188,21,128,83,52,18,127,128,237,61,11,71,37,144,67,53,40,30,203,89,146,40,221,96,46,102,3,143,206,108,152,107,55,73,252,175,157,55,212,127,233,46,28,191,177,181,245,128,112,194,21,127,204,233,148,37,249,133,102,203,26,87,117,35,170,243,170,176,244,74,171,131,66,69,101,243,170,171,224,234,209,117,219,122,214,112,169,42,174,240,109,61,167,163,97,209,92,169,52,67,59,222,80,221, -139,12,229,182,66,126,186,207,10,203,206,5,243,169,151,43,246,87,85,192,197,83,45,69,65,46,73,237,91,16,86,224,157,70,141,146,43,51,131,130,195,134,2,162,146,163,111,250,50,137,2,94,95,140,253,133,97,103,212,85,89,129,120,61,155,251,183,185,140,196,214,30,120,193,66,70,146,11,12,124,91,14,28,8,197,122,145,239,143,60,59,225,175,222,210,20,86,16,18,77,53,201,196,176,25,141,142,154,148,115,249,210,6,135,132,60,230,142,130,188,4,48,87,228,43,163,129,172,124,79,108,234,241,59,137,138,118,193,120,145,168,203,247,150,99,205,172,255,225,21,5,208,185,39,230,66,139,217,60,136,73,196,181,66,24,174,141,61,106,240,213,79,126,252,223,152,27,99,203,15,95,88,82,7,4,31,41,76,73,84,230,26,188,88,158,177,223,248,158,17,179,119,94,150,133,244,45,159,204,8,41,7,197,38,174,90,31,47,60,79,220,135,42,10,52,19,69,45,135,243,31,93,211,19,54,152,90,7,13,226,170,143,233,14,213,18,82,109,219,29,171,216,55,47,168,108, -223,105,222,184,102,49,124,44,114,101,153,101,11,25,120,229,185,243,50,117,98,153,60,93,58,48,17,249,9,56,106,19,61,84,41,150,103,41,151,153,225,174,146,25,156,193,254,188,74,184,91,206,214,9,114,85,54,48,157,32,91,91,217,53,235,197,12,162,69,149,144,32,231,86,21,41,136,196,5,217,210,164,85,183,230,11,27,83,146,28,143,53,21,68,144,21,72,18,81,95,81,10,249,129,145,220,150,95,135,48,114,154,42,23,197,81,40,138,16,71,135,226,138,158,128,199,37,192,103,209,154,200,49,73,17,100,66,205,121,52,115,46,96,235,48,170,20,238,65,202,202,203,169,208,10,106,246,172,89,153,221,99,153,124,187,143,28,184,185,24,211,116,80,130,55,221,241,136,100,6,2,0,69,156,126,191,45,170,237,68,31,195,125,49,27,134,80,233,210,241,21,146,127,96,140,2,117,162,0,64,242,83,228,134,195,204,146,154,184,125,83,146,107,178,30,60,223,119,8,123,73,21,198,128,99,234,193,36,13,34,138,81,227,216,135,33,115,86,146,148,35,75,15,101,233,204, -217,36,11,241,17,150,151,227,154,235,248,113,227,240,221,93,30,46,137,182,118,200,239,174,119,201,196,194,19,196,115,248,6,205,216,27,60,231,134,199,107,126,58,58,226,108,105,153,171,196,76,246,40,215,176,228,244,35,241,234,214,104,162,142,47,84,53,188,11,234,239,202,55,233,49,65,72,185,212,174,225,119,131,255,85,40,46,40,6,168,58,251,130,37,191,136,151,220,150,172,220,99,21,33,156,64,88,114,190,236,70,225,114,67,250,2,190,157,140,175,4,85,177,17,190,209,89,230,218,121,161,196,82,206,240,52,124,115,112,222,235,126,35,35,226,213,87,118,255,124,197,12,95,82,154,120,37,108,45,19,88,110,161,216,233,91,227,203,80,78,34,105,19,5,85,75,42,98,176,8,26,12,133,146,206,9,77,201,37,73,48,121,37,94,232,200,194,184,30,107,5,151,145,101,11,163,34,203,194,245,177,50,96,100,44,242,13,51,252,233,179,132,67,101,43,67,33,90,62,171,13,129,140,38,74,49,16,72,36,130,128,42,255,161,214,19,236,151,40,61,69,98,29,173,87,229, -18,20,196,247,154,74,21,127,42,222,60,157,61,104,138,38,242,181,220,83,211,178,226,123,158,43,114,21,198,109,165,212,47,1,178,113,237,89,62,190,118,121,171,62,177,49,45,202,28,147,164,30,75,65,24,113,18,193,80,242,19,128,44,37,255,18,152,173,139,242,108,4,254,188,46,37,242,223,161,254,196,160,25,234,232,101,108,235,55,250,67,108,116,227,178,143,98,4,44,250,16,75,234,114,20,143,237,206,5,157,102,154,67,193,40,206,50,118,227,2,194,127,91,122,243,118,214,54,182,234,182,55,134,202,203,239,242,94,106,81,68,58,60,206,57,22,1,78,40,158,206,32,91,38,242,132,132,24,5,127,60,28,53,197,216,198,183,135,130,227,19,159,163,20,155,184,164,150,142,59,172,16,77,224,28,193,188,41,62,72,145,101,215,80,15,112,22,74,157,111,79,224,219,225,17,128,49,233,0,52,197,59,122,210,46,54,245,26,250,96,186,98,222,136,211,2,202,38,244,51,132,107,209,19,22,59,67,192,131,182,140,21,17,217,21,82,175,138,223,64,29,114,23,239,176,150, -146,170,141,236,95,77,47,201,1,238,142,149,145,90,135,50,229,171,224,82,223,35,67,50,101,67,193,173,65,253,19,8,213,241,35,134,236,48,33,73,143,184,242,235,225,217,33,186,25,89,62,92,53,23,15,145,202,67,148,28,78,139,248,193,24,112,123,182,129,91,141,134,125,225,194,176,53,157,169,17,195,157,231,91,185,67,170,66,85,250,75,7,100,151,105,227,135,77,105,216,73,252,28,28,12,19,125,74,38,19,223,5,220,226,130,71,176,123,203,59,83,98,233,103,122,97,57,137,128,38,221,190,236,147,23,172,26,156,70,244,196,79,235,199,147,213,21,194,211,203,24,99,74,60,189,198,23,187,150,115,244,26,223,227,186,26,63,72,218,127,197,162,204,173,11,230,21,46,105,221,53,139,56,113,132,242,233,21,156,28,78,101,233,188,197,154,185,203,42,46,215,100,201,161,32,233,41,216,161,138,33,9,55,169,254,67,172,161,200,3,63,167,14,157,88,190,88,176,179,112,163,198,159,186,38,191,66,29,243,188,161,30,210,200,207,7,24,206,5,37,227,41,29,95,166,175, -59,75,37,124,91,241,29,138,229,229,162,117,41,35,52,32,62,235,141,201,61,48,152,180,20,157,28,171,16,107,208,229,160,17,249,110,234,4,74,107,72,147,39,208,175,174,98,65,222,10,96,175,74,119,18,226,105,242,85,32,93,46,249,210,196,225,24,114,239,12,182,43,161,182,170,84,151,253,253,146,195,88,163,167,87,197,116,104,123,87,245,192,157,207,204,26,156,124,1,242,239,156,191,28,63,191,196,230,157,123,248,21,44,229,231,76,43,97,161,153,36,172,33,215,104,86,51,147,34,5,104,3,50,252,63,186,192,91,168, +120,156,237,93,121,115,219,182,18,255,42,152,73,155,145,243,100,155,212,97,201,86,155,201,157,102,156,164,158,216,73,255,208,40,22,45,66,22,159,41,82,37,40,31,175,105,63,251,219,5,192,251,166,100,71,78,221,73,109,89,196,177,199,111,23,187,0,8,12,91,228,167,159,148,166,242,72,41,248,239,224,21,157,106,75,211,29,13,141,78,167,63,208,90,221,193,197,225,239,251,3,172,175,66,253,118,79,109,247,187,109,181,211,218,131,31,106,91,109,117,91,237,142,218,111,237,119,250,237,118,95,57,152,152,26,99,163,161,217,234,247,121,165,22,84,106,245,186,45,181,215,233,119,250,106,187,215,111,65,221,150,162,180,148,94,171,171,118,218,253,86,247,64,167,108,50,26,42,80,188,13,197,247,247,218,251,138,170,40,61,85,85,218,173,158,210,238,118,84,181,221,130,38,90,189,150,170,116,15,168,165,143,134,191,237,13,176,66,7,153,234,238,1,233,123,208,90,167,163,64,235,88,173,211,86,219,74,171,221,85,247,187,123,7,103,244,220,176,210,88,234,22,178,212,83,14, +12,151,206,37,71,90,103,240,228,89,119,160,66,213,189,230,222,163,30,116,219,233,66,103,251,200,81,27,170,181,90,123,221,125,181,219,1,146,58,74,235,192,161,127,46,13,135,206,169,229,202,22,12,85,109,169,131,51,181,55,0,18,254,249,231,159,29,181,163,8,73,245,128,22,85,1,186,91,42,124,7,124,244,212,238,190,178,223,237,171,125,165,221,235,180,186,61,96,125,161,57,218,92,114,114,214,105,13,36,31,253,102,255,209,158,186,7,18,85,250,64,127,119,31,26,80,128,9,248,13,130,236,194,191,118,255,192,149,149,177,30,86,218,111,238,63,2,33,181,187,74,111,95,233,117,122,221,14,112,210,82,247,84,16,164,130,252,131,26,14,44,219,153,107,230,104,248,215,233,223,63,191,254,184,253,249,152,12,89,119,64,134,79,158,181,7,29,242,252,131,182,24,61,30,13,153,58,192,146,116,122,240,243,54,25,62,107,40,59,202,14,144,177,213,38,32,187,133,169,185,116,52,108,147,211,95,70,145,103,18,43,240,96,4,237,117,6,109,114,136,127,53,73,81,177,147, +114,197,190,148,43,246,155,198,102,111,172,104,169,167,30,87,200,225,248,96,44,112,29,227,78,182,117,58,124,18,8,162,207,101,211,1,78,182,191,157,220,44,40,177,167,228,130,222,176,29,114,72,230,75,230,146,153,118,73,137,78,233,130,76,236,197,13,252,176,152,235,44,39,174,237,52,201,25,37,195,221,175,250,2,123,220,29,239,30,219,75,103,66,95,217,147,241,238,75,219,114,53,195,162,14,27,239,126,176,47,169,118,102,210,175,100,46,63,141,136,102,233,161,230,237,5,117,52,104,113,252,235,248,87,232,107,10,21,245,157,48,117,39,33,234,46,53,115,73,129,190,19,209,0,211,92,131,77,111,72,8,186,140,76,109,7,41,21,36,144,169,169,93,194,23,134,14,207,140,169,65,117,114,118,67,56,184,168,11,143,191,68,186,250,18,234,234,76,99,198,132,56,64,172,61,39,218,100,66,25,11,154,141,212,146,58,217,254,134,31,12,235,92,136,122,135,124,8,137,144,179,69,150,22,51,206,241,131,199,116,99,171,193,133,74,14,199,143,201,245,22,1,162,102,182,14, +252,184,75,199,194,166,102,208,164,224,154,243,69,77,193,36,239,95,25,16,241,11,77,179,163,238,13,184,102,137,193,136,38,72,32,238,76,115,129,232,249,25,244,206,200,59,75,167,215,158,142,201,149,225,206,242,153,12,4,222,196,206,231,72,207,28,58,16,34,5,6,223,185,216,217,146,1,67,26,195,182,168,236,87,170,96,2,124,208,112,149,38,8,140,124,161,8,32,196,32,255,243,185,227,104,55,248,23,199,5,124,113,76,207,229,243,157,24,123,239,141,11,10,165,110,136,237,206,128,188,143,39,239,3,98,155,62,243,195,39,187,95,93,123,97,76,4,48,95,130,169,143,119,153,51,209,17,155,30,30,199,63,81,107,188,189,100,33,92,66,61,66,70,46,170,159,203,38,183,29,248,250,98,124,26,180,130,127,115,6,236,133,107,216,150,102,6,102,51,34,46,8,152,77,129,98,70,231,26,192,112,2,130,208,76,208,244,242,124,6,58,162,32,183,41,213,64,229,160,36,205,1,137,65,87,196,152,47,108,199,133,226,196,176,160,49,199,184,4,49,251,66,53,184,46,61, +77,160,156,218,30,26,240,23,249,235,47,21,135,200,55,13,181,213,223,122,203,127,62,83,9,127,12,34,126,25,24,50,121,69,65,128,230,104,244,247,223,161,86,186,129,51,225,191,27,227,45,238,79,164,243,104,108,97,161,214,32,220,208,78,240,7,112,97,17,240,165,238,13,47,46,201,131,250,248,161,227,125,72,244,33,44,129,127,126,60,110,26,150,27,235,52,226,205,176,108,224,205,194,143,198,143,241,251,103,109,194,16,96,161,7,208,226,200,35,252,247,132,154,194,222,141,83,12,128,251,36,252,10,3,127,227,218,57,222,144,224,191,226,22,123,40,252,151,64,215,246,55,225,46,3,241,116,50,228,46,112,38,76,119,252,203,225,184,41,156,205,248,41,138,72,62,252,2,159,83,36,5,58,199,255,183,136,40,54,58,229,141,132,5,242,203,72,186,255,102,196,145,133,139,60,245,165,105,233,215,158,60,19,45,75,231,153,170,5,240,32,190,212,79,102,6,119,14,115,116,45,33,233,128,211,113,192,0,64,208,220,136,209,67,67,203,232,111,162,62,107,248,243,182,71,10, +55,182,146,238,107,135,188,0,143,17,60,97,161,225,135,193,64,64,172,229,252,76,84,240,28,172,215,21,82,95,22,191,158,58,184,127,67,101,213,81,146,168,157,170,165,77,210,139,32,211,87,204,237,42,35,100,60,146,225,237,111,135,24,167,248,223,75,126,182,191,125,17,125,84,117,136,71,203,51,19,136,255,32,134,223,247,6,248,22,223,33,166,168,91,215,199,193,184,61,110,138,143,39,190,134,67,226,190,180,13,93,184,41,93,207,240,96,9,221,250,42,186,136,57,176,112,149,147,244,42,215,190,78,161,67,12,4,64,61,92,59,34,134,88,104,134,131,174,12,6,157,192,247,128,163,123,103,193,115,67,231,170,134,20,130,199,38,12,11,62,231,6,232,21,59,41,10,11,139,219,203,232,20,194,113,234,80,11,64,131,165,46,60,229,230,150,242,3,9,15,89,17,152,92,8,144,68,191,188,246,32,82,194,166,117,253,8,205,40,172,104,105,203,133,154,198,138,245,181,157,110,198,107,82,56,225,236,99,156,228,69,37,50,36,198,0,38,60,164,65,212,97,218,87,226,43, +140,66,92,99,78,33,234,95,186,188,45,38,198,175,75,175,49,200,138,93,199,190,145,161,123,12,42,241,182,239,3,74,170,224,36,140,17,233,227,51,20,86,211,13,164,168,56,164,83,174,110,145,50,224,83,159,125,175,204,196,118,32,134,89,216,150,142,158,91,23,147,38,129,62,168,196,74,186,145,199,10,111,182,242,118,33,98,67,49,136,210,240,244,83,88,22,151,229,20,250,6,98,235,84,165,198,66,73,84,167,44,187,130,74,129,96,199,160,151,200,46,168,106,97,51,3,195,72,28,253,166,134,3,221,203,49,80,164,36,220,242,22,116,34,18,89,132,1,88,41,210,221,132,44,12,149,171,145,133,67,33,225,91,44,81,173,65,242,8,25,51,182,158,250,76,168,27,210,121,222,58,142,192,154,32,38,84,132,39,146,87,246,210,212,189,130,128,40,4,6,208,41,162,70,200,6,167,208,146,233,26,227,109,36,204,118,48,103,1,146,192,57,88,54,180,239,216,23,212,18,185,63,166,55,208,34,112,105,209,20,6,145,4,209,45,189,134,145,152,5,76,226,99,112,74,224, +107,2,73,25,136,25,33,67,157,19,129,133,188,70,117,155,138,238,121,75,65,67,26,177,232,185,230,66,78,229,133,27,162,25,192,14,182,242,217,50,13,235,2,164,228,135,131,152,150,65,234,14,148,235,73,95,113,40,236,17,114,252,216,195,25,60,60,74,87,72,54,102,143,66,24,240,248,0,127,28,34,89,122,221,224,177,148,177,100,175,28,196,35,248,230,31,243,64,94,7,225,167,201,42,107,5,253,3,228,98,144,219,4,40,53,189,57,174,219,1,85,52,32,246,250,146,143,103,245,48,103,209,235,52,200,33,38,120,48,197,252,135,154,27,67,163,215,204,186,160,8,29,148,135,225,57,207,205,28,209,88,64,19,54,27,70,40,105,48,91,52,237,213,100,228,28,105,186,33,108,121,198,232,159,75,36,96,162,153,38,31,114,81,49,31,81,34,28,127,64,51,155,80,17,57,112,166,182,118,200,31,51,96,5,103,224,40,47,99,217,130,39,31,184,156,23,57,37,203,13,182,185,54,232,27,233,160,46,105,2,73,69,7,134,95,14,233,239,53,230,214,69,59,214,253,78, +136,15,163,221,212,30,162,138,164,109,9,91,202,117,242,27,224,224,55,61,166,136,155,199,173,25,69,45,63,95,1,249,183,141,59,62,171,178,161,200,123,45,123,219,152,240,2,208,126,57,110,240,245,128,66,60,97,217,40,158,228,83,62,120,212,130,13,248,183,75,195,94,178,251,16,34,36,193,132,65,195,109,135,8,184,37,98,245,24,97,125,40,94,45,74,72,215,119,213,72,225,190,205,32,220,201,72,187,158,68,10,39,193,44,122,149,58,147,21,51,67,138,43,178,211,228,44,153,225,178,144,97,22,67,235,62,78,139,213,116,224,13,106,240,213,245,169,189,68,225,57,40,111,170,111,213,66,125,222,202,200,234,6,80,121,113,196,176,12,247,62,154,77,241,28,68,62,130,43,91,150,44,216,76,91,228,129,78,166,142,61,231,112,226,2,109,86,50,182,251,187,146,148,30,142,115,17,200,197,2,44,1,50,196,120,135,67,36,18,235,144,27,90,118,4,90,139,41,30,45,221,74,235,87,145,40,74,212,189,163,37,172,7,179,172,106,150,209,5,181,245,91,228,230,47,216, +221,35,99,20,32,144,9,76,230,170,177,40,149,147,186,72,251,16,229,74,229,27,62,250,112,83,48,97,174,118,227,131,151,175,227,130,72,36,20,49,208,199,125,117,104,251,114,111,162,135,140,162,160,26,197,188,228,29,21,75,2,220,74,213,232,0,170,220,237,182,9,97,147,50,109,65,153,44,19,54,236,27,38,58,12,155,151,159,11,195,95,152,218,68,72,51,225,153,118,131,245,248,157,160,19,67,120,132,68,31,194,185,68,171,241,194,136,57,111,93,215,179,110,177,71,74,76,213,201,37,230,244,101,126,81,36,119,184,173,53,46,167,56,218,205,243,24,181,55,130,212,29,72,239,118,16,253,142,8,182,176,149,120,39,249,8,142,141,79,21,17,156,53,60,85,29,194,126,120,220,86,216,152,82,207,209,38,48,135,26,78,129,92,128,56,195,45,4,154,12,85,98,187,88,252,173,70,193,148,80,9,16,202,161,191,36,234,200,8,187,142,109,161,41,222,62,243,37,65,90,253,57,131,123,134,201,252,29,55,201,221,71,21,102,208,82,241,155,157,176,108,192,12,218,122,194, +253,197,210,45,158,223,2,230,133,222,3,252,162,12,114,38,185,30,166,177,42,229,206,117,166,177,238,40,88,189,149,124,121,205,216,45,55,131,228,165,171,43,97,248,97,242,232,97,242,232,158,24,67,214,188,205,131,29,108,160,29,188,165,85,226,103,40,189,150,8,36,101,255,118,25,236,126,183,9,207,208,194,126,249,137,207,79,161,133,95,127,163,80,144,148,162,190,174,12,70,101,178,96,218,231,198,132,80,199,1,229,53,52,198,168,131,166,195,215,157,207,150,231,192,143,78,183,234,134,14,159,178,35,253,146,161,106,28,38,169,91,20,138,70,245,186,240,41,179,159,65,11,222,225,8,65,107,70,31,176,117,223,176,21,142,67,239,18,102,149,35,84,125,5,100,10,120,136,73,169,31,16,158,50,118,8,111,125,9,141,113,222,43,61,205,84,155,181,99,204,39,166,68,160,9,230,82,77,175,48,244,234,225,113,247,140,134,154,138,140,191,124,244,44,139,117,49,212,134,118,132,177,229,98,97,250,20,151,194,125,181,215,170,68,133,53,13,192,255,74,80,22,2,114,29,219, +110,98,193,141,225,254,200,155,107,214,226,254,139,54,212,172,223,34,86,88,59,43,138,57,126,212,112,182,146,249,148,156,25,185,30,53,225,39,25,173,199,162,238,113,110,120,93,42,49,188,3,59,44,158,16,41,48,198,239,178,26,248,96,147,85,108,50,115,130,102,157,230,120,95,119,215,108,134,37,86,91,214,20,21,30,2,195,91,180,162,242,235,85,94,157,156,121,206,135,8,113,69,123,168,20,33,222,249,238,170,123,105,77,119,111,73,21,99,196,53,27,215,67,176,184,186,73,174,22,44,126,175,173,99,15,230,89,205,60,243,194,197,245,14,121,15,49,99,109,131,60,166,46,144,39,246,95,55,115,246,19,249,91,177,69,133,236,173,216,217,227,95,137,104,146,239,123,99,92,6,161,69,202,236,93,220,209,117,210,162,23,27,61,125,124,4,148,98,23,85,182,91,185,78,86,92,125,58,126,226,173,237,187,206,154,98,233,133,13,34,165,142,127,46,211,61,125,195,163,228,86,128,143,159,223,191,247,89,174,251,90,107,149,13,81,113,225,58,49,18,86,124,35,59,134,149, +18,139,81,43,99,168,226,130,210,3,190,238,41,190,4,193,220,99,167,158,179,146,181,245,200,175,119,11,103,172,72,160,121,239,222,104,166,25,123,147,61,9,35,185,83,61,118,80,199,120,91,120,228,20,181,224,251,57,193,217,16,252,5,157,144,166,210,223,208,97,119,113,2,75,22,70,66,111,253,172,118,56,201,199,228,233,187,222,70,238,154,112,185,21,144,212,64,193,250,244,92,86,9,235,21,238,59,230,209,159,119,254,198,153,109,155,92,186,65,241,90,71,112,156,80,116,142,87,51,202,247,107,21,134,70,252,236,249,48,43,169,97,82,142,104,32,148,142,159,77,82,65,52,22,238,21,201,136,42,51,115,59,81,235,86,66,75,209,180,56,122,61,127,132,195,49,43,243,20,208,188,23,10,249,49,209,252,122,1,134,71,195,250,240,108,18,202,139,131,69,220,160,254,44,34,239,28,208,5,9,8,104,70,53,103,50,139,67,58,235,140,245,77,158,223,67,116,9,97,103,68,233,33,243,52,120,185,218,104,42,117,178,244,45,96,106,149,247,39,43,193,80,64,46,251,128, +1,60,231,125,19,240,184,217,83,98,53,17,153,158,164,151,133,236,39,138,55,103,20,189,214,44,74,21,191,214,44,202,177,72,176,123,215,154,223,16,77,102,188,100,237,112,9,149,215,139,112,29,168,157,39,225,203,52,202,42,201,51,250,184,222,48,141,195,187,53,204,148,203,53,132,82,173,132,82,83,174,87,224,22,46,242,172,19,99,206,179,51,95,33,144,70,129,246,152,105,156,207,92,248,160,211,5,181,116,6,223,114,56,4,141,9,137,4,161,213,191,29,22,126,113,102,70,115,52,13,175,216,241,230,109,131,19,190,252,218,205,148,115,62,163,45,90,233,145,100,208,63,169,136,75,239,146,12,4,230,211,220,225,45,7,156,41,119,101,64,123,193,213,24,204,172,8,197,99,153,37,137,210,13,102,227,110,224,241,169,9,185,118,147,132,255,218,121,75,221,151,246,210,114,27,91,91,27,132,19,174,248,99,78,103,232,134,142,20,141,151,117,35,101,243,42,191,244,74,179,131,66,69,69,121,213,165,119,244,232,186,109,61,109,184,44,43,46,255,22,179,225,120,148,151,43, +21,238,208,14,55,84,247,32,67,185,172,144,189,221,103,133,105,231,156,124,234,229,138,253,85,21,112,126,170,85,82,144,9,169,253,8,194,242,188,19,222,219,149,10,67,207,110,189,130,163,70,9,68,69,71,223,248,97,18,57,188,62,159,184,75,205,204,186,216,167,96,6,226,53,222,35,150,201,72,104,238,129,23,204,101,36,58,193,192,151,229,192,129,240,139,202,2,223,31,120,118,194,175,36,84,74,204,32,68,154,106,146,169,102,50,26,188,106,82,204,229,75,19,28,146,127,201,90,218,40,200,75,4,247,174,165,250,202,96,32,43,94,19,155,57,252,76,162,188,85,48,94,36,232,242,131,97,25,115,227,127,120,68,1,116,238,136,92,104,57,95,120,49,137,56,86,8,195,53,188,51,138,207,126,242,215,255,181,133,54,49,92,255,194,146,58,32,248,68,33,37,41,147,107,240,98,89,198,126,237,58,90,200,222,121,89,230,211,151,124,51,195,167,28,20,27,57,106,125,178,116,28,113,30,170,40,208,140,20,53,44,206,127,112,76,143,223,96,108,30,212,139,171,62,197,59, +44,183,33,213,52,237,73,25,251,230,5,75,219,119,156,55,174,89,12,31,243,92,89,106,217,92,6,94,57,246,162,72,157,88,38,75,151,22,36,34,191,2,71,109,162,250,42,197,242,44,230,50,83,220,85,116,7,167,183,62,95,38,220,45,102,235,196,14,93,149,152,53,48,157,216,222,5,138,201,154,245,98,6,209,98,153,144,32,227,84,21,41,136,200,1,217,210,164,203,46,205,231,54,86,74,114,60,214,44,33,130,180,64,146,136,250,37,165,144,29,24,201,101,249,117,8,35,163,169,98,81,28,249,162,240,113,116,40,142,232,241,120,76,0,62,141,214,200,30,147,24,65,58,212,92,4,153,115,14,91,135,65,37,127,13,82,86,78,110,133,46,161,102,199,152,23,217,61,150,201,182,251,192,129,235,203,9,141,7,37,120,210,29,143,72,230,32,0,80,132,119,97,228,104,39,248,232,175,139,153,48,132,74,151,142,87,235,254,137,49,10,212,9,2,0,201,79,158,27,246,119,150,212,196,237,219,130,189,38,235,193,243,93,135,176,23,180,196,24,112,76,29,72,210,32,162, +24,55,142,93,24,50,231,5,155,114,100,233,145,44,157,154,77,50,31,31,126,121,57,174,217,150,27,54,14,215,222,229,225,146,104,107,135,252,97,59,23,76,76,60,65,60,135,55,11,135,110,54,94,104,14,175,249,249,232,40,103,150,152,201,30,229,28,150,76,63,34,87,90,7,137,58,94,52,173,57,231,212,221,149,55,233,49,65,72,177,212,174,240,170,81,254,87,174,184,174,248,21,163,167,95,177,228,215,156,75,114,131,153,123,172,34,132,227,9,75,230,203,118,16,46,55,164,47,224,203,201,120,85,114,25,27,17,151,215,22,184,246,21,46,167,37,94,31,43,187,127,62,99,134,119,248,70,174,157,173,101,2,201,22,242,157,190,49,185,240,229,36,54,109,162,160,106,73,69,12,22,94,131,190,80,226,123,66,99,114,137,18,76,94,137,11,29,19,55,191,230,8,163,34,203,194,245,177,34,96,84,187,16,87,58,84,182,50,20,162,23,220,214,130,64,74,19,133,24,240,36,18,64,160,44,255,190,214,35,236,23,40,61,70,98,29,173,87,229,18,20,196,215,154,10,21, +63,204,186,188,152,248,77,100,107,185,87,78,203,101,239,44,174,198,149,31,183,21,82,159,0,100,227,202,49,92,188,142,126,171,62,177,33,45,202,61,38,81,61,22,130,48,224,36,128,161,228,199,3,89,76,254,5,48,91,23,229,233,8,124,177,46,37,130,229,156,192,152,134,31,113,108,131,145,59,14,77,249,245,232,244,16,5,33,203,251,211,75,226,33,246,120,136,183,105,99,252,192,119,144,211,249,194,212,112,78,94,51,207,109,208,239,108,94,142,24,238,90,222,201,165,132,50,84,197,191,180,96,152,78,29,90,15,155,114,228,136,186,208,131,131,81,164,79,201,100,228,59,143,91,204,12,188,101,14,222,89,41,150,94,208,115,195,138,88,126,188,125,217,39,47,88,213,139,7,244,132,95,107,13,239,234,44,225,199,47,66,140,149,226,233,53,222,128,88,204,209,107,188,240,112,53,126,144,180,255,138,236,229,198,134,188,203,207,253,110,155,69,140,176,160,124,60,213,201,224,84,150,206,202,106,32,233,168,152,215,164,201,33,103,119,128,55,149,27,66,18,206,230,254,7,18, +27,177,97,242,140,90,16,149,187,34,179,53,112,70,147,223,251,142,103,13,227,134,72,168,135,52,242,141,180,154,117,14,217,195,140,78,46,226,231,2,197,118,70,26,225,169,188,100,94,181,46,101,248,6,196,195,195,144,220,61,131,137,75,209,202,176,10,121,120,76,33,104,196,198,144,242,4,74,107,136,147,39,208,95,94,197,130,188,21,192,94,149,238,40,196,227,228,151,129,116,177,228,11,119,216,133,144,123,107,176,93,9,181,85,165,154,244,247,9,135,177,70,79,95,22,211,190,237,93,214,3,119,54,51,107,112,242,57,200,191,117,254,50,252,124,130,205,91,247,240,43,88,202,139,84,43,97,190,153,68,172,33,211,104,86,51,147,124,5,112,169,43,3,50,250,63,74,122,125,217, diff --git a/uppsrc/Core/src.tpp/Any$en-us.tpp b/uppsrc/Core/src.tpp/Any$en-us.tpp index b8131f71d..2121d550f 100644 --- a/uppsrc/Core/src.tpp/Any$en-us.tpp +++ b/uppsrc/Core/src.tpp/Any$en-us.tpp @@ -85,4 +85,4 @@ ck`_]_Any[@(0.0.255) `&]_[*@3 s])&] [s2; Pick operator. Transfers content while destroying source.&] [s7; [%-*C@3 s]-|Source Any.&] [s3;%- &] -[s0;%- ] \ No newline at end of file +[s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/AppEnv$en-us.tpp b/uppsrc/Core/src.tpp/AppEnv$en-us.tpp index 2472cc108..36dd50efc 100644 --- a/uppsrc/Core/src.tpp/AppEnv$en-us.tpp +++ b/uppsrc/Core/src.tpp/AppEnv$en-us.tpp @@ -17,6 +17,7 @@ your application and system environment.&] [s0;%% [* Implemented in:]&] [s0; [%% -|]Core`\App.[@(0.0.255) h]&] [s0; -|Core`\App.[@(0.0.255) cpp]&] +[s3;%% &] [s0;%% &] [ {{10000F(128)G(128)@1 [s0;%% [* Function List]]}}&] [s3; &] @@ -45,8 +46,8 @@ where you application`'s binary resides.&] t]_[@(0.0.255) char]_`*[*@3 fp])&] [s2;%% Returns the absolute path of a file that is found in the current user`'s home folder.&] -[s2;%% [*@(129.0.0) fp][@(129.0.0) ..................................................]the - name of the file&] +[s7;%% [*@3 fp]..................................................the +name of the file&] [s3; &] [s4; &] [s5;:GetExeTitle`(`): [_^String^ String]_[* GetExeTitle]()&] @@ -139,5 +140,5 @@ onst]_[@(0.0.255) char]_`*[*@3 dir])&] [s2;%% Sets the current user`'s home folder.&] [s2;%% [*@(129.0.0) dir]................................................the URL that will be opened in the browser&] -[s1; &] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/Array$en-us.tpp b/uppsrc/Core/src.tpp/Array$en-us.tpp index afed4d325..93c4e6bea 100644 --- a/uppsrc/Core/src.tpp/Array$en-us.tpp +++ b/uppsrc/Core/src.tpp/Array$en-us.tpp @@ -10,9 +10,10 @@ topic "Array"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_}%EN-US -[s0;i448;a25;kKO9;:noref:%- [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T][@(0.0.255) >]&] +[s0;i448;a25;kKO9;%- [*@3;4 Array]&] +[s1;:noref:%- [@(0.0.255)3 template][3 _<][@(0.0.255)3 class][3 _][*@4;3 T][@(0.0.255)3 >]&] [s1;:Array`:`:class:%- [@(0.0.255) class]_[* Array]_:_[@(0.0.255) public]_[*@3 MoveableAndDeep -CopyOption][@(0.0.255) <]_[* Array][@(0.0.255) <][*@4 T][@(0.0.255) >]_>&] +CopyOption][@(0.0.255) <]_[* Array][@(0.0.255) <][*@4 T][@(0.0.255) >]_>_&] [s8; [*@4 T]-|Type or base class of elements stored in the Array. There is no common requirement for T.&] [s9; The most universal form of basic random access container. Its @@ -51,6 +52,34 @@ constructor) and testing for 0 (that is NULL) pointer.&] oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick and optional deep copy] transfer semantics.&] [s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] +[s3;%- &] +[s5;:Array`:`:Array`(`):%- [* Array]()&] +[s2; Default constructor. Constructs an empty Array.&] +[s3;%- &] +[s4;%- &] +[s5;:Array`:`:Array`(pick`_ Array`&`):%- [* Array]([@(0.128.128) pick`_]_[* Array][@(0.0.255) `& +]_[*@3 v])&] +[s2; Pick constructor. Transfers the source Array in low constant +time, but destroys it by picking. &] +[s7; [*@3 v]-|Source Array.&] +[s3; &] +[s4; &] +[s5;:Array`:`:Array`(const Array`&`,int`):%- [* Array]([@(0.0.255) const]_[* Array][@(0.0.255) `& +]_[*@3 v], [@(0.0.255) int])&] +[s2; Optional deep copy constructor.&] +[s6; Requires T to have deep copy constructor or optional deep copy +constructor if the Array stores only objects of type T.&] +[s6; Requires polymorphic deep copy if the Array stores also objects +of type derived from T.&] +[s7; [*@3 v]-|Source Array.&] +[s3; &] +[s4; &] +[s5;:Array`:`:`~Array`(`):%- [@(0.0.255) `~][* Array]()&] +[s2; Destructor. Invokes the destructor of every element in the Array.&] +[s3;%- &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&] [s4;H0;%- &] [s5;:Array`:`:Add`(`):%- [*@4 T][@(0.0.255) `&]_[* Add]()&] @@ -427,7 +456,7 @@ onst]&] [s2; Drops the last element in the Array, giving up ownership (same as Detach(GetCount() `- 1)). Client is responsible for deletion of element.&] -[s0; Invalidates iterators to the Array.&] +[s6; Invalidates iterators to the Array.&] [s7; [*/ Return value]-|Pointer to element allocated on the heap.&] [s3;%- &] [s4;%- &] @@ -488,21 +517,6 @@ Arrays (those storing objects derived from T).&] [s7; [*C@3 s]-|Target/source stream.&] [s3;%- &] [s4;%- &] -[s5;:Array`:`:Array`(`):%- [* Array]()&] -[s2; Default constructor. Constructs an empty Array.&] -[s3;%- &] -[s4;%- &] -[s5;:Array`:`:`~Array`(`):%- [@(0.0.255) `~][* Array]()&] -[s2; Destructor. Invokes the destructor of every element in the Array.&] -[s3;%- &] -[s4;%- &] -[s5;:Array`:`:Array`(pick`_ Array`&`):%- [* Array]([@(0.128.128) pick`_]_[* Array][@(0.0.255) `& -]_[*@3 v])&] -[s2; Pick constructor. Transfers the source Array in low constant -time, but destroys it by picking. &] -[s7; [*C@3 v]-|Source Array.&] -[s3;%- &] -[s4;%- &] [s5;:Array`:`:operator`=`(pick`_ Array`&`):%- [@(0.0.255) void]_[* operator`=]([@(0.128.128) p ick`_]_[_^Array^ Array][@(0.0.255) `&]_[*@3 v])&] [s2; Pick operator. Transfers the source Array in low constant time, @@ -510,16 +524,6 @@ but destroys it by picking.&] [s7; [*C@3 v]-|Source Array.&] [s3;%- &] [s4;%- &] -[s5;:Array`:`:Array`(const Array`&`,int`):%- [* Array]([@(0.0.255) const]_[* Array][@(0.0.255) `& -]_[*@3 v], [@(0.0.255) int])&] -[s2; Optional deep copy constructor.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor if the Array stores only objects of type T.&] -[s6; Requires polymorphic deep copy if the Array stores also objects -of type derived from T.&] -[s7; [*C@3 v]-|Source Array.&] -[s3;%- &] -[s4;%- &] [s5;:Array`:`:ValueType`:`:typedef:%- [@(0.0.255) typedef]_T_[* ValueType]&] [s2; Typedef of T for use in templated algorithms.&] [s3;%- &] @@ -589,4 +593,5 @@ in simple constant time operation.&] elements in an Array without any requirements for T.&] [s7; [*C@3 a]-|Iterator to first element.&] [s7; [*C@3 b]-|Iterator to second element.&] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp b/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp index d61f00d34..47afe154c 100644 --- a/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp +++ b/uppsrc/Core/src.tpp/ArrayIndex$en-us.tpp @@ -9,161 +9,166 @@ topic "ArrayIndex"; [l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param] [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] -[{_}%EN-US -[s1;:noref:%- [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T], [@(0.0.255) class]_[*@4 HashFn -]_`=_StdHash[@(0.0.255) <][*@4 T][@(0.0.255) >]_>&] -[s1;:ArrayIndex`:`:class:%- [@(0.0.255) class]_[* ArrayIndex]_:_[@(0.0.255) private]_[*@3 Move -ableAndDeepCopyOption][@(0.0.255) <]_[* ArrayIndex][@(0.0.255) <][*@4 T], +[{_} +[s1; [*@3;4 ArrayIndex]&] +[s1;:noref: [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T], [@(0.0.255) class]_[*@4 HashFn]_ +`=_StdHash[@(0.0.255) <][*@4 T][@(0.0.255) >]_>&] +[s1;:ArrayIndex`:`:class: [@(0.0.255) class]_[* ArrayIndex]_:_[@(0.0.255) private]_[*@3 Moveab +leAndDeepCopyOption][@(0.0.255) <]_[* ArrayIndex][@(0.0.255) <][*@4 T], [*@4 HashFn]_>_>, [@(0.0.255) public]_[*@3 AIndex][@(0.0.255) <][*@4 T], [_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >], [*@4 HashFn][@(0.0.255) >]_&] -[s8; [*@4 T]-|Type or base class of elements stored in Array. There +[s8;%% [*@4 T]-|Type or base class of elements stored in Array. There is no common requirement for T.&] -[s8; [*@4 HashFn]-|Hashing class. Must have defined unsigned operator()(const +[s8;%% [*@4 HashFn]-|Hashing class. Must have defined unsigned operator()(const T`& x) method returning hash value for elements. Defaults to StdHash which requires unsigned GetHashValue(const T`&) function returning hash value of elements to be defined.&] -[s9; Array flavor of index. Inherits most of its functionality from -[^topic`:`/`/Core`/src`/AIndex`$en`-us^ AIndex] and adds only members -specific for its flavor.&] -[s9; Like any other NTL container, ArrayIndex is a [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ m +[s9;%% Array flavor of index. Inherits most of its functionality +from [^topic`:`/`/Core`/src`/AIndex`$en`-us^ AIndex] and adds only +members specific for its flavor.&] +[s9;%% Like any other NTL container, ArrayIndex is a [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ m oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick and optional deep copy] transfer semantics. Optional deep copy operator is inherited from AIndex class. Pick operator is implicitly defined by composition.&] -[s3;%- &] -[ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&] -[s4;H0;%- &] -[s5;:ArrayIndex`:`:Add`(const T`&`,unsigned`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) cons -t]_[*@4 T][@(0.0.255) `&]_[*@3 x], [@(0.0.255) unsigned]_[*@3 `_hash])&] -[s2; Adds a new element with a precomputed hash value. The precomputed +[s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0;%% [* Constructor Detail]]}}&] +[s3; &] +[s5;:ArrayIndex`:`:ArrayIndex`(`): [* ArrayIndex]()&] +[s2;%% Constructor. Constructs an empty ArrayIndex.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:ArrayIndex`(pick`_ ArrayIndex`&`): [* ArrayIndex]([@(0.128.128) pick`_ +]_[* ArrayIndex][@(0.0.255) `&]_[*@3 s])&] +[s2;%% Pick constructor. Transfers source Index in low constant time, +but destroys it by picking.&] +[s7;%% [*C@3 s]-|Source ArrayIndex.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:ArrayIndex`(const ArrayIndex`&`,int`): [* ArrayIndex]([@(0.0.255) cons +t]_[* ArrayIndex][@(0.0.255) `&]_[*@3 s], [@(0.0.255) int])&] +[s2;%% Optional deep copy constructor.&] +[s6;%% Requires T to have deep copy constructor or optional deep +copy constructor.&] +[s7;%% [*C@3 s]-|Source ArrayIndex.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:ArrayIndex`(pick`_ Array``&`): [* ArrayIndex]([@(0.128.128) pick`_ +]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 s])&] +[s2;%% Pick`-constructs ArrayIndex from an Array. Transfers source +container in low constant time, but destroys it by picking.&] +[s7;%% [*C@3 s]-|Source Array.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:ArrayIndex`(const Array``&`,int`): [* ArrayIndex]([@(0.0.255) cons +t]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 s], [@(0.0.255) int])&] +[s2;%% Deep`-copy constructs ArrayIndex from Array.&] +[s6;%% Requires T to have deep copy constructor or optional deep +copy constructor.&] +[s7;%% [*C@3 s]-|Source Vector.&] +[s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0;%% [* Public Member List]]}}&] +[s4;H0; &] +[s5;:ArrayIndex`:`:Add`(const T`&`,unsigned`): [@(0.0.255) void]_[* Add]([@(0.0.255) const]_ +[*@4 T][@(0.0.255) `&]_[*@3 x], [@(0.0.255) unsigned]_[*@3 `_hash])&] +[s2;%% Adds a new element with a precomputed hash value. The precomputed hash value must be the same as the hash value that would be the result of HashFn. The benefit of using a precomputed hash value is that sometimes you can compute hash`-value as the part of an other process, like fetching a string from an input stream. This method has to be reimplemented in ArrayIndex (using simple forwarding) due to overloading of [* Add] in other forms.&] -[s6; Requires T to have deep copy constructor.&] -[s6; Invalidates iterators to the ArrayIndex.&] -[s7; [*C@3 x]-|Element to add.&] -[s7; [*C@3 `_hash]-|Precomputed hash value.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Add`(const T`&`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& +[s6;%% Requires T to have deep copy constructor.&] +[s6;%% Invalidates iterators to the ArrayIndex.&] +[s7;%% [*C@3 x]-|Element to add.&] +[s7;%% [*C@3 `_hash]-|Precomputed hash value.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Add`(const T`&`): [@(0.0.255) void]_[* Add]([@(0.0.255) const]_[*@4 T][@(0.0.255) `& ]_[*@3 x])&] -[s2; Adds a new element to Index. This method has to be reimplemented +[s2;%% Adds a new element to Index. This method has to be reimplemented in ArrayIndex (using simple forwarding) due to overloading of [* Add] in other forms.&] -[s6; Requires T to have deep copy constructor.&] -[s6; Invalidates iterators to the ArrayIndex.&] -[s7; [*C@3 x]-|Element to add.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Set`(int`,const T`&`,unsigned`):%- [@(0.0.255) void]_[* Set]([@(0.0.255) i +[s6;%% Requires T to have deep copy constructor.&] +[s6;%% Invalidates iterators to the ArrayIndex.&] +[s7;%% [*C@3 x]-|Element to add.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Set`(int`,const T`&`,unsigned`): [@(0.0.255) void]_[* Set]([@(0.0.255) i nt]_[*@3 i], [@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 x], [@(0.0.255) unsigned]_[*@3 `_ha sh])&] -[s2; Replaces the element at the specified position with a new element -with the specified value, using a precomputed hash`-value. Speed -of this operation depends on the total number of elements with -the same value as the specified one in ArrayIndex. This method -has to be reimplemented in ArrayIndex (using simple redirection) +[s2;%% Replaces the element at the specified position with a new +element with the specified value, using a precomputed hash`-value. +Speed of this operation depends on the total number of elements +with the same value as the specified one in ArrayIndex. This +method has to be reimplemented in ArrayIndex (using simple redirection) due to overloading of [* Set] in other forms.&] -[s6; Requires T to have deep copy constructor.&] -[s6; Invalidates iterators to the ArrayIndex.&] -[s7; [*C@3 i]-|Position of element.&] -[s7; [*C@3 x]-|Value to set.&] -[s7; [*C@3 `_hash]-|Precomputed hash value.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Set`(int`,const T`&`):%- [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i -], [@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 x])&] -[s2; Replaces element at specified position with new element with +[s6;%% Requires T to have deep copy constructor.&] +[s6;%% Invalidates iterators to the ArrayIndex.&] +[s7;%% [*C@3 i]-|Position of element.&] +[s7;%% [*C@3 x]-|Value to set.&] +[s7;%% [*C@3 `_hash]-|Precomputed hash value.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Set`(int`,const T`&`): [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i], + [@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 x])&] +[s2;%% Replaces element at specified position with new element with specified value. Speed of this operation depends on the total number of elements with the same value as the specified one in ArrayIndex. This method has to be reimplemented in ArrayIndex (using simple redirection) due to overloading of [* Set] in other forms.&] -[s6; Requires T to have deep copy constructor.&] -[s6; Invalidates iterators to the ArrayIndex.&] -[s7; [*C@3 i]-|Position of element.&] -[s7; [*C@3 x]-|Value to set.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Add`(T`*`,unsigned`):%- [@(0.0.255) void]_[* Add]([*@4 T]_`*[*@3 newt], +[s6;%% Requires T to have deep copy constructor.&] +[s6;%% Invalidates iterators to the ArrayIndex.&] +[s7;%% [*C@3 i]-|Position of element.&] +[s7;%% [*C@3 x]-|Value to set.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Add`(T`*`,unsigned`): [@(0.0.255) void]_[* Add]([*@4 T]_`*[*@3 newt], [@(0.0.255) unsigned]_[*@3 `_hash])&] -[s2; Adds a new element created on the heap to the ArrayIndex using +[s2;%% Adds a new element created on the heap to the ArrayIndex using a precomputed hash value. The element is specified by a pointer to the object. ArrayIndex takes over ownership of the pointed element. This variant allows the use of an ArrayIndex as a polymorphic container, because the type of the added element can be either T or a type derived from T. No constructor is applied. &] -[s7; [*C@3 newt]-|Element created on the heap.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Add`(T`*`):%- [@(0.0.255) void]_[* Add]([*@4 T]_`*[*@3 newt])&] -[s2; Adds a new element to the ArrayIndex. The element is specified +[s7;%% [*C@3 newt]-|Element created on the heap.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Add`(T`*`): [@(0.0.255) void]_[* Add]([*@4 T]_`*[*@3 newt])&] +[s2;%% Adds a new element to the ArrayIndex. The element is specified by a pointer to the object. ArrayIndex takes over ownership of the pointed element. This variant allows the use of an ArrayIndex as a polymorphic container, because the type of the added element can be either T or a type derived from T. No constructor is applied. &] -[s7; [*C@3 newt]-|Object to be added.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Set`(int`,T`*`,unsigned`):%- [@(0.0.255) void]_[* Set]([@(0.0.255) int]_ -[*@3 i], [*@4 T]_`*[*@3 newt], [@(0.0.255) unsigned]_[*@3 `_hash])&] -[s7; [*C@3 i]-|Position.&] -[s7; [*C@3 newt]-|New element created on heap.&] -[s7; [*C@3 `_hash]-|Hash value&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:Set`(int`,T`*`):%- [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i], +[s7;%% [*C@3 newt]-|Object to be added.&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Set`(int`,T`*`,unsigned`): [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i +], [*@4 T]_`*[*@3 newt], [@(0.0.255) unsigned]_[*@3 `_hash])&] +[s7;%% [*C@3 i]-|Position.&] +[s7;%% [*C@3 newt]-|New element created on heap.&] +[s7;%% [*C@3 `_hash]-|Hash value&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:Set`(int`,T`*`): [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i], [*@4 T]_`*[*@3 newt])&] -[s2; Replaces the element at the specified position by an element +[s2;%% Replaces the element at the specified position by an element previously created on the heap. ArrayIndex takes over ownership of the element.&] -[s7; [*C@3 i]-|Position.&] -[s7; [*C@3 newt]-|New element created on heap.&] -[s7; [*/ Return value]-|&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:ArrayIndex`(`):%- [* ArrayIndex]()&] -[s2; Constructor. Constructs an empty ArrayIndex.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:ArrayIndex`(pick`_ ArrayIndex`&`):%- [* ArrayIndex]([@(0.128.128) pick -`_]_[* ArrayIndex][@(0.0.255) `&]_[*@3 s])&] -[s2; Pick constructor. Transfers source Index in low constant time, -but destroys it by picking.&] -[s7; [*C@3 s]-|Source ArrayIndex.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:ArrayIndex`(const ArrayIndex`&`,int`):%- [* ArrayIndex]([@(0.0.255) co -nst]_[* ArrayIndex][@(0.0.255) `&]_[*@3 s], [@(0.0.255) int])&] -[s2; Optional deep copy constructor.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor.&] -[s7; [*C@3 s]-|Source ArrayIndex.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:ArrayIndex`(pick`_ Array``&`):%- [* ArrayIndex]([@(0.128.128) pick -`_]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 s])&] -[s2; Pick`-constructs ArrayIndex from an Array. Transfers source -container in low constant time, but destroys it by picking.&] -[s7; [*C@3 s]-|Source Array.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:ArrayIndex`(const Array``&`,int`):%- [* ArrayIndex]([@(0.0.255) co -nst]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 s], [@(0.0.255) int])&] -[s2; Deep`-copy constructs ArrayIndex from Array.&] -[s6; Requires T to have deep copy constructor or optional deep copy -constructor.&] -[s7; [*C@3 s]-|Source Vector.&] -[s3;%- &] -[s4;%- &] -[s5;:ArrayIndex`:`:operator`=`(pick`_ Array``&`):%- [_^ArrayIndex^ ArrayIndex][@(0.0.255) `& +[s7;%% [*C@3 i]-|Position.&] +[s7;%% [*C@3 newt]-|New element created on heap.&] +[s7;%% [*/ Return value]-|&] +[s3; &] +[s4; &] +[s5;:ArrayIndex`:`:operator`=`(pick`_ Array``&`): [_^ArrayIndex^ ArrayIndex][@(0.0.255) `& ]_[* operator`=]([@(0.128.128) pick`_]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_ [*@3 x])&] -[s2; Pick operator. Transfers source Array to the ArrayIndex, but +[s2;%% Pick operator. Transfers source Array to the ArrayIndex, but destroys it by picking.&] -[s7; [*C@3 x]-|Source Array.&] +[s7;%% [*C@3 x]-|Source Array.&] +[s3;%% &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp b/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp index ea88ba349..4dba73590 100644 --- a/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp +++ b/uppsrc/Core/src.tpp/ArrayMap$en-us.tpp @@ -10,42 +10,81 @@ topic "ArrayMap"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_}%EN-US -[s0;:`:`:ArrayMap`:`:class: ArrayMap&] -[s0; &] -[s0; template ->&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:class: class [* ArrayMap]&] -[s0; &] -[s0; [*C@4 K]-|Type of keys. K must have deep copy constructor, be [*/^dpp`:`/`/SourceDoc`/Containers`/Moveable^ m -oveable] and must have [*C operator`=`=] defined.&] -[s0; [*C@4 T]-|Type or base class of the values stored in ArrayMap. -There is no common requirement for T.&] -[s0; [*C@4 HashFn]-|Hashing class. Must have defined [*C unsigned operator()(const -K`& x)] method returning hash value for elements.&] -[s0;~~~.416; Base classes&] -[s0; [^topic`:`/`/Core`/src`/AMap`:EN`-US^ AMap< K, T, Array, HashFn ->]&] -[s0; &] -[s0;~~~.416; Array flavor of map. Inherits most of its functionality -from [^topic`:`/`/Core`/src`/AMap`$en`-us^ AMap] and adds only -members specific for its flavor.&] -[s0;~~~.416; Like any other NTL container, ArrayMap is a [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ m +[s0;:`:`:ArrayMap`:`:class: [*@3;4 ArrayMap]&] +[s1;:noref:%- [@(0.0.255)3 template][3 _<][@(0.0.255)3 class][3 _][*@4;3 K][3 , +][@(0.0.255)3 class][3 _][*@4;3 T][3 , ][@(0.0.255)3 class][3 _][*@4;3 HashFn][3 _`=_StdHash][@(0.0.255)3 < +][*@4;3 K][@(0.0.255)3 >][3 _>]&] +[s1;:ArrayMap`:`:class:%- [@(0.0.255) class]_[* ArrayMap]_:_[@(0.0.255) public]_[*@3 MoveableA +ndDeepCopyOption][@(0.0.255) <]_[* ArrayMap][@(0.0.255) <][*@4 K], [*@4 T], +[*@4 HashFn][@(0.0.255) >]_>, [@(0.0.255) public]_[*@3 AMap][@(0.0.255) <]_[*@4 K], +[*@4 T], [_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >], [*@4 HashFn]_>_&] +[s8; [*@4 K]-|Type of keys. K must have deep copy constructor, be [/^dpp`:`/`/SourceDoc`/Containers`/Moveable^ m +oveable] and must have operator`=`= defined.&] +[s8; [*@4 T]-|Type or base class of the values stored in ArrayMap. There +is no common requirement for T.&] +[s8; [*@4 HashFn]-|Hashing class. Must have defined unsigned operator()(const +K`& x) method returning hash value for elements.&] +[s9; Array flavor of map. Inherits most of its functionality from +[^topic`:`/`/Core`/src`/AMap`$en`-us^ AMap] and adds only members +specific for its flavor.&] +[s9; Like any other NTL container, ArrayMap is a [*/^topic`:`/`/Core`/srcdoc`/Moveable`$en`-us^ m oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick and optional deep copy] transfer semantics. Calling methods of -a picked VectorMap is logic error with the exceptions of&] +a picked VectorMap is logic error with the exceptions of:&] +[s0; &] [s0; [C+75 void ][*C+75 operator`=][C+75 (pick`_ ArrayMap`& ][*C@3+75 v][C+75 ) ][/+75 (defined by composition)]&] [s0; [C+75 void ][*C+75 operator<<`=][C+75 (const AMap`& ][*C@3+75 v][C+75 )][+75 ][/+75 (defined in AMap)]&] [s0; [C+75 void ][*C+75 Clear][C+75 ()]&] [s0; [C+75 bool ][*C+75 IsPicked][C+75 () const]&] -[s0; Optional deep copy operator is inherited from AMap class. Pick +[s9; Optional deep copy operator is inherited from AMap class. Pick operator is implicitly defined by composition.&] -[s0; Members&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:Add`(const K`&`,const T`&`): void [* Add](const -K`& [*@3 k], const T`& [*@3 x])&] +[s0; &] +[s0;~~~.416; [* Base classes]&] +[s0; [^topic`:`/`/Core`/src`/AMap`$en`-us`#AMap`:`:class^ AMap< K, +T, Array, HashFn >]&] +[s3; &] +[s0;%- &] +[ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] +[s3;%- &] +[s5;:ArrayMap`:`:ArrayMap`(`):%- [* ArrayMap]()&] +[s2; Default constructor. Creates empty ArrayMap.&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:ArrayMap`(const ArrayMap`&`,int`):%- [* ArrayMap]([@(0.0.255) const]_[* Ar +rayMap][@(0.0.255) `&]_[*@3 s], [@(0.0.255) int])&] +[s2; Optional deep copy constructor.&] +[s6; Requires T to have deep copy constructor or optional deep copy +constructor if Array stores only objects of type T.&] +[s6; Requires polymorphic deep copy if Array also stores objects +of type derived from T.&] +[s7; [*C@3 s]-|Source ArrayMap.&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:ArrayMap`(pick`_ Index``&`,pick`_ Array``&`):%- [* Arr +ayMap]([@(0.128.128) pick`_]_[_^Index^ Index][@(0.0.255) <][*@4 K], [*@4 HashFn][@(0.0.255) > +`&]_[*@3 ndx], [@(0.128.128) pick`_]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 v +al])&] +[s2; Pick`-constructs ArrayMap from Index of keys and Array of values. +The source containers should have equal number of elements.&] +[s7; [*C@3 ndx]-|Source Index.&] +[s7; [*C@3 val]-|Source Array.&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:ArrayMap`(pick`_ Vector``&`,pick`_ Array``&`):%- [* ArrayMap]( +[@(0.128.128) pick`_]_[_^Vector^ Vector][@(0.0.255) <][*@4 K][@(0.0.255) >`&]_[*@3 ndx], +[@(0.128.128) pick`_]_[_^Array^ Array][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 val])&] +[s2; Pick`-constructs ArrayMap from Vector of keys and Array of values. +The source containers should have equal number of elements.&] +[s7; [*C@3 ndx]-|Source Index.&] +[s7; [*C@3 val]-|Source Array.&] +[s3; &] +[s0; &] +[ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&] +[s3;%- &] +[s5;:ArrayMap`:`:Add`(const K`&`,const T`&`):%- [@(0.0.255) void]_[* Add]([@(0.0.255) const +]_[*@4 K][@(0.0.255) `&]_[*@3 k], [@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 x])&] [s2; Adds a key and value pair to the ArrayMap. This method has to be reimplemented in ArrayMap (using simple forwarding) due to overloading of [* Add] in other forms.&] @@ -54,8 +93,10 @@ overloading of [* Add] in other forms.&] [s6; Invalidates references to keys.&] [s7; [*C@3 k]-|Key.&] [s7; [*C@3 x]-|Value.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:Add`(const K`&`): T`& [* Add](const K`& [*@3 k])&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:Add`(const K`&`):%- [*@4 T][@(0.0.255) `&]_[* Add]([@(0.0.255) const]_[*@4 K][@(0.0.255) `& +]_[*@3 k])&] [s2; Adds a key to the ArrayMap and returns a reference to the corresponding default constructed value. This method has to be reimplemented in ArrayMap (using simple forwarding) due to overloading of [* Add] @@ -63,53 +104,33 @@ in other forms.&] [s6; T must have default constructor.&] [s6; Invalidates iterators to the ArrayMap.&] [s6; Invalidates references to keys.&] -[s7; [*C@3 k]-|Key.&] +[s7; [*@3 k]-|Key.&] [s7; [*/ Return value]-|Reference to value.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:Add`(const K`&`,T`*`): void [* Add](const K`& -[*@3 k], T `*[*@3 ptr])&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:Add`(const K`&`,T`*`):%- [*@4 T][@(0.0.255) `&]_[* Add]([@(0.0.255) const]_[*@4 K +][@(0.0.255) `&]_[*@3 k], [*@4 T]_`*[*@3 newt])&] [s2; Adds a key`-value pair to the ArrayMap. The value is specified by a pointer to the object. ArrayMap takes over ownership of this object. This variant allows use of ArrayMap as polymorphic container, because type of added element can be also derived from T as well. No constructor is applied.&] -[s7; [*C@3 k]-|Key.&] -[s7; [*C@3 ptr]-|Value.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:Set`(int`,T`*`): void_[* Set](int_[*@3 i], T_`*[*@3 ptr])&] +[s7; [*@3 k]-|Key.&] +[s7; [%-*@3 newt]-|Value.&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:Set`(int`,T`*`):%- [@(0.0.255) void]_[* Set]([@(0.0.255) int]_[*@3 i], +[*@4 T]_`*[*@3 ptr])&] [s2; Sets value at specified index. Value is specified by a pointer to the object. ArrayMap takes over ownership of this object.&] [s7; [*C@3 i]-|Index.&] [s7; [*C@3 ptr]-|Value.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:PopDetach`(`): T_`*[* PopDetach]()&] +[s3; &] +[s4;%- &] +[s5;:ArrayMap`:`:PopDetach`(`):%- [*@4 T]_`*[* PopDetach]()&] [s2; Drops last element in the ArrayMap, giving up ownership of value. Client is responsible for deletion of the element.&] [s6; Invalidates iterators to ArrayMap.&] [s7; [* Return value]-|Value.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:ArrayMap`(const`:`:ArrayMap`&`,int`): [* ArrayMap](const -ArrayMap`& [*@3 s], int)&] -[s2; Optional deep copy constructor.&] -[s2; [*1 Requires T to have deep copy constructor or optional deep -copy constructor if Array stores only objects of type T.]&] -[s6; Requires polymorphic deep copy if Array also stores objects -of type derived from T.&] -[s7; [*C@3 s]-|Source ArrayMap.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:ArrayMap`(pick`_`:`:Index``&`,pick`_`:`:Array``&`): [* A -rrayMap](pick`_ Index`& [*@3 ndx], pick`_ Array`& [*@3 val])&] -[s2; Pick`-constructs ArrayMap from Index of keys and Array of values. -The source containers should have equal number of elements.&] -[s7; [*C@3 ndx]-|Source Index.&] -[s7; [*C@3 val]-|Source Array.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:ArrayMap`(pick`_`:`:Vector``&`,pick`_`:`:Array``&`): [* Ar -rayMap](pick`_ Vector`& [*@3 ndx], pick`_ Array`& [*@3 val])&] -[s2; Pick`-constructs ArrayMap from Vector of keys and Array of values. -The source containers should have equal number of elements.&] -[s7; [*C@3 ndx]-|Source Index.&] -[s7; [*C@3 val]-|Source Array.&] -[s0;3 &] -[s0;:`:`:ArrayMap`:`:ArrayMap`(`): [* ArrayMap]()&] -[s0; Default constructor. Creates empty ArrayMap.] \ No newline at end of file +[s3; &] +[s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/Format$en-us.tppi b/uppsrc/Core/src.tpp/Format$en-us.tppi index 5fe7e164c..e5295ee5f 100644 --- a/uppsrc/Core/src.tpp/Format$en-us.tppi +++ b/uppsrc/Core/src.tpp/Format$en-us.tppi @@ -1,19 +1,19 @@ TITLE("Text formatting") COMPRESSED 120,156,213,91,11,119,211,70,22,254,43,83,104,90,59,216,70,79,63,129,67,22,82,218,221,2,61,16,90,122,124,148,72,177,198,182,22,89,114,37,57,33,109,202,111,223,123,103,70,111,141,156,4,216,61,219,114,98,103,102,190,59,247,61,119,30,153,107,228,219,111,149,158,114,95,217,243,223,244,57,93,58,59,63,177,230,158,97,140,103,142,102,206,62,252,235,245,100,134,120,21,240,250,72,213,199,166,174,26,218,16,126,168,186,170,153,154,110,168,99,109,98,140,117,125,172,76,23,190,19,199,214,220,215,198,99,6,210,0,164,141,76,77,29,25,99,99,172,234,163,177,6,88,77,81,52,101,164,153,170,161,143,53,115,234,210,120,97,205,21,24,174,195,240,201,80,159,40,170,162,140,84,85,209,181,145,162,155,134,170,234,26,144,208,70,154,170,152,83,26,184,214,252,199,225,12,1,6,10,101,14,129,245,33,80,51,12,5,168,35,204,208,85,93,209,116,83,157,152,195,233,57,93,121,65,147,72,230,94,145,70,202,212,75,232,70,72,228,24,179,195,167,230,76,5,232, -176,55,188,63,130,105,13,19,38,155,160,68,58,192,52,109,104,78,84,211,0,150,12,69,155,70,244,143,157,23,209,13,13,18,65,193,83,85,77,157,157,171,163,25,176,240,233,211,167,129,106,40,92,83,35,224,69,85,128,111,77,133,54,144,99,164,154,19,101,98,142,213,177,162,143,12,205,28,129,232,91,39,114,54,66,146,115,67,155,9,57,198,189,241,253,161,58,4,141,42,99,224,223,156,0,1,5,132,128,79,80,164,9,255,244,241,52,17,96,196,33,104,210,155,220,7,37,233,166,50,154,40,35,99,100,26,32,137,166,14,85,80,164,130,242,131,25,166,65,24,109,28,223,154,255,117,246,247,193,241,171,254,187,183,100,30,43,51,50,63,52,200,15,216,149,16,187,79,18,250,49,33,75,246,107,226,5,43,235,59,11,7,29,62,80,213,17,193,239,230,108,106,195,255,28,96,119,22,97,16,39,100,177,118,34,251,208,238,177,223,176,251,87,186,72,194,200,126,196,190,59,254,142,218,79,236,239,236,238,244,160,79,230,167,216,248,54,137,128,250,41,225,159,214,217,252, -80,240,96,205,159,118,134,70,151,116,240,139,50,80,6,160,130,46,97,132,211,174,179,114,23,204,157,245,216,135,214,252,240,169,46,4,72,155,123,164,149,216,105,206,241,41,111,228,191,164,67,30,165,67,80,144,116,4,126,79,7,128,108,103,124,94,39,90,197,105,107,215,226,250,250,223,201,220,206,117,206,50,124,233,193,55,149,55,160,178,12,98,207,173,30,185,45,133,128,67,173,193,96,96,145,138,26,50,151,241,130,68,120,74,217,111,72,234,52,53,135,145,43,174,83,212,10,16,198,62,224,195,119,130,213,206,89,81,20,161,166,209,179,154,38,65,133,12,22,55,143,231,124,21,59,30,89,140,199,98,19,176,43,38,191,176,186,159,103,120,148,163,172,225,76,158,155,57,244,255,181,167,104,51,194,115,78,154,148,144,219,152,132,187,100,187,75,120,122,58,119,98,234,146,48,32,69,105,122,160,183,152,70,152,180,136,179,72,118,142,143,211,237,48,95,199,36,9,201,214,119,22,116,29,250,46,141,226,1,57,18,93,228,2,217,140,97,40,69,53,94,0,1,32,13,195, -217,68,187,24,169,137,108,200,112,239,236,7,246,3,18,111,233,194,91,122,128,139,105,66,194,37,137,19,39,112,157,200,45,140,157,17,103,187,245,189,133,147,120,192,233,194,9,200,50,162,212,191,34,17,172,96,49,140,32,201,154,122,17,9,47,131,2,10,191,166,228,23,92,135,36,185,218,82,20,33,28,8,197,136,143,87,97,2,157,107,80,17,80,2,65,34,207,57,247,41,9,118,155,115,160,14,92,113,120,174,5,15,254,109,182,62,91,195,64,202,243,43,18,130,192,126,232,184,40,38,18,17,42,223,109,81,5,154,66,216,50,67,153,232,229,185,127,41,104,19,165,143,18,114,233,37,107,176,8,57,176,8,40,131,172,157,11,42,4,155,150,177,108,12,152,142,185,14,124,22,29,121,179,1,108,44,122,173,106,127,184,69,101,74,187,51,53,218,125,207,149,13,178,237,180,199,170,178,213,196,9,243,12,136,72,26,109,35,42,180,38,180,20,129,79,122,1,37,157,32,76,114,155,101,76,116,7,228,216,89,172,83,82,224,42,127,236,104,176,160,4,106,158,152,107,11, -163,19,124,149,166,38,191,74,237,240,193,3,0,88,80,96,123,208,8,198,115,169,239,109,60,52,36,68,69,20,110,82,125,160,190,31,130,223,100,83,87,140,117,116,225,120,62,243,141,84,172,130,69,200,95,127,169,163,177,57,29,107,170,121,154,86,4,15,11,170,216,134,177,135,211,128,218,200,212,178,166,211,199,124,212,91,74,63,176,200,2,215,78,125,140,128,90,36,104,136,57,223,15,47,25,194,190,23,209,48,90,57,129,247,39,181,239,145,48,2,55,66,209,65,226,204,91,123,16,125,116,185,243,185,166,146,200,9,98,159,197,82,60,0,30,26,57,189,244,220,100,141,108,62,42,176,201,60,53,206,117,3,241,23,67,85,140,54,13,9,196,176,239,166,158,91,39,149,27,8,216,113,124,111,5,186,246,233,50,217,207,193,147,175,200,65,228,173,214,55,96,193,126,252,21,121,0,212,2,179,72,84,226,131,7,116,145,2,166,81,198,140,101,127,42,176,243,83,110,104,204,74,48,224,213,206,247,45,102,243,152,52,144,192,228,158,80,135,5,69,85,136,129,245,247,223, -45,161,92,205,10,176,108,109,118,88,124,128,43,65,34,102,78,231,111,215,78,65,76,88,91,252,43,96,38,240,189,15,148,60,35,158,11,140,98,194,71,13,184,222,10,99,16,226,205,254,222,62,179,191,103,25,2,83,128,131,254,77,93,8,123,200,170,87,16,177,224,209,231,52,185,164,52,144,38,23,8,243,22,102,81,55,140,77,136,15,190,44,157,83,210,152,17,25,165,45,236,215,248,176,60,19,20,86,137,61,19,229,139,77,158,204,112,67,0,233,40,134,69,128,4,248,3,215,49,145,171,64,17,203,37,240,21,36,5,139,184,116,11,233,141,197,114,80,160,56,216,43,37,44,233,118,63,166,1,102,139,11,90,73,96,207,178,60,137,174,116,136,222,32,81,67,12,181,26,174,183,64,50,162,108,201,103,25,59,115,182,124,141,231,107,251,81,204,139,178,202,132,224,159,18,53,131,173,209,247,195,32,113,128,137,170,227,96,162,166,87,36,160,153,181,96,59,236,108,179,233,88,136,224,210,131,189,46,120,31,52,238,188,120,157,101,114,150,214,75,234,145,47,188,204,24, -160,109,66,33,114,225,87,144,51,8,3,187,95,97,10,61,21,186,112,106,168,183,202,196,25,9,224,18,147,26,161,155,109,114,53,67,221,50,119,65,147,100,5,1,134,101,170,43,161,0,212,99,106,98,81,47,117,92,186,132,21,209,69,26,111,188,197,154,247,178,213,115,9,108,119,83,127,218,132,16,119,64,235,194,131,42,173,80,152,161,217,80,20,10,76,82,86,39,32,203,101,5,252,182,246,252,140,175,172,156,137,49,250,216,138,137,135,22,224,185,91,224,52,41,228,138,30,204,67,81,34,136,84,15,22,225,228,50,4,198,32,18,183,176,168,156,123,62,184,29,141,203,133,138,167,154,202,236,53,174,159,126,177,150,132,73,196,236,44,141,156,103,133,163,135,43,108,7,3,177,84,77,118,81,61,76,19,3,242,58,96,242,243,69,17,234,35,140,236,158,80,226,22,148,196,74,221,192,73,118,17,40,134,83,136,153,95,176,68,228,134,59,156,194,238,63,65,157,246,72,28,98,37,0,58,3,122,49,155,29,102,162,131,213,0,237,69,14,88,53,154,130,88,157,59,104, -150,175,236,18,246,61,234,36,49,44,203,168,209,170,131,15,200,9,86,34,240,207,1,21,135,64,121,67,46,215,144,224,152,231,21,77,89,245,66,47,230,137,9,147,100,209,230,61,206,241,129,187,229,231,15,72,126,237,196,34,124,46,35,15,24,131,64,139,97,132,109,195,152,142,109,231,133,16,42,179,196,125,183,226,45,217,130,240,16,118,95,181,26,189,86,1,2,101,118,102,150,143,177,106,137,161,172,45,224,150,197,77,106,69,158,177,27,115,12,233,20,171,111,73,136,200,248,175,57,116,149,249,151,24,83,181,65,204,21,227,221,118,27,34,67,245,66,124,65,128,19,18,146,143,228,61,129,26,192,247,136,31,18,255,35,241,223,19,74,142,201,146,172,200,11,82,157,234,23,30,73,16,166,184,139,9,211,89,221,112,193,66,132,239,120,208,247,208,60,120,32,24,121,44,189,73,101,139,161,246,128,74,89,166,244,212,229,216,194,3,129,33,118,56,249,170,211,73,247,84,180,232,243,184,35,76,216,194,8,159,67,67,108,245,186,3,73,106,199,109,92,133,143,60,207,131, -102,120,169,144,238,23,129,42,84,31,91,92,110,32,142,49,251,197,232,190,78,118,128,86,221,132,178,56,69,69,97,133,176,103,53,68,149,84,243,222,73,230,234,5,78,155,37,241,226,90,57,84,223,107,109,66,119,231,135,86,97,51,86,219,42,225,10,192,171,254,82,51,43,200,102,2,3,27,248,42,204,77,207,157,107,219,44,220,107,232,19,216,107,12,21,51,173,25,235,44,65,153,152,85,137,44,29,112,193,112,169,192,125,38,211,35,133,82,1,50,32,71,20,247,13,216,189,139,133,31,8,45,161,28,108,215,208,48,39,147,49,235,122,5,52,34,88,61,176,85,2,96,210,103,93,39,169,181,87,224,6,1,122,230,62,124,170,157,172,87,28,211,115,199,17,185,148,47,190,32,10,152,123,177,6,143,169,149,184,121,89,135,185,146,31,86,128,187,249,87,169,207,226,78,37,225,53,201,37,100,90,154,42,35,173,52,10,149,146,227,179,5,217,241,47,157,171,184,169,98,177,216,135,85,117,201,66,0,179,204,198,210,216,170,24,153,213,204,1,78,28,211,106,122,186,69, -240,14,202,190,100,104,195,233,216,28,25,107,117,246,180,163,41,70,183,65,223,229,232,42,104,61,75,75,208,246,84,99,173,120,98,119,8,78,21,192,174,39,183,222,51,242,51,212,245,128,103,70,97,189,172,24,30,100,99,56,238,101,13,247,50,27,203,119,87,75,47,2,61,115,187,16,72,202,41,209,30,230,18,232,200,167,169,209,126,253,234,228,199,18,237,119,57,188,133,39,232,41,161,142,206,207,35,10,101,23,174,64,254,77,165,146,82,200,81,189,207,147,77,58,195,238,70,82,186,206,149,212,94,208,215,136,121,94,193,60,23,227,62,215,82,207,143,126,151,218,73,198,139,123,117,35,35,73,69,145,195,83,200,231,216,231,249,239,55,50,143,140,187,228,178,4,87,53,187,191,14,119,81,154,187,121,124,86,65,78,217,158,156,107,62,180,71,212,41,113,122,68,155,146,243,30,129,245,135,64,22,32,127,66,195,8,218,29,214,84,161,118,244,69,169,69,82,95,131,205,155,19,136,242,36,174,194,222,72,221,162,10,171,230,250,60,207,58,62,112,14,251,3,76,154,13, -133,80,37,221,138,107,73,221,212,24,56,176,250,215,75,239,35,122,5,212,81,27,199,143,27,135,93,192,48,200,182,222,158,97,1,187,93,129,225,20,201,134,17,30,108,126,220,134,1,158,148,32,107,33,175,3,155,177,75,129,93,102,88,206,88,59,202,23,40,31,80,233,149,136,221,231,183,1,249,149,101,91,217,116,219,122,137,216,15,242,226,72,180,244,179,194,166,188,174,179,99,161,82,41,69,190,41,255,106,159,90,141,164,203,132,64,139,64,171,249,144,90,104,196,28,13,103,128,239,95,139,37,27,234,33,60,118,129,101,120,21,212,7,22,231,220,195,124,161,169,127,109,229,55,9,169,39,100,213,62,233,4,116,229,176,218,215,126,204,143,15,242,97,176,31,101,251,211,116,51,5,35,134,221,38,190,64,65,253,235,15,148,110,241,120,15,120,199,51,39,7,136,255,73,163,48,110,4,128,10,251,215,169,159,165,22,20,219,26,95,29,102,227,135,134,56,144,124,96,53,106,137,237,148,5,25,41,186,193,40,101,5,101,140,108,29,151,29,122,177,3,211,198,224,229,31, -44,19,60,36,199,31,29,172,151,98,201,213,81,185,98,54,117,85,157,26,195,241,36,205,37,252,244,161,99,223,195,218,221,229,49,113,16,91,246,61,200,101,154,222,131,13,252,201,241,251,19,251,94,183,152,127,158,241,62,236,41,230,165,18,45,109,26,11,106,234,212,221,75,15,27,217,8,41,61,69,85,50,50,21,176,120,163,210,138,182,15,5,90,109,161,32,37,97,95,51,145,148,71,64,228,186,153,9,251,26,218,72,245,63,251,186,149,222,147,54,122,53,98,48,104,15,61,251,241,77,8,22,25,149,16,100,222,96,219,214,54,105,38,6,45,219,68,138,180,231,236,24,3,207,233,83,151,42,53,101,222,128,7,245,77,158,197,198,202,201,219,18,71,104,243,128,5,195,12,205,10,228,72,46,254,29,38,241,238,128,9,101,152,145,28,243,81,130,25,157,75,33,239,101,144,127,72,33,148,67,6,117,214,160,9,195,133,218,15,224,167,20,127,188,15,127,220,142,95,238,195,75,145,171,54,164,20,245,226,78,168,224,78,40,181,13,70,172,249,67,210,129,5,193,247,22, -94,66,234,75,103,87,74,87,255,166,149,31,133,147,230,101,82,195,58,41,39,28,180,122,3,149,219,66,179,79,237,7,122,43,156,251,81,38,53,95,6,243,34,172,133,169,220,69,168,174,212,131,174,237,73,163,156,168,47,101,181,215,98,209,139,59,249,129,214,6,227,26,209,136,168,160,89,93,37,87,70,74,170,33,251,40,183,163,116,113,87,91,95,124,13,123,92,220,205,30,246,92,157,130,39,205,180,105,114,25,206,244,105,178,142,40,157,57,176,43,88,195,102,201,226,53,142,86,161,8,67,63,147,96,85,106,209,223,66,85,63,184,11,221,54,78,249,161,19,91,239,42,168,127,239,2,42,133,189,148,194,254,217,10,99,199,73,141,176,119,175,142,219,152,148,177,216,198,161,140,191,54,246,100,204,201,215,126,231,170,17,19,227,109,90,241,128,168,10,124,46,1,190,221,11,60,250,189,25,120,116,242,238,77,241,24,168,198,170,140,83,249,84,50,22,229,8,25,111,82,68,114,201,16,245,20,176,15,81,173,207,204,125,0,181,138,104,217,4,200,32,138,28,227,112,68, -53,168,247,141,175,165,42,26,75,33,71,141,83,200,117,123,36,153,226,248,173,20,18,49,200,184,2,184,240,60,79,10,121,147,206,82,101,236,229,179,103,239,223,191,255,105,95,117,254,130,38,111,175,226,231,78,66,59,221,170,186,199,15,53,243,161,166,40,195,155,17,57,241,54,109,68,32,55,78,245,209,84,153,236,163,102,223,195,187,141,218,222,179,116,9,115,123,105,52,115,160,140,7,92,26,201,97,91,97,191,206,222,190,191,17,151,20,184,203,95,236,226,164,248,76,163,116,236,150,189,116,198,43,135,169,61,197,231,47,46,93,226,75,102,241,245,172,254,162,185,99,31,102,160,110,167,237,109,239,233,15,89,141,37,30,218,230,13,233,48,251,187,179,229,38,201,158,211,102,148,211,123,245,236,105,38,123,77,181,11,248,69,16,59,247,198,59,31,159,146,210,52,197,25,178,123,54,118,19,163,103,55,49,88,13,252,208,81,181,113,247,5,251,249,84,21,39,157,135,69,180,80,182,129,122,197,47,106,166,43,232,69,101,197,73,180,91,36,236,213,119,65,7,188,181,240, -110,58,251,203,4,77,92,14,243,17,187,136,242,55,80,252,53,136,23,112,11,177,235,174,236,81,84,229,85,44,123,187,82,124,69,48,40,113,104,86,57,76,207,29,171,60,138,199,231,249,83,109,193,222,207,226,119,84,53,127,174,198,94,208,128,255,10,13,138,137,228,51,2,167,56,25,99,27,103,192,71,212,130,248,81,249,138,249,166,20,185,172,72,148,251,31,82,229,109,21,151,225,23,128,13,71,166,55,157,201,115,203,179,120,110,205,41,179,55,78,183,112,38,113,101,24,137,151,6,194,131,227,212,191,244,2,63,105,220,230,243,53,253,1,66,222,219,245,2,47,177,207,170,230,189,8,129,117,148,160,70,79,246,55,8,24,236,183,252,251,3,15,79,94,50,194,156,204,146,255,53,1,104,44,157,185,248,138,115,89,127,45,62,63,232,103,211,15,216,67,182,66,3,123,231,119,244,243,187,99,251,236,215,94,129,14,94,2,227,107,117,254,108,13,131,167,248,244,220,91,226,149,180,100,86,246,96,48,125,156,177,4,10,114,223,72,37,120,197,54,199,5,139,124,174,49, -42,4,173,134,12,250,165,181,126,30,134,126,143,63,195,18,47,172,242,187,106,166,181,253,106,224,97,241,5,213,80,33,248,223,80,131,120,217,132,178,255,150,190,14,188,153,244,184,48,99,149,240,5,229,175,145,252,111,104,0,39,101,242,227,204,55,21,158,69,215,23,148,188,76,239,107,139,205,159,230,165,9,35,125,178,114,203,252,208,146,29,124,255,139,230,134,2,185,175,173,25,145,107,241,25,87,131,146,176,206,168,84,31,152,143,129,99,210,97,237,80,168,226,107,221,227,40,10,185,73,211,247,46,214,127,0,84,107,50,83, +176,55,188,63,130,105,13,19,38,155,160,68,58,192,52,109,104,78,84,211,0,150,12,69,155,70,244,143,157,23,209,13,13,18,65,193,83,85,77,157,157,171,163,25,176,240,233,211,167,129,106,40,92,83,35,224,69,85,128,111,77,133,54,144,99,164,154,19,101,98,142,213,177,162,143,12,205,28,129,232,91,39,114,54,66,146,115,67,155,9,57,198,189,241,253,161,58,4,141,42,99,224,223,156,0,1,5,132,128,79,80,164,9,255,244,241,52,17,96,196,33,104,210,155,220,7,37,233,166,50,154,40,35,99,100,26,32,137,166,14,85,80,164,130,242,131,25,166,65,24,109,28,223,154,255,117,246,247,193,241,171,254,187,183,100,30,43,51,50,63,124,170,207,12,242,3,246,38,196,238,147,132,126,76,200,146,253,154,120,193,202,250,206,194,113,135,15,84,117,68,240,187,57,155,218,240,63,7,216,157,69,24,196,9,89,172,157,200,62,180,123,236,55,236,254,149,46,146,48,178,31,177,239,142,191,163,246,19,251,59,187,59,61,232,147,249,41,54,190,77,34,160,126,74,248,167, +117,54,63,20,60,88,243,167,157,161,209,37,29,252,162,12,148,1,104,161,75,24,225,180,235,172,220,5,115,103,61,246,161,133,18,9,1,210,230,30,105,37,118,154,115,124,202,27,249,47,233,144,71,233,16,20,36,29,129,223,211,1,32,219,25,159,215,137,86,113,218,218,181,184,190,254,119,50,183,115,157,179,12,95,122,240,77,229,13,168,44,131,216,115,171,71,110,75,33,224,80,107,48,24,88,164,162,134,204,101,188,32,17,158,82,246,27,146,58,77,205,97,228,138,235,20,181,2,132,177,15,248,240,157,96,181,115,86,20,69,168,105,244,172,166,73,80,33,131,197,205,227,57,95,197,142,71,22,227,177,216,4,236,138,201,47,172,238,231,25,30,229,40,107,56,147,231,102,14,253,127,237,41,218,140,240,156,147,38,37,228,54,38,225,46,217,238,18,158,158,206,157,152,186,36,12,72,81,154,30,232,45,166,17,38,45,226,44,146,157,227,227,116,59,76,217,49,73,66,178,245,157,5,93,135,190,75,163,120,64,142,68,23,185,64,54,99,24,74,81,141,23,64,0,72,195, +112,54,209,46,70,106,34,27,50,220,59,251,129,253,128,196,91,186,240,150,30,224,98,154,144,112,73,226,196,9,92,39,114,11,99,103,196,217,110,125,111,225,36,30,112,186,112,2,178,140,40,245,175,72,4,139,88,12,35,72,178,166,94,68,194,203,160,128,194,175,41,249,5,215,33,73,174,182,20,69,8,7,66,49,226,227,85,152,64,231,26,84,4,148,64,144,200,115,206,125,74,130,221,230,28,168,3,87,28,158,107,193,131,127,155,173,207,150,49,144,242,252,138,132,32,176,31,58,46,138,137,68,132,202,119,91,84,129,166,16,182,210,80,38,122,121,238,95,10,218,68,233,163,132,92,122,201,26,44,66,14,44,2,202,32,107,231,130,10,193,166,101,44,27,3,166,99,174,3,159,69,71,222,108,0,27,139,94,171,218,31,110,81,153,210,238,76,141,118,223,115,101,131,108,59,237,177,170,108,53,113,194,60,3,34,146,70,219,136,10,173,9,45,69,224,147,94,64,73,39,8,147,220,102,25,19,221,1,57,118,22,235,148,20,184,202,31,59,26,44,40,129,178,39,230,218, +194,232,4,95,165,169,201,175,82,59,124,240,0,0,22,20,216,30,52,130,241,92,234,123,27,15,13,9,81,17,133,155,84,31,168,239,135,224,55,217,212,21,99,29,93,56,158,207,124,35,21,171,96,17,242,215,95,234,104,108,78,199,154,106,158,166,69,193,195,130,42,182,97,236,225,52,160,54,50,181,172,233,244,49,31,245,150,210,15,44,178,192,181,83,31,35,160,22,9,26,98,206,247,195,75,134,176,239,69,52,140,86,78,224,253,73,237,123,36,140,192,141,80,116,144,56,243,214,30,68,31,93,238,124,174,169,36,114,130,216,103,177,20,15,128,135,70,78,47,61,55,89,35,155,143,10,108,50,79,141,115,221,64,252,197,80,24,163,77,67,2,49,236,187,169,231,214,73,229,6,2,118,28,223,91,129,174,125,186,76,246,115,240,228,43,114,16,121,171,245,13,88,176,31,127,69,30,0,181,192,44,18,149,248,224,1,93,164,128,105,148,49,99,217,159,10,236,252,148,27,26,179,18,12,120,181,243,125,139,217,60,38,13,36,48,185,39,212,97,65,81,21,98,96,253,253, +119,75,40,87,179,2,44,91,155,29,22,31,224,74,144,136,153,211,249,219,181,83,16,19,214,22,255,10,152,9,124,239,3,37,207,136,231,2,163,152,240,81,3,174,183,194,24,132,120,179,191,183,207,236,239,89,134,192,20,224,160,127,83,23,194,30,178,234,21,68,44,120,244,57,77,46,41,13,164,201,5,194,188,133,89,212,13,99,19,226,131,47,75,231,148,52,102,68,70,105,11,91,54,62,44,207,4,133,85,98,207,68,249,98,147,39,51,220,16,64,58,138,97,17,32,1,254,192,117,76,228,42,80,196,114,9,124,5,73,193,34,46,221,66,122,99,177,28,20,40,14,246,74,9,75,186,221,143,105,128,217,226,130,86,18,216,179,44,79,162,43,29,162,55,72,212,16,67,173,134,235,45,144,140,40,91,242,89,198,206,156,45,95,227,249,218,126,20,243,162,172,50,33,248,167,68,205,96,107,244,253,48,72,28,96,162,234,56,152,168,233,21,9,104,102,45,216,17,59,219,108,58,22,34,184,244,96,175,11,222,7,141,59,47,94,103,153,156,165,245,146,122,228,11,47,51, +6,104,155,80,136,92,248,21,228,12,194,192,238,87,152,66,79,133,46,156,26,234,173,50,113,70,2,184,196,164,70,232,102,155,92,205,80,183,204,93,208,36,89,65,128,97,153,234,74,40,0,245,152,154,88,212,75,29,151,46,97,69,116,145,198,27,111,177,230,189,108,245,92,2,219,221,212,159,54,33,196,29,208,186,240,160,74,43,20,102,104,54,20,133,2,147,148,213,9,200,114,89,1,191,173,61,63,227,43,43,103,98,140,62,182,98,226,185,5,120,238,22,56,77,10,185,162,7,243,80,148,8,34,213,131,69,56,185,12,129,49,136,196,45,44,42,231,158,15,110,71,227,114,161,226,169,166,50,123,141,235,167,95,172,37,97,18,49,59,75,35,231,89,225,232,225,10,219,193,64,44,85,147,93,84,15,211,196,128,188,14,152,252,124,81,132,250,8,35,187,39,148,184,5,37,177,82,55,112,146,93,4,138,225,20,98,230,23,44,17,185,225,14,167,176,251,79,80,167,61,18,135,88,9,128,206,128,94,204,102,135,153,232,96,53,64,123,145,3,86,141,166,32,86,231,14, +154,229,43,187,132,125,143,58,73,12,203,50,106,180,234,224,3,114,130,149,8,252,115,64,197,33,80,222,144,203,53,36,56,230,121,69,83,86,189,208,139,121,98,194,36,89,180,121,143,115,124,224,110,249,249,3,146,95,59,177,8,159,203,200,3,198,32,208,98,24,97,219,48,166,99,219,121,33,132,202,44,113,223,173,120,75,182,32,60,132,221,87,173,70,175,85,128,64,153,29,155,229,99,172,90,98,40,107,11,184,101,113,147,90,145,103,236,198,28,67,58,197,234,91,18,34,50,254,107,14,93,101,254,37,198,84,109,16,115,197,120,183,221,134,200,80,189,16,95,16,224,132,132,228,35,121,79,160,6,240,61,226,135,196,255,72,252,247,132,146,99,178,36,43,242,130,84,167,250,133,71,18,132,41,238,98,194,116,86,55,92,176,16,225,59,30,244,61,52,15,158,9,70,30,75,111,82,217,98,168,61,160,82,150,41,61,117,57,182,240,64,96,136,29,78,190,234,116,210,61,21,45,250,60,238,8,19,182,48,194,231,208,16,91,189,238,64,146,218,113,27,87,225,35,207,243, +160,25,94,42,164,251,69,160,10,213,199,22,151,27,136,99,204,126,49,186,175,147,29,160,85,55,161,44,78,81,81,88,33,236,89,13,81,37,213,188,119,146,185,122,129,211,102,73,188,184,86,14,213,247,90,155,208,221,249,161,85,216,140,213,182,74,184,2,240,170,191,212,204,10,178,153,192,192,6,190,10,115,211,163,231,218,54,11,247,26,250,4,246,26,67,197,204,206,31,107,44,65,153,152,85,137,44,29,112,193,112,169,192,125,38,211,35,133,82,1,50,32,71,20,247,13,216,189,139,133,31,8,45,161,28,108,215,208,48,39,147,49,235,122,5,52,34,88,61,176,85,2,96,210,103,93,39,169,181,87,224,6,1,122,230,62,124,170,157,172,87,156,212,115,199,17,185,148,47,190,32,10,152,123,177,6,143,169,149,184,121,89,135,185,146,31,86,128,187,249,87,169,207,226,78,37,225,53,201,37,100,90,154,42,35,173,52,10,149,146,227,179,5,217,241,47,157,171,184,169,98,177,216,135,85,117,201,66,0,179,204,198,210,216,170,24,153,213,204,1,78,28,211,106,122,186, +69,240,14,202,190,100,104,195,233,216,28,25,107,117,246,180,163,41,70,183,65,223,229,232,42,104,61,75,75,208,246,84,99,173,120,98,119,8,78,21,192,174,39,183,222,51,242,51,212,245,128,103,70,97,189,172,24,30,100,99,56,238,101,13,247,50,27,203,119,87,75,47,2,61,115,187,16,72,202,41,209,30,230,18,232,200,167,169,209,126,253,234,228,199,18,237,119,57,188,133,39,232,41,161,142,206,207,35,10,101,23,174,64,254,77,165,146,82,200,81,189,207,147,77,58,195,238,70,82,186,206,149,212,94,208,215,136,121,94,193,60,23,227,62,215,82,207,143,126,151,218,73,198,139,123,117,35,35,73,69,145,195,83,200,231,216,231,249,239,55,50,143,140,187,228,178,4,87,53,187,191,14,119,81,154,187,121,124,86,65,78,217,158,156,107,62,180,71,212,41,113,122,68,155,146,243,30,129,245,135,64,22,32,127,66,195,8,218,29,214,84,161,118,244,69,169,69,82,95,131,205,155,19,136,242,36,174,194,222,72,221,162,10,171,230,250,60,207,58,62,112,14,251,3,76,154, +13,133,80,37,221,138,155,73,221,212,24,56,176,250,215,75,239,35,122,5,212,81,27,199,143,27,135,93,192,48,200,182,222,158,97,1,187,93,129,225,20,201,134,17,30,108,126,220,134,1,158,148,32,107,33,175,3,155,177,75,129,93,102,88,206,88,59,202,23,40,31,80,233,149,136,221,231,183,1,249,149,101,91,217,116,219,122,137,216,15,242,226,72,180,244,179,194,166,188,174,179,99,161,82,41,69,190,41,255,106,159,90,141,164,203,132,64,139,64,171,249,144,90,104,196,28,13,103,128,239,95,139,37,27,234,33,60,118,129,101,120,21,212,7,22,231,220,195,124,161,169,127,109,229,55,9,169,39,100,213,62,233,4,116,229,176,218,215,126,204,143,15,242,97,176,31,101,251,211,116,51,5,35,134,221,38,190,64,65,253,235,15,148,110,241,120,15,120,199,51,39,7,136,255,73,163,48,110,4,128,10,251,215,169,159,165,22,20,219,26,95,29,102,227,135,134,56,144,124,96,53,106,137,237,148,5,25,41,186,193,40,101,5,101,140,108,29,151,29,122,177,3,211,198,224,229, +31,44,19,60,36,199,31,29,172,151,98,201,213,81,185,98,54,117,85,157,26,195,241,36,205,37,252,244,161,99,223,195,218,221,229,49,113,16,91,246,61,200,101,154,222,131,13,252,201,241,251,19,251,94,183,152,127,158,241,62,236,41,230,165,18,45,109,26,11,106,234,212,221,75,15,27,217,8,41,61,69,85,50,50,21,176,120,166,210,138,182,15,5,90,109,161,32,37,97,95,51,145,148,71,64,228,186,153,9,251,26,218,72,245,63,251,186,149,222,147,54,122,53,98,48,104,15,61,251,241,77,8,22,25,149,16,100,222,96,219,214,54,105,38,6,45,219,68,138,180,231,236,24,3,207,233,83,151,42,53,101,222,128,7,245,77,158,197,198,202,201,219,18,71,104,243,128,5,195,12,205,10,228,72,46,254,29,38,241,238,128,9,101,152,145,28,243,81,130,25,157,75,33,239,101,144,127,72,33,148,67,6,117,214,160,9,195,133,218,15,224,167,20,127,188,15,127,220,142,95,238,195,75,145,171,54,164,20,245,226,78,168,224,78,40,181,13,70,172,249,67,210,129,5,193,247, +22,94,66,234,75,103,87,74,87,255,166,149,31,133,147,230,101,82,195,58,41,39,28,180,122,3,149,219,66,179,79,237,7,122,43,156,251,81,38,53,95,6,243,34,172,133,169,220,69,168,174,212,131,174,237,85,163,156,168,47,101,181,215,98,209,139,59,249,129,214,6,227,26,209,136,168,160,89,93,37,87,70,74,170,33,251,40,183,163,116,113,87,91,95,124,13,123,92,220,205,30,246,92,157,130,39,205,180,105,114,25,206,244,105,178,142,40,157,57,176,43,88,195,102,201,226,53,142,86,161,8,67,63,147,96,85,106,209,223,66,85,63,184,11,221,54,78,249,161,19,91,239,42,168,127,239,2,42,133,189,148,194,254,217,10,99,199,73,141,176,119,175,142,219,152,148,177,216,198,161,140,191,54,246,100,204,201,215,126,231,170,17,19,227,109,90,241,128,168,10,124,46,1,190,221,11,60,250,189,25,120,116,242,238,77,241,24,168,198,170,140,83,249,84,50,22,229,8,25,111,82,68,114,201,16,245,20,176,15,81,173,207,204,125,0,181,138,104,217,4,200,32,138,28,227,112, +68,53,168,247,141,175,165,42,26,75,33,71,141,83,200,117,123,36,153,226,248,173,20,18,49,200,184,2,184,240,60,79,10,121,147,206,82,101,236,229,179,103,239,223,191,255,105,95,117,254,130,38,111,175,226,231,78,66,59,221,170,186,199,15,53,243,161,166,40,195,155,17,57,241,54,109,68,32,55,78,245,209,84,153,236,163,102,223,195,187,141,218,222,179,116,9,115,123,105,52,115,160,140,7,92,26,201,97,91,97,191,206,222,190,191,17,151,20,184,203,95,236,226,164,248,76,163,116,236,150,189,116,198,43,135,169,61,197,231,47,46,93,226,75,102,241,245,172,254,162,185,99,31,102,160,110,167,237,109,239,233,15,89,141,37,30,218,230,13,233,48,251,187,179,229,38,201,158,211,102,148,211,123,245,236,105,38,123,77,181,11,248,69,16,59,247,198,59,31,159,146,210,52,197,25,178,123,54,118,19,163,102,55,49,88,13,252,208,81,181,113,247,5,251,249,84,21,39,157,135,69,116,166,108,80,6,199,79,243,94,84,86,156,68,187,69,194,94,125,23,116,192,91,11,239,166, +179,191,76,208,196,229,48,31,177,139,40,127,3,197,95,131,120,1,183,16,187,238,202,30,69,85,94,197,178,183,43,197,87,4,76,48,157,219,210,72,25,53,171,140,166,199,143,85,86,197,27,244,252,197,182,224,242,103,241,59,106,156,191,90,99,15,105,192,141,197,124,98,34,249,140,192,48,78,198,184,199,25,240,45,181,32,126,84,190,105,190,41,69,46,50,18,229,110,136,84,121,91,197,115,248,61,96,195,201,233,77,103,242,220,242,44,158,91,243,205,236,169,211,45,124,74,220,28,70,226,193,129,112,228,56,117,51,189,192,79,26,190,249,124,77,127,135,144,247,118,189,192,75,236,179,170,121,47,66,96,29,37,168,209,147,253,41,2,198,252,45,255,12,193,195,3,152,140,48,39,179,228,127,84,0,26,75,103,46,62,230,92,214,31,141,207,15,250,217,244,3,246,158,173,208,192,158,251,29,253,252,238,216,62,251,181,87,160,131,119,193,248,104,157,191,94,195,24,42,190,64,247,150,120,51,45,153,149,189,27,76,223,104,44,129,130,220,55,82,9,94,177,61,114,193,34, +159,107,140,10,65,171,33,145,126,105,173,159,135,161,223,227,175,177,196,67,171,252,202,154,105,109,191,26,120,88,124,65,53,84,8,254,55,212,32,30,56,161,236,191,165,143,4,111,38,61,174,207,88,44,124,65,249,107,36,255,27,26,192,73,153,252,56,243,77,133,103,209,245,5,37,47,211,251,218,98,243,23,122,105,194,72,95,174,220,50,63,180,100,7,223,255,162,185,161,64,238,107,107,70,228,90,124,205,213,160,36,44,55,42,69,8,230,99,224,152,116,88,59,212,171,248,104,247,56,138,66,110,210,194,194,136,11,160,245,31,63,96,54,181, diff --git a/uppsrc/Core/src.tpp/Point$en-us.tpp b/uppsrc/Core/src.tpp/Point$en-us.tpp index c8ac08d5a..a10fbc715 100644 --- a/uppsrc/Core/src.tpp/Point$en-us.tpp +++ b/uppsrc/Core/src.tpp/Point$en-us.tpp @@ -45,7 +45,7 @@ nt64][@(0.0.255) >]_[* Point64]&] [s5;:Pointf`:`:typedef:%- [@(0.0.255) typedef]_[_^Point`_^ Point`_][@(0.0.255) ]_[* P ointf]&] [s2; Point with with [* double][@(0.0.255) ]coordinates .&] -[s1; &] +[s3; &] [s0; &] [ {{10000F(128)G(128)@1 [s0; [* Constructor List]]}}&] [s0;%- &] @@ -97,7 +97,7 @@ ize`_][@(0.0.255) <][*@4 T][@(0.0.255) >`&]_[*@3 sz])&] [s5;:Point`_`:`:Point`_`(const Nuller`&`):%- [* Point`_]([@(0.0.255) const]_[_^Nuller^ Null er][@(0.0.255) `&])&] [s2; Creates a [%-* Point`_ ]object and initializes with [* Null].&] -[s1; &] +[s3; &] [s0; &] [ {{10000F(128)G(128)@1 [s0; [* Public Field List]]}}&] [s0;%- &] @@ -107,7 +107,8 @@ er][@(0.0.255) `&])&] [s4;%- &] [s5;:Point`_`:`:y:%- [*@4 T]_[* y]&] [s2; the vertical coordinate&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Method List]]}}&] [s0;%- &] [s5;:Point`_`:`:Clear`(`):%- [@(0.0.255) void]_[* Clear]()&] @@ -234,7 +235,7 @@ rator/`=]([_^Size`_^ Size`_][@(0.0.255) <][*@4 T][@(0.0.255) >]_[*@3 p])&] [s5;:Point`_`:`:Serialize`(Stream`&`):%- [@(0.0.255) void]_[* Serialize]([_^Stream^ Stream][@(0.0.255) `& ]_[*@3 s])&] [s2; Serializes the point to a stream [*@(141.42.0) s].&] -[s1; &] +[s3; &] [s0; &] [ {{10000F(128)G(128)@1 [s0; [* Friend List]]}}&] [s0; &] @@ -346,5 +347,5 @@ the maximum of the respective coordinates between ][*@3 a][@3 ]and[%% vl[@(64) (][^`:`:Point`_^@(64) Point`_][@(64) _][@3 a][@(64) , ][^`:`:Point`_^@(64) Point`_][@(64) _ ][@3 b][@(64) )]&] [s2; Returns [%-*@3 b] if [%-*@3 a] is Null, [%-*@3 a] otherwise.&] -[s0; &] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/Rect$en-us.tpp b/uppsrc/Core/src.tpp/Rect$en-us.tpp index 7b225cdae..7a12df4d0 100644 --- a/uppsrc/Core/src.tpp/Rect$en-us.tpp +++ b/uppsrc/Core/src.tpp/Rect$en-us.tpp @@ -42,7 +42,8 @@ and bottom. All coordinates are of type ][*@4 T.]&] [s0; [* Rectf]&] [s5;:Rectf`:`:typedef: [@(0.0.255) typedef]_[_^Rect`_^ Rect`_][@(0.0.255) ]_[* Rectf]&] [s2;%% [* Rect`_] with [%-* double] coordinates.&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0;%% [* Public typedef Detail]]}}&] [s3;%% &] [s5;:Rect`_`:`:Pt`:`:typedef: [@(0.0.255) typedef]_[_^Point`_^ Point`_][@(0.0.255) <]T[@(0.0.255) > @@ -55,7 +56,8 @@ as [* Rect`_].&] ]_[* Sz]&] [s2;%% A [* Size`_] with it`'s coordinates of the same type [*@4 T] as [* Rect`_].&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0;%% [* Constructor Detail]]}}&] [s3; &] [s5;:Rect`_`:`:Rect`_`(`): [* Rect`_]()&] @@ -118,7 +120,8 @@ double>`&]_[*@3 r])&] [s5;:Rect`_`:`:Rect`_`(const Nuller`&`): [* Rect`_]([@(0.0.255) const]_[_^Nuller^ Nuller][@(0.0.255) `& ])&] [s2;%% Creates a [* Rect`_] and initializes it with [%-* Null].&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Field List]]}}&] [s3; &] [s5;:Rect`_`:`:left: [*@4 T]_[* left]&] @@ -135,7 +138,8 @@ double>`&]_[*@3 r])&] [s4; &] [s5;:Rect`_`:`:bottom: [*@4 T]_[* bottom]&] [s2;%% the vertical coordinate of the lower right corner&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&] [s3; &] [s5;:Rect`_`:`:Clear`(`): [@(0.0.255) void]_[* Clear]()&] diff --git a/uppsrc/Core/src.tpp/Thread$en-us.tpp b/uppsrc/Core/src.tpp/Thread$en-us.tpp index 6a4158a62..02c347db8 100644 --- a/uppsrc/Core/src.tpp/Thread$en-us.tpp +++ b/uppsrc/Core/src.tpp/Thread$en-us.tpp @@ -1,4 +1,4 @@ -topic "class Thread"; +topic "Thread"; [2 $$0,0#00000000000000000000000000000000:Default] [i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class] [l288;2 $$2,0#27521748481378242620020725143825:desc] @@ -10,9 +10,21 @@ topic "class Thread"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_} -[s3; &] +[s0; [*@3;4 Thread]&] [s1;:Thread`:`:class: [@(0.0.255) class]_[* Thread]_:_[@(0.0.255) private]_[*@3 NoCopy]&] -[s2;%% Encapsulation of thread.&] +[s9;%% Encapsulation of thread.&] +[s3;%% &] +[s0;%% &] +[ {{10000F(128)G(128)@1 [s0;%% [* Constructor Detail]]}}&] +[s3; &] +[s5;:Thread`:`:Thread`(`): [* Thread]()&] +[s2;%% Default constructor.&] +[s3; &] +[s4; &] +[s5;:Thread`:`:`~Thread`(`): [@(0.0.255) `~][* Thread]()&] +[s2;%% Destructor. Performs Detach `- thread continues running.&] +[s3;%% &] +[s0;%% &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&] [s4;H0; &] [s5;:Thread`:`:Run`(Callback`): [@(0.0.255) bool]_[* Run]([_^Callback^ Callback]_[*@3 cb])&] @@ -70,6 +82,8 @@ reads]()&] [s2;%% True if ShutdownThreads was called.&] [s3; &] [s4; &] -[s5;:Thread`:`:`~Thread`(`): [@(0.0.255) `~][* Thread]()&] -[s2;%% Destructor. Performs Detach `- thread continues running.&] +[s5;:Thread`:`:Priority`(int`): [@(0.0.255) void]_[* Priority]([@(0.0.255) int]_[*@3 percent]) +&] +[s2;%% Sets the treads priority to [%-*@3 percent ][%- (0 to 100)].&] +[s3;%% &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/Vector$en-us.tpp b/uppsrc/Core/src.tpp/Vector$en-us.tpp index ba26672bd..b7656cedb 100644 --- a/uppsrc/Core/src.tpp/Vector$en-us.tpp +++ b/uppsrc/Core/src.tpp/Vector$en-us.tpp @@ -9,7 +9,6 @@ topic "Vector"; [l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param] [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] -[*C+75 $$10,10#20308344770720113750957135429985:code] [{_}%EN-US [s1; [*@3;4 Vector]&] [s1;:noref:%- [@(0.0.255)3 template][3 _<][@(0.0.255)3 class][3 _][*@4;3 T][@(0.0.255)3 >]&] @@ -31,17 +30,18 @@ references (that means C`+`+ references and pointers) to elements.&] oveable][*/ ]type with [*/^topic`:`/`/Core`/srcdoc`/pick`_`$en`-us^ pick and optional deep copy] transfer semantics. Calling methods of picked Vector is logic error with exception of&] -[s10;%- &] -[s10;%- void_operator`=([@(0.128.128) pick`_]_[_^Vector^ Vector]`&_[@3 v])&] -[s10; void operator<<`=(const Vector`& [@3 v]) [/ (defined using DeepCopyOptionTemplate)]&] -[s10;%- void_Clear()&] -[s10;%- bool_IsPicked()_const&] -[s10; &] +[s0;%- &] +[s0;%- void_operator`=([@(0.128.128) pick`_]_[_^Vector^ Vector]`&_[@3 v])&] +[s0; void operator<<`=(const Vector`& [@3 v]) [/ (defined using DeepCopyOptionTemplate)]&] +[s0;%- void_Clear()&] +[s0;%- bool_IsPicked()_const&] +[s0; &] [s0; Optional deep copy is implemented through DeepCopyOptionTemplate macro.&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] -[s0;%- &] +[s3;%- &] [s5;:Vector`:`:Vector`(`):%- [* Vector]()&] [s2; Default constructor. Constructs empty Vector.&] [s3; &] @@ -63,9 +63,10 @@ constructor.&] [s4;%- &] [s5;:Vector`:`:`~Vector`(`):%- [@(0.0.255) `~][* Vector]()&] [s2; Destructor. Calls destructors of all elements in Vector.&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&] -[s4;H0;%- &] +[s3;%- &] [s5;:Vector`:`:Add`(`):%- [*@4 T][@(0.0.255) `&]_[* Add]()&] [s2; Adds new default constructed element to Vector.&] [s6; Requires T to have default constructor.&] @@ -509,4 +510,5 @@ oid]_[* Swap]([_^`:`:Vector^ Vector][@(0.0.255) `&]_[*@3 a], [_^`:`:Vector^ Vect simple constant time operation.&] [s7; [*C@3 a]-|First Vector to swap.&] [s7; [*C@3 b]-|Second Vector to swap.&] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/VectorMap$en-us.tpp b/uppsrc/Core/src.tpp/VectorMap$en-us.tpp index 20e2e606a..004a7d4b6 100644 --- a/uppsrc/Core/src.tpp/VectorMap$en-us.tpp +++ b/uppsrc/Core/src.tpp/VectorMap$en-us.tpp @@ -46,9 +46,10 @@ in AMap)]&] [s0;C+75 &] [s9; Optional deep copy operator is inherited from AMap class. Pick operator is implicitly defined by composition.&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)@1 [s0; [* Constructor Detail]]}}&] -[s0;%- &] +[s3;%- &] [s5;:VectorMap`:`:VectorMap`(`):%- [* VectorMap]()&] [s2; Default constructor. Constructs empty [* VectorMap].&] [s3; &] @@ -80,11 +81,12 @@ of values. Both source containers should have the same number of elements.&] [s7; [%-*@3 ndx][%- -|]Source Vector of keys.&] [s7; [%-*@3 val][%- -|]Source Vector of values.&] -[s1; &] +[s3; &] +[s0; &] [ {{10000F(128)G(128)t/25b/25@1 [s0;%- [* Public Member List]]}}&] -[s0;%- &] +[s3;%- &] [s5;:VectorMap`:`:Pop`(`):%- [*@4 T]_[* Pop]()&] [s2; Drops last element of VectorMap and returns its value.&] [s7; [*/ Return value]-|Value of dropped element.&] -[s1; &] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/algo$en-us.tpp b/uppsrc/Core/src.tpp/algo$en-us.tpp index 6f80f9bce..855b5b14d 100644 --- a/uppsrc/Core/src.tpp/algo$en-us.tpp +++ b/uppsrc/Core/src.tpp/algo$en-us.tpp @@ -10,10 +10,12 @@ topic "Algorithms"; [i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam] [b42;2 $$9,9#13035079074754324216151401829390:normal] [{_}%EN-US -[s0; [*5 Algorithms]&] +[s0; [*@3;4 Algorithms]&] +[s0; A number of generic algorithms.&] +[s3; &] [s0; &] [ {{10000F(128)G(128)@1 [s0; [* Global Functions]]}}&] -[s4;H0;%- &] +[s3;%- &] [s5;:Swap`(T`&`,T`&`):%- [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T][@(0.0.255) >]_[@(0.0.255) v oid]_[* Swap]([*@4 T][@(0.0.255) `&]_[*@3 a], [*@4 T][@(0.0.255) `&]_[*@3 b])&] [s2; Swaps values. Specific types might specialize [* Swap] with more @@ -395,4 +397,5 @@ by const method of [* T].&] [s7; [*C@3 method]-|Method of T.&] [s7; [*C@3 relation]-|Ordering relation for value returned by method.&] [s7; [*/ Return value]-|Ordering predicate.&] +[s3; &] [s0; ] \ No newline at end of file diff --git a/uppsrc/Core/src.tpp/algo$en-us.tppi b/uppsrc/Core/src.tpp/algo$en-us.tppi index 14e59b808..bfe5093a8 100644 --- a/uppsrc/Core/src.tpp/algo$en-us.tppi +++ b/uppsrc/Core/src.tpp/algo$en-us.tppi @@ -1,13 +1,13 @@ TITLE("Algorithms") COMPRESSED -120,156,237,156,121,111,218,72,20,192,191,202,72,221,173,72,4,172,79,108,160,90,181,37,155,46,74,218,172,66,154,127,144,21,12,30,18,171,198,102,61,38,105,182,180,159,125,223,140,15,108,176,29,206,112,36,85,69,26,123,230,205,59,126,239,205,195,71,219,2,250,237,55,174,200,189,225,158,248,83,59,193,125,125,100,121,90,219,148,36,181,174,11,114,253,219,217,69,181,78,231,243,48,95,84,120,81,149,69,94,18,42,240,193,139,188,32,11,162,196,171,66,85,82,69,81,229,106,61,75,39,68,107,91,130,170,178,73,2,76,18,20,89,224,21,73,149,84,94,84,84,1,230,10,28,39,112,138,32,243,146,168,10,114,205,192,164,167,181,57,24,46,194,240,106,69,172,114,60,199,41,60,207,137,130,194,137,178,196,243,162,0,34,4,69,224,57,185,134,109,67,107,255,93,169,211,9,18,53,74,174,128,234,21,144,38,73,28,72,167,211,36,145,23,57,65,148,249,170,92,169,117,241,173,105,167,153,36,63,105,146,194,213,76,15,15,2,139,116,169,126,252,94,174,243,48, -181,82,172,188,81,96,89,73,134,197,170,212,34,17,166,9,66,69,174,242,178,4,42,73,156,80,115,241,191,35,211,197,3,108,123,129,4,147,231,5,190,222,229,149,58,168,240,235,215,175,50,47,113,190,167,20,208,133,231,64,111,129,135,99,96,135,194,203,85,174,42,171,188,202,137,138,36,200,10,152,62,212,93,125,16,88,210,149,132,122,96,135,90,84,223,84,248,10,120,148,83,65,127,185,10,2,56,48,2,126,130,35,101,248,43,170,53,47,152,76,231,209,73,213,98,245,13,56,73,148,57,165,202,41,146,34,75,96,137,192,87,120,112,36,71,237,135,48,212,108,199,29,232,150,214,254,113,243,243,247,191,190,148,190,182,80,155,112,117,212,62,150,209,7,235,214,113,77,239,110,64,180,183,26,59,10,63,208,143,31,60,5,233,180,192,11,234,209,39,246,249,158,15,39,161,79,150,211,213,45,116,58,178,123,158,233,216,68,211,126,254,164,147,165,250,223,92,253,247,18,149,64,228,122,173,245,160,15,59,133,171,206,219,78,145,126,28,213,224,84,251,125,129,43,115,101, -176,238,8,65,68,134,150,238,97,237,230,93,252,176,15,223,77,251,248,189,132,174,180,248,153,63,225,104,236,215,123,199,52,232,56,68,23,210,10,41,19,58,111,153,28,17,233,90,17,229,157,239,106,71,84,105,161,206,100,17,116,175,91,35,76,202,168,53,196,61,179,111,246,144,247,56,196,4,13,204,219,59,15,17,122,80,183,204,255,48,10,23,71,15,224,66,52,112,92,140,112,191,143,193,45,247,24,132,184,166,110,123,164,76,69,87,234,232,10,13,70,196,67,119,58,156,195,48,30,187,200,192,120,136,122,206,240,17,57,67,236,234,158,227,34,248,59,52,123,223,162,3,108,182,66,253,222,96,250,151,198,87,160,11,114,250,161,146,177,243,212,208,210,248,212,116,97,25,118,22,121,14,34,160,96,114,80,23,6,181,112,207,177,141,148,81,98,24,65,41,22,202,166,135,93,63,156,205,78,177,185,84,40,155,115,133,50,92,40,8,103,115,58,126,205,220,128,161,161,99,218,30,54,168,65,221,71,4,57,207,92,56,95,32,163,165,231,10,38,29,233,199,179,139,33,140, -125,211,134,101,251,16,60,186,192,148,30,205,100,12,155,224,254,102,160,26,27,62,27,194,232,52,19,100,218,183,84,82,127,18,215,217,120,166,206,32,177,32,151,209,247,239,175,241,125,81,241,13,163,123,106,218,198,185,243,128,221,143,206,200,54,58,5,152,4,11,53,104,97,6,89,193,135,127,144,85,107,255,159,231,75,214,236,6,141,101,102,61,207,62,119,158,7,16,168,200,248,73,154,2,20,197,133,81,181,35,37,82,235,252,253,212,250,129,88,56,51,116,72,230,185,30,172,229,77,107,30,91,44,99,83,129,176,228,76,58,79,159,100,97,112,72,200,62,181,150,4,92,128,130,38,221,109,65,47,228,234,246,45,219,2,64,160,167,3,154,46,34,142,75,129,4,26,193,75,76,8,26,186,216,48,123,16,44,244,0,123,13,203,1,170,18,234,233,54,133,218,180,9,102,115,104,58,56,35,0,221,197,250,55,70,214,29,8,119,13,236,194,47,73,180,27,177,237,39,90,251,137,29,42,201,242,61,156,110,164,205,244,67,80,26,127,164,109,158,77,213,0,1,204,208,228, -40,63,24,165,241,151,209,160,11,118,195,32,108,177,222,140,68,158,153,90,17,108,46,141,175,195,141,14,50,217,72,14,96,222,42,141,47,2,139,39,126,155,12,251,3,93,98,111,228,218,190,69,48,248,159,88,52,146,142,72,173,175,57,25,248,34,243,110,171,217,115,0,169,178,55,76,175,31,228,157,133,117,17,236,254,136,218,251,119,7,6,223,58,168,250,58,28,30,74,175,50,49,229,101,244,42,224,163,215,86,101,239,91,149,140,4,124,145,105,183,205,228,57,128,76,217,27,164,183,214,169,60,63,171,11,80,247,218,168,228,65,245,209,180,117,247,49,171,70,78,247,43,59,91,45,125,51,182,83,41,215,211,213,204,95,99,35,208,39,187,177,127,61,144,248,87,16,113,120,77,28,40,208,23,237,94,202,168,217,71,182,131,200,168,119,23,73,199,223,77,226,145,34,72,179,241,173,30,92,108,100,43,16,228,50,4,177,241,218,186,60,79,74,190,38,226,154,91,150,69,210,137,238,2,135,147,71,123,1,252,214,154,154,231,37,121,19,76,166,119,62,123,79,230,170,200, -125,128,110,213,54,90,204,81,157,66,12,183,198,102,235,235,108,13,205,194,8,197,85,12,238,51,102,224,102,96,146,215,85,100,204,34,110,111,197,218,249,25,187,183,152,0,110,35,183,135,209,151,171,243,24,131,16,49,170,22,228,15,139,74,226,100,25,125,116,128,227,232,119,18,221,161,12,200,165,77,11,233,129,245,108,103,167,149,167,140,62,244,61,42,150,182,224,12,104,144,90,76,44,49,89,219,36,217,130,144,110,27,225,208,232,126,108,223,117,6,168,155,212,169,140,78,70,67,203,255,158,16,12,211,225,203,2,164,16,124,61,184,135,76,64,179,37,145,174,108,96,208,115,192,238,179,198,54,133,5,243,38,136,105,105,124,146,102,96,114,36,141,99,105,220,242,131,144,49,102,153,34,158,190,116,187,17,165,192,59,6,54,210,66,155,224,212,159,218,114,25,183,92,154,237,84,42,5,73,65,31,163,170,86,95,147,35,66,45,37,37,226,123,210,22,19,99,211,196,127,181,65,208,78,111,49,49,13,95,252,14,195,216,15,88,14,7,143,108,243,95,250,72,202,70,210, -203,23,158,159,101,121,89,116,96,27,203,82,105,180,225,125,227,25,242,99,138,116,202,88,22,237,244,220,139,38,126,191,246,141,76,160,47,241,192,185,199,59,189,49,196,85,204,39,159,70,113,113,242,31,238,244,85,175,131,250,42,146,201,5,61,8,61,153,138,153,207,88,42,182,107,206,151,13,20,106,230,217,185,128,101,222,220,129,74,157,11,246,134,75,245,179,16,187,127,236,173,84,50,215,72,224,170,104,53,109,176,139,224,158,23,210,117,50,161,171,181,122,217,60,201,41,155,173,133,75,234,73,26,160,83,22,4,140,166,13,125,186,159,104,109,170,223,158,1,59,27,98,104,14,116,143,125,235,179,29,47,58,108,248,119,94,167,48,216,110,173,61,137,145,158,158,143,137,225,173,216,240,25,75,54,223,74,175,57,49,214,159,13,187,70,252,193,176,155,93,171,247,128,224,85,11,60,101,36,120,203,46,40,229,144,14,75,191,110,151,83,177,105,150,229,220,253,153,188,141,7,10,229,191,141,151,91,108,167,151,73,175,183,116,17,18,135,109,206,218,86,169,71,239,1,165, -190,221,115,213,169,213,194,87,109,178,239,199,100,132,186,151,125,79,38,191,137,124,34,176,27,124,115,114,142,88,45,229,242,153,148,20,168,39,248,5,156,175,173,238,253,140,186,111,224,239,190,111,207,88,167,125,221,88,75,238,156,229,125,131,188,206,253,122,57,111,102,69,170,7,33,59,203,104,185,191,225,71,18,190,80,119,157,117,167,149,149,217,117,37,226,80,55,221,68,104,72,70,249,103,47,191,18,125,0,27,72,244,100,9,125,53,27,198,95,98,50,178,188,201,102,48,67,21,189,168,2,94,96,214,45,145,250,17,75,103,241,14,158,74,203,218,14,174,227,3,211,222,182,101,170,196,168,11,5,206,220,143,165,174,158,26,151,38,111,137,42,145,142,243,38,0,222,18,161,123,2,90,118,15,178,10,110,89,181,110,77,224,165,18,245,9,179,190,147,25,155,242,88,201,10,37,114,209,34,120,13,45,176,227,198,15,190,51,109,143,181,206,40,174,229,194,143,153,68,94,93,189,254,53,92,12,70,147,153,86,118,18,194,196,115,21,155,184,222,53,177,102,19,151,178,252, -32,208,229,195,231,106,210,175,218,76,30,28,246,111,173,46,204,215,90,174,115,61,3,50,155,136,252,74,87,155,230,139,255,230,3,123,106,98,203,184,196,22,251,234,210,41,92,116,10,157,227,206,81,88,55,46,151,12,241,197,146,15,93,94,78,163,145,80,175,97,145,4,36,218,100,173,72,112,170,20,246,124,91,76,80,176,209,93,104,55,5,218,190,38,216,57,214,24,58,3,76,55,32,237,40,187,214,92,166,51,231,134,107,76,35,231,204,36,48,235,159,65,183,43,13,117,117,66,99,229,63,219,230,63,135,6,97,245,149,240,255,155,131,174,69,15,193,104,24,158,253,37,39,184,28,144,100,45,176,165,52,254,60,35,15,93,37,135,70,218,199,10,78,120,44,84,55,16,151,67,233,34,189,208,103,236,221,57,41,4,22,118,136,194,164,142,89,24,166,194,116,84,56,154,7,207,228,10,115,241,73,39,4,226,183,68,104,248,152,36,45,135,54,196,174,228,135,203,87,141,194,197,102,46,12,43,51,140,194,26,138,89,148,209,89,237,124,161,155,39,150,57,224,64,176,189, -153,197,106,195,36,167,175,184,3,112,31,28,215,92,29,105,255,3,199,88,87,29, +120,156,237,92,251,111,218,202,18,254,87,86,234,57,21,169,128,227,39,54,80,29,181,37,39,189,40,105,115,21,210,252,130,172,96,240,66,172,26,155,227,53,73,115,75,251,183,223,217,245,3,27,108,135,103,120,36,81,68,18,239,236,236,204,124,223,204,142,95,105,11,232,143,63,184,34,247,134,123,226,171,118,138,251,250,216,242,180,182,41,73,106,93,23,228,250,247,243,203,106,157,206,231,97,190,168,240,162,42,139,188,36,84,224,131,23,121,65,22,68,137,87,133,170,164,138,162,202,213,122,150,78,136,214,182,4,85,101,147,4,152,36,40,178,192,43,146,42,169,188,168,168,2,204,21,56,78,224,20,65,230,37,81,21,228,154,129,73,79,107,115,32,46,130,120,181,34,86,57,158,227,20,158,231,68,65,225,68,89,226,121,81,0,21,130,34,240,156,92,195,182,161,181,255,83,169,211,9,18,117,74,174,128,233,21,208,38,73,28,104,167,211,36,145,23,57,65,148,249,170,92,169,117,241,192,180,211,92,146,159,116,73,225,106,166,135,135,129,71,186,84,127,247,65,174,243, +48,181,82,172,188,81,96,89,73,134,197,170,212,35,17,166,9,66,69,174,242,178,4,38,73,156,80,115,241,191,99,211,197,67,108,123,129,6,147,231,5,190,222,229,149,58,152,240,251,247,239,50,47,113,126,164,20,176,133,231,192,110,129,135,99,224,135,194,203,85,174,42,171,188,202,137,138,36,200,10,184,62,210,93,125,24,120,210,149,132,122,224,135,90,84,223,84,248,10,68,148,83,193,126,185,10,10,56,112,2,126,66,32,101,248,22,213,154,23,76,166,243,232,164,106,177,250,6,130,36,202,156,82,229,20,73,145,37,240,68,224,43,60,4,146,163,254,3,12,53,219,113,135,186,165,181,127,222,254,250,243,159,175,165,111,45,212,38,92,29,181,223,125,16,235,18,250,104,13,28,215,244,238,134,68,123,171,177,129,143,200,30,15,187,216,69,78,31,13,176,141,93,179,135,244,72,170,76,165,196,58,10,132,225,7,250,249,147,167,196,59,43,240,130,122,242,153,125,126,224,195,69,208,103,203,233,234,22,58,27,219,61,207,116,108,162,105,191,126,249,58,254,44,49,45,114, +189,214,122,208,71,157,194,117,231,109,167,72,63,78,106,48,212,254,80,224,202,92,25,66,113,130,0,190,145,165,123,88,187,125,31,63,236,51,245,22,60,145,208,181,22,31,249,27,142,198,254,188,119,76,131,202,33,186,144,86,72,153,208,121,203,244,136,72,215,138,40,111,188,171,157,80,163,133,58,211,69,208,189,110,141,49,41,163,214,8,247,204,62,132,202,123,28,97,130,134,230,224,206,67,132,30,212,45,243,127,24,133,139,163,7,8,35,26,58,46,70,184,223,199,16,147,123,12,74,92,83,183,61,63,184,149,58,186,70,195,49,241,208,157,14,99,24,228,1,12,3,227,17,234,57,163,71,228,140,176,171,123,14,224,227,162,145,217,251,30,29,96,179,21,26,244,6,179,191,52,185,6,91,40,140,129,145,177,113,234,104,105,114,102,186,176,12,27,69,158,131,8,24,152,20,234,130,80,11,247,28,219,72,145,138,16,148,98,80,54,61,236,250,112,54,59,197,230,74,80,54,23,130,50,92,40,128,179,57,139,95,51,23,48,52,114,76,219,195,6,117,168,251,136,160,64, +176,16,46,6,100,180,244,66,96,82,73,31,207,46,6,24,251,166,13,203,246,1,60,186,192,140,29,205,36,134,77,8,127,51,48,141,137,207,67,24,13,51,69,166,61,160,154,250,83,92,231,241,76,157,65,98,32,151,209,143,31,175,248,190,40,124,67,116,207,76,219,184,112,30,176,251,201,25,219,70,167,0,147,96,161,6,45,204,160,43,248,240,15,178,106,237,255,122,177,98,205,110,80,44,51,235,121,246,216,69,30,129,192,68,198,159,164,43,192,162,184,50,106,118,100,68,106,157,191,159,89,63,80,11,35,35,135,100,142,245,96,45,111,214,242,216,98,25,155,10,192,146,51,233,34,125,146,133,33,32,33,247,169,183,36,224,5,24,104,210,173,22,236,66,174,110,15,216,22,0,10,61,29,168,233,34,226,184,148,144,192,70,136,18,83,130,70,46,54,204,30,128,133,30,96,175,97,57,64,77,66,61,221,166,164,54,109,130,217,28,154,14,206,24,136,238,98,253,59,99,214,29,40,119,13,232,17,236,65,146,218,141,216,246,19,173,253,196,14,149,228,242,61,12,55,210, +102,250,16,148,38,159,104,79,104,83,51,64,1,115,52,41,229,131,81,154,124,141,218,25,108,177,70,142,68,145,153,89,17,124,46,77,110,194,141,14,50,217,72,10,176,104,149,38,151,129,199,211,184,77,197,254,66,87,216,27,187,182,239,17,8,255,55,134,70,50,16,169,245,53,39,3,95,100,222,237,52,123,142,32,85,14,134,211,155,39,242,222,146,117,25,218,253,21,181,247,239,143,140,124,155,96,213,183,209,232,88,122,149,169,43,47,163,87,129,24,189,182,42,7,223,170,100,36,224,139,76,187,93,38,207,17,100,202,193,80,122,103,157,202,243,115,117,9,214,189,54,42,121,164,250,100,218,186,251,152,85,35,103,251,149,189,173,150,190,27,187,169,148,155,233,106,22,175,177,17,209,167,187,177,127,61,144,248,87,16,113,120,77,28,88,160,47,219,189,148,81,179,143,108,7,145,113,239,46,210,142,127,152,196,35,69,208,102,227,129,30,92,108,100,43,16,228,50,10,98,227,181,117,121,158,148,124,77,196,13,183,44,203,164,19,221,5,142,39,143,14,130,240,59,107,106, +158,151,201,219,224,100,122,231,115,240,204,92,151,114,31,161,91,181,141,22,11,84,167,16,163,91,99,187,245,117,190,134,102,209,8,197,77,12,238,51,102,208,205,192,36,175,171,200,152,69,220,222,154,181,243,11,118,7,152,0,221,198,110,15,163,175,215,23,49,14,2,98,212,44,200,31,134,74,98,176,140,62,57,192,227,232,111,18,221,161,12,152,75,155,22,210,3,239,217,206,78,43,79,25,125,236,123,84,45,109,193,25,161,65,107,49,177,196,116,109,147,100,43,66,186,109,132,162,209,253,216,190,235,12,81,55,105,83,25,157,142,71,150,127,158,16,136,233,112,178,0,41,4,167,7,247,144,9,104,190,36,210,149,13,12,118,14,217,125,214,216,166,176,100,222,4,152,150,38,167,105,14,38,37,41,142,165,73,203,7,33,67,102,149,34,158,190,116,187,17,165,192,123,70,108,164,133,62,193,208,223,218,106,25,183,90,154,237,85,42,5,73,65,159,185,170,86,95,147,35,162,90,74,74,196,247,164,29,38,198,182,25,255,205,6,69,123,189,197,196,44,124,241,59,12,227, +126,192,229,80,120,108,155,255,210,71,82,182,146,94,190,242,252,44,203,203,162,35,219,88,86,74,163,45,239,27,207,144,31,51,76,167,28,203,98,59,29,123,209,140,63,172,125,35,147,208,87,120,232,220,227,189,222,24,226,38,230,51,159,162,184,60,243,31,238,244,117,175,131,250,38,146,233,5,61,128,158,204,96,230,115,44,149,182,27,206,151,45,20,106,22,217,133,8,203,162,185,7,149,58,151,216,91,46,213,207,194,216,195,227,222,90,37,115,131,12,92,151,90,77,27,252,34,184,231,133,236,58,157,178,171,181,126,217,60,205,41,155,173,165,75,234,105,26,65,103,60,8,56,154,38,250,116,63,209,218,86,191,61,71,236,108,18,67,115,160,123,236,172,207,118,188,232,176,225,223,121,157,161,193,110,107,237,105,140,233,233,249,152,16,111,197,196,231,60,217,126,43,189,225,196,216,124,54,236,27,227,143,134,187,217,181,250,0,24,188,110,129,167,28,9,222,178,11,74,57,164,195,202,175,219,229,84,108,154,101,57,119,127,166,111,227,129,65,249,111,227,229,22,219,217,101, +210,235,45,93,132,196,201,182,96,109,171,212,163,247,128,82,223,238,185,238,212,106,225,171,54,217,247,99,50,160,238,101,223,147,201,111,34,159,0,118,139,111,78,46,128,213,74,33,159,75,73,129,70,130,95,34,248,218,250,209,207,168,251,6,254,225,199,246,156,117,218,55,141,141,228,206,121,222,25,228,77,238,233,229,162,153,21,153,30,64,118,158,209,114,127,199,143,36,124,161,238,38,235,78,43,43,179,155,74,196,145,110,186,9,104,72,70,249,103,47,191,18,125,136,99,175,35,211,247,184,65,254,10,147,177,229,77,55,131,57,86,209,139,42,16,5,230,221,10,169,31,113,233,60,222,193,83,109,89,219,193,77,92,48,237,109,91,102,74,140,117,161,194,185,251,177,52,212,51,114,105,250,86,168,18,233,116,222,6,129,119,196,208,3,33,90,118,15,178,14,221,178,106,221,134,136,151,202,168,207,152,245,157,204,217,148,199,74,214,40,145,203,22,193,27,104,129,29,55,126,240,189,105,123,172,117,70,113,43,151,126,204,36,138,234,250,245,175,225,98,112,154,204,181,178,83, +8,19,207,85,108,227,122,215,212,155,109,92,202,242,65,160,203,135,207,213,164,95,181,153,62,56,236,223,90,93,154,95,27,185,206,245,12,148,217,6,242,107,93,109,90,12,255,237,3,123,102,98,203,184,194,22,59,117,233,20,46,59,133,206,187,206,73,88,55,174,86,132,248,114,197,135,46,175,102,169,145,48,175,97,145,4,73,180,233,90,145,226,84,45,236,249,182,152,162,96,163,187,212,110,11,180,125,77,112,231,157,198,168,51,196,116,3,210,78,178,107,205,85,58,231,220,112,141,89,202,57,115,9,204,250,103,176,237,90,67,93,157,80,172,252,103,219,252,231,208,0,86,223,8,255,223,28,116,45,122,8,164,65,60,251,36,39,184,28,144,228,90,224,75,105,242,101,78,31,186,78,138,70,214,199,10,78,120,44,52,55,80,151,195,210,101,122,161,47,216,187,115,82,24,88,216,35,22,38,109,204,162,97,42,153,78,10,39,139,208,51,185,194,66,252,164,19,2,245,59,98,104,248,152,36,45,135,54,96,87,242,225,242,77,163,228,98,51,151,38,43,115,140,146,53,84, +179,44,71,231,173,243,149,110,159,177,44,0,71,66,219,219,121,90,109,153,201,233,43,238,1,185,143,144,215,225,127,13,211,254,15,210,245,104,20, diff --git a/uppsrc/Core/src.tpp/all.i b/uppsrc/Core/src.tpp/all.i index 6eb128f79..c0856c79d 100644 --- a/uppsrc/Core/src.tpp/all.i +++ b/uppsrc/Core/src.tpp/all.i @@ -1,3 +1,7 @@ +TOPIC("AIndex$en-us") +#include "AIndex$en-us.tppi" +END_TOPIC + TOPIC("algo$en-us") #include "algo$en-us.tppi" END_TOPIC @@ -14,16 +18,20 @@ TOPIC("AppEnv$en-us") #include "AppEnv$en-us.tppi" END_TOPIC -TOPIC("BiVector$en-us") -#include "BiVector$en-us.tppi" +TOPIC("Array$en-us") +#include "Array$en-us.tppi" END_TOPIC -TOPIC("Buffer$en-us") -#include "Buffer$en-us.tppi" +TOPIC("ArrayIndex$en-us") +#include "ArrayIndex$en-us.tppi" END_TOPIC -TOPIC("CParser$en-us") -#include "CParser$en-us.tppi" +TOPIC("ArrayMap$en-us") +#include "ArrayMap$en-us.tppi" +END_TOPIC + +TOPIC("DateFmt$en-us") +#include "DateFmt$en-us.tppi" END_TOPIC TOPIC("Exc$en-us") @@ -42,26 +50,30 @@ TOPIC("MathUtil$en-us") #include "MathUtil$en-us.tppi" END_TOPIC +TOPIC("NetNode$en-us") +#include "NetNode$en-us.tppi" +END_TOPIC + TOPIC("One$en-us") #include "One$en-us.tppi" END_TOPIC -TOPIC("PtePtr$en-us") -#include "PtePtr$en-us.tppi" +TOPIC("Point$en-us") +#include "Point$en-us.tppi" END_TOPIC -TOPIC("SerializationUtils$en-us") -#include "SerializationUtils$en-us.tppi" +TOPIC("Rect$en-us") +#include "Rect$en-us.tppi" +END_TOPIC + +TOPIC("Segtor$en-us") +#include "Segtor$en-us.tppi" END_TOPIC TOPIC("Size$en-us") #include "Size$en-us.tppi" END_TOPIC -TOPIC("Stream$en-us") -#include "Stream$en-us.tppi" -END_TOPIC - TOPIC("String$en-us") #include "String$en-us.tppi" END_TOPIC @@ -70,7 +82,15 @@ TOPIC("String1$en-us") #include "String1$en-us.tppi" END_TOPIC -TOPIC("StringBuffer$en-us") -#include "StringBuffer$en-us.tppi" +TOPIC("Thread$en-us") +#include "Thread$en-us.tppi" +END_TOPIC + +TOPIC("Vector$en-us") +#include "Vector$en-us.tppi" +END_TOPIC + +TOPIC("VectorMap$en-us") +#include "VectorMap$en-us.tppi" END_TOPIC