Skip to content

Commit

Permalink
fix #490 update default prompt + display overload
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nelson-numerical-software
Nelson-numerical-software committed Aug 24, 2021
1 parent 79c3f54 commit 1d5d85b
Show file tree
Hide file tree
Showing 46 changed files with 143 additions and 95 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -12,6 +12,10 @@

- [#477](http://github.com/Nelson-numerical-software/nelson/issues/477): update files watcher algo.

- [#489](http://github.com/Nelson-numerical-software/nelson/issues/489): display builtin and associated overload.

- [#490](http://github.com/Nelson-numerical-software/nelson/issues/490): update default prompt.

## Bug Fixes:

- [#480](http://github.com/Nelson-numerical-software/nelson/issues/480): publisher name updated for windows installer.
Expand Down
2 changes: 1 addition & 1 deletion modules/audio/builtin/cpp/Gateway.cpp
View file
Expand Up @@ -59,7 +59,7 @@ const std::wstring gatewayName = L"audio";
static const nlsGateway gateway[] = {
{ "audiodevinfo", (void*)Nelson::AudioGateway::audiodevinfoBuiltin, 1, -1 },
{ "audioplayer", (void*)Nelson::AudioGateway::audioplayerBuiltin, 1, -1 },
{ "audioplayer_disp", (void*)Nelson::AudioGateway::audioplayer_dispBuiltin, 0, 1,
{ "audioplayer_display", (void*)Nelson::AudioGateway::audioplayer_dispBuiltin, 0, 2,
CPP_BUILTIN_WITH_EVALUATOR },
{ "audioplayer_delete", (void*)Nelson::AudioGateway::audioplayer_deleteBuiltin, 0, 1 },
{ "audioplayer_isvalid", (void*)Nelson::AudioGateway::audioplayer_isvalidBuiltin, 1, 1,
Expand Down
2 changes: 1 addition & 1 deletion modules/audio/builtin/cpp/audioplayer_dispBuiltin.cpp
View file
Expand Up @@ -36,7 +36,7 @@ Nelson::AudioGateway::audioplayer_dispBuiltin(Evaluator* eval, int nLhs, const A
{
ArrayOfVector retval;
nargoutcheck(nLhs, 0, 0);
nargincheck(argIn, 1, 1);
nargincheck(argIn, 1, 2);
ArrayOf param1 = argIn[0];
if (param1.isHandle()) {
Interface* io = eval->getInterface();
Expand Down
2 changes: 1 addition & 1 deletion modules/com_engine/builtin/cpp/COM_dispBuiltin.cpp
View file
Expand Up @@ -35,7 +35,7 @@ Nelson::ComEngineGateway::COM_dispBuiltin(Evaluator* eval, int nLhs, const Array
ArrayOfVector retval;
#ifdef _MSC_VER
nargoutcheck(nLhs, 0, 0);
nargincheck(argIn, 1, 1);
nargincheck(argIn, 1, 2);
ArrayOf param1 = argIn[0];
DispComHandleObject(eval, param1);
#else
Expand Down
2 changes: 1 addition & 1 deletion modules/com_engine/builtin/cpp/Gateway.cpp
View file
Expand Up @@ -54,7 +54,7 @@ static const nlsGateway gateway[] = {
{ "actxGetRunningServer", (void*)Nelson::ComEngineGateway::actxGetRunningServerBuiltin, 1, 1 },
{ "actxcontrollist", (void*)Nelson::ComEngineGateway::actxcontrollistBuiltin, 1, 0 },
{ "actxserverlist", (void*)Nelson::ComEngineGateway::actxserverlistBuiltin, 1, 0 },
{ "COM_disp", (void*)Nelson::ComEngineGateway::COM_dispBuiltin, 0, 1,
{ "COM_display", (void*)Nelson::ComEngineGateway::COM_dispBuiltin, 0, 2,
CPP_BUILTIN_WITH_EVALUATOR },
{ "COM_fieldnames", (void*)Nelson::ComEngineGateway::COM_fieldnamesBuiltin, 1, 1 },
{ "COM_methods", (void*)Nelson::ComEngineGateway::COM_methodsBuiltin, 1, 1 },
Expand Down
5 changes: 4 additions & 1 deletion modules/core/tests/test_evalc.m
View file
Expand Up @@ -31,6 +31,7 @@
ans =
1
';
assert_isequal(R, REF);
%=============================================================================
Expand All @@ -43,9 +44,11 @@
assert_isequal(R, REF);
%=============================================================================
R = evalc('A = 32');
REF = 'A =
REF = '
A =
32
';
assert_isequal(R, REF);
%=============================================================================
Expand Down
0 modules/double/tests/test_double_disp.m → modules/double/tests/test_double_display.m
View file
File renamed without changes.
30 changes: 30 additions & 0 deletions modules/double/tests/test_double_disp.ref → modules/double/tests/test_double_display.ref
View file
Expand Up @@ -3,41 +3,50 @@ ans =

2.2204e-16


ans =

3.1416


ans =

NaN


ans =

Inf


ans =

0.0000 0.0000


ans =

0.0000 + 3.1416i 3.0000 + 0.0000i
3.1416 + 0.0000i 6.2832 + 0.0000i


ans =

1 2 3


ans =

1 100000000
100000000 1


ans =

1 1.0000e+09
1.0000e+09 1


ans =

1 0 0 0 0
Expand All @@ -46,6 +55,7 @@ ans =
0 0 0 1 0
0 0 0 0 1


ans =

0.1000 0.0000 0.0000 0.0000 0.0000
Expand All @@ -54,22 +64,28 @@ ans =
0.0000 0.0000 0.0000 0.1000 0.0000
0.0000 0.0000 0.0000 0.0000 0.1000


ans =

1 1
-100000000 1


ans =

1 1.0000e+09
-1.0000e+09 1


A =

0.5488 0.6459 0.7917
0.7152 0.4376 0.5289
0.6028 0.8918 0.5680
0.5449 0.9637 0.9256
0.4237 0.3834 0.0710


B =

0.0871 0.9786 0.6399
Expand All @@ -78,6 +94,7 @@ B =
0.7782 0.7805 0.5218
0.8700 0.1183 0.4147


ans =

0.5488 + 0.0871i 0.6459 + 0.9786i 0.7917 + 0.6399i
Expand All @@ -86,6 +103,7 @@ ans =
0.5449 + 0.7782i 0.9637 + 0.7805i 0.9256 + 0.5218i
0.4237 + 0.8700i 0.3834 + 0.1183i 0.0710 + 0.4147i


ans =

1.0000 + 1.0000i 0.0000 + 0.0000i 0.0000 + 0.0000i
Expand All @@ -94,46 +112,58 @@ ans =
0.0000 + 0.0000i 0.0000 + 0.0000i 0.0000 + 0.0000i
0.0000 + 0.0000i 0.0000 + 0.0000i 0.0000 + 0.0000i


ans =

2.220446049250313e-16


ans =

3.141592653589793


ans =

300000000


ans =

3.000000000000000e+09


ans =

-300000000


ans =

-3.000000000000000e+09


ans =

0.000001234500000


ans =

0.000333333333333


ans =

1.333333333333333 0.000001234500000


ans =

0.000001234500000


ans =

0.000001234500000 0.000001234500000

9 changes: 9 additions & 0 deletions modules/double/tests/test_empty_display.ref
View file
Expand Up @@ -3,34 +3,43 @@ ans =

0 0


ans =

0 0


ans =

0 0


ans =

<double> - size: 1x2x0
[]


ans =

<double> - size: 5x0x2x4
[]


ans =

<cell> - size: 3x5x8x13x0
[]


ans =

<struct> - size: 1x2x0
[]


M =

<double> - size: 4x3x0
[]

6 changes: 3 additions & 3 deletions modules/dynamic_link/builtin/cpp/Gateway.cpp
View file
Expand Up @@ -73,17 +73,17 @@ static const nlsGateway gateway[] = { { "addgateway",
1, CPP_BUILTIN_WITH_EVALUATOR },
{ "removegateway", (void*)Nelson::DynamicLinkGateway::removegatewayBuiltin, 0, 1,
CPP_BUILTIN_WITH_EVALUATOR },
{ "dlsym_disp", (void*)Nelson::DynamicLinkGateway::dlsym_dispBuiltin, 0, 1,
{ "dlsym_display", (void*)Nelson::DynamicLinkGateway::dlsym_dispBuiltin, 0, 2,
CPP_BUILTIN_WITH_EVALUATOR },
{ "dlsym_isvalid", (void*)Nelson::DynamicLinkGateway::dlsym_isvalidBuiltin, 1, 1,
CPP_BUILTIN_WITH_EVALUATOR },
{ "dllib_disp", (void*)Nelson::DynamicLinkGateway::dllib_dispBuiltin, 0, 1,
{ "dllib_display", (void*)Nelson::DynamicLinkGateway::dllib_dispBuiltin, 0, 2,
CPP_BUILTIN_WITH_EVALUATOR },
{ "dllib_isvalid", (void*)Nelson::DynamicLinkGateway::dllib_isvalidBuiltin, 1, 1,
CPP_BUILTIN_WITH_EVALUATOR },
{ "dlcall", (void*)Nelson::DynamicLinkGateway::dlcallBuiltin, -1, -1,
CPP_BUILTIN_WITH_EVALUATOR },
{ "libpointer_disp", (void*)Nelson::DynamicLinkGateway::libpointer_dispBuiltin, 0, 1,
{ "libpointer_display", (void*)Nelson::DynamicLinkGateway::libpointer_dispBuiltin, 0, 2,
CPP_BUILTIN_WITH_EVALUATOR },
{ "isNull", (void*)Nelson::DynamicLinkGateway::isNullBuiltin, 1, 1,
CPP_BUILTIN_WITH_EVALUATOR },
Expand Down
2 changes: 1 addition & 1 deletion modules/dynamic_link/builtin/cpp/dllib_dispBuiltin.cpp
View file
Expand Up @@ -35,7 +35,7 @@ ArrayOfVector
Nelson::DynamicLinkGateway::dllib_dispBuiltin(Evaluator* eval, int nLhs, const ArrayOfVector& argIn)
{
ArrayOfVector retval;
nargincheck(argIn, 1, 1);
nargincheck(argIn, 1, 2);
nargoutcheck(nLhs, 0, 0);
ArrayOf param1 = argIn[0];
if (param1.isHandle()) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dynamic_link/builtin/cpp/dlsym_dispBuiltin.cpp
View file
Expand Up @@ -35,7 +35,7 @@ ArrayOfVector
Nelson::DynamicLinkGateway::dlsym_dispBuiltin(Evaluator* eval, int nLhs, const ArrayOfVector& argIn)
{
ArrayOfVector retval;
nargincheck(argIn, 1, 1);
nargincheck(argIn, 1, 2);
nargoutcheck(nLhs, 0, 0);
ArrayOf param1 = argIn[0];
if (param1.isHandle()) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dynamic_link/builtin/cpp/libpointer_dispBuiltin.cpp
View file
Expand Up @@ -36,7 +36,7 @@ Nelson::DynamicLinkGateway::libpointer_dispBuiltin(
Evaluator* eval, int nLhs, const ArrayOfVector& argIn)
{
ArrayOfVector retval;
nargincheck(argIn, 1, 1);
nargincheck(argIn, 1, 2);
nargoutcheck(nLhs, 0, 0);
ArrayOf param1 = argIn[0];
if (param1.isHandle()) {
Expand Down
3 changes: 1 addition & 2 deletions modules/elementary_functions/builtin/cpp/dispBuiltin.cpp
View file
Expand Up @@ -37,8 +37,7 @@ Nelson::ElementaryFunctionsGateway::dispBuiltin(
nargincheck(argIn, 1, 1);
nargoutcheck(nLhs, 0, 0);
ArrayOf variable = argIn[0];
variable.name("");
OverloadDisplay(eval, variable, true);
OverloadDisplay(eval, variable, "", true);
return retval;
}
//=============================================================================
26 changes: 1 addition & 25 deletions modules/elementary_functions/builtin/cpp/displayBuiltin.cpp
View file
Expand Up @@ -41,32 +41,8 @@ Nelson::ElementaryFunctionsGateway::displayBuiltin(
std::string variableName = variable.name();
if (argIn.size() == 2) {
variableName = argIn[1].getContentAsCString();
variable.name(variableName);
}
OverloadDisplay(eval, variable, true);

/*
std::wstring variableName;
ArrayOf variableValue;
Interface* io = eval->getInterface();
switch (argIn.size()) {
case 1: {
variableName = argIn[0].name();
io->outputMessage(variableName + " = \n\n");
OverloadDisplay(eval, argIn[0], true);
} break;
case 2: {
std::wstring variableName = argIn[1].getContentAsWideString();
io->outputMessage(variableName + L" =\n\n");
OverloadDisplay(eval, argIn[0], true);
}
} break;
}
if (!variableName.empty()) {
io->outputMessage(variableName + L" =\n\n");
}
*/
OverloadDisplay(eval, variable, variableName, true);
return retval;
}
//=============================================================================
2 changes: 1 addition & 1 deletion ...error_manager/functions/MException_disp.m → ...or_manager/functions/MException_display.m
View file
Expand Up @@ -23,7 +23,7 @@
% License along with this program. If not, see <http://www.gnu.org/licenses/>.
% LICENCE_BLOCK_END
%=============================================================================
function MException_disp(e)
function MException_display(e, name)
r = struct(e);
d = evalc('disp(r);');
disp(replace(d, '<struct>', '<MException>'))
Expand Down
2 changes: 2 additions & 0 deletions modules/files_folders_functions/builtin/cpp/dirBuiltin.cpp
View file
Expand Up @@ -77,6 +77,7 @@ Nelson::FilesFoldersGateway::dirBuiltin(int nLhs, const ArrayOfVector& argIn)
+ _W("Not a file or a directory.");
NelsonPrint(msg);
} else {
NelsonPrint("\n");
for (boost::container::vector<FileInfo>::iterator it = res.begin(); it != res.end();
++it) {
if (NelsonConfiguration::getInstance()->getInterruptPending()) {
Expand All @@ -92,6 +93,7 @@ Nelson::FilesFoldersGateway::dirBuiltin(int nLhs, const ArrayOfVector& argIn)
NelsonPrint(it->getName() + L"\n");
}
}
NelsonPrint("\n");
}
} else {
stringVector fieldnames;
Expand Down

0 comments on commit 1d5d85b

Please sign in to comment.