diff --git a/uppsrc/Core/src.tpp/JSON$en-us.tpp b/uppsrc/Core/src.tpp/JSON$en-us.tpp index 4c58501ee..f4d02005a 100644 --- a/uppsrc/Core/src.tpp/JSON$en-us.tpp +++ b/uppsrc/Core/src.tpp/JSON$en-us.tpp @@ -72,8 +72,8 @@ represents JSON object.&] [s5;:Json`:`:CatRaw`(const char`*`,const String`&`): [_^Json^ Json][@(0.0.255) `&]_[* CatRa w]([@(0.0.255) const]_[@(0.0.255) char]_`*[*@3 key], [@(0.0.255) const]_[_^String^ String][@(0.0.255) `& ]_[*@3 val])&] -[s2;%% Appends raw text (which must be a valid JSON) [%-*@3 val] with -[%-*@3 key].&] +[s2;%% Appends raw text (which must be a valid JSON) [%-*@3 val] and +[%-*@3 key] as key`-value pair.&] [s3;%% &] [s4;%% &] [s5;:Json`:`:Json`(const char`*`,const Value`&`): [* Json]([@(0.0.255) const]_[@(0.0.255) c @@ -105,6 +105,11 @@ har]_`*[*@3 key], [@(0.0.255) const]_[_^JsonArray^ JsonArray][@(0.0.255) `&]_[*@ [s2;%% Returns current JSON formatted text.&] [s3; &] [s4; &] +[s5;:Json`:`:operator bool`(`)const: [* operator_bool]()_[@(0.0.255) const]&] +[s2;%% Returns true if any key`-value pairs were added to this JSON +object.&] +[s3; &] +[s4; &] [s5;:Json`:`:operator`(`)`(const char`*`,const Value`&`): [_^Json^ Json][@(0.0.255) `&]_[* o perator()]([@(0.0.255) const]_[@(0.0.255) char]_`*[*@3 key], [@(0.0.255) const]_[_^Value^ V alue][@(0.0.255) `&]_[*@3 value])&] @@ -155,9 +160,14 @@ t]&] [s2;%% Returns current JSON formatted text.&] [s3; &] [s4; &] +[s5;:JsonArray`:`:operator bool`(`)const: [* operator_bool]()_[@(0.0.255) const]&] +[s2;%% Returns true if there were any elements inserted JSON array.&] +[s3; &] +[s4; &] [s5;:JsonArray`:`:CatRaw`(const String`&`): [_^JsonArray^ JsonArray][@(0.0.255) `&]_[* CatR aw]([@(0.0.255) const]_[_^String^ String][@(0.0.255) `&]_[*@3 val])&] -[s2;%% Appends raw text (which must be a valid JSON).&] +[s2;%% Appends raw text (which must be a valid JSON) as an array +element.&] [s3;%% &] [s4; &] [s5;:JsonArray`:`:operator`<`<`(const Value`&`): [_^JsonArray^ JsonArray][@(0.0.255) `&]_ diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index 413455826..10912a347 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -10,7 +10,6 @@ uses ide\Browser, CodeEditor, CtrlLib, - Web, plugin\bz2, HexView, art\BlueBar, diff --git a/uppsrc/ide/init b/uppsrc/ide/init index c1fe1e9f4..7b9c15caf 100644 --- a/uppsrc/ide/init +++ b/uppsrc/ide/init @@ -9,7 +9,6 @@ #include "ide\Browser/init" #include "CodeEditor/init" #include "CtrlLib/init" -#include "Web/init" #include "plugin\bz2/init" #include "HexView/init" #include "art\BlueBar/init"