Author: aschnell Date: Sun Dec 21 21:11:51 2008 New Revision: 54322 URL: http://svn.opensuse.org/viewcvs/yast?rev=54322&view=rev Log: - added conversion of integer to symbol Modified: trunk/core/libycp/src/YCPBuiltinSymbol.cc trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Modified: trunk/core/libycp/src/YCPBuiltinSymbol.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinSymbol.... ============================================================================== --- trunk/core/libycp/src/YCPBuiltinSymbol.cc (original) +++ trunk/core/libycp/src/YCPBuiltinSymbol.cc Sun Dec 21 21:11:51 2008 @@ -21,6 +21,7 @@ #include "ycp/YCPBuiltinSymbol.h" #include "ycp/YCPSymbol.h" #include "ycp/YCPString.h" +#include "ycp/YCPInteger.h" #include "ycp/YCPVoid.h" #include "ycp/YCPCode.h" #include "ycp/YCPCodeCompare.h" @@ -32,9 +33,10 @@ static YCPValue -s_tosymbol (const YCPString& v) +s_tosymbol1 (const YCPString& v) { - /* @builtin tosymbol + /* @builtin tosymbol + * @id tosymbol-string * @short Converts a string to a symbol. * * @param string VALUE @@ -47,11 +49,29 @@ } +static YCPValue +s_tosymbol2 (const YCPInteger& v) +{ + /* @builtin tosymbol + * @id tosymbol-integer + * @short Converts a integer to a symbol. + * + * @param string VALUE + * @return symbol + * + * @usage tosymbol(69) -> `69 + */ + + return YCPSymbol(v->toString()); +} + + YCPBuiltinSymbol::YCPBuiltinSymbol () { // must be static, registerDeclarations saves a pointer to it! static declaration_t declarations[] = { - { "tosymbol", "symbol (const string)", (void*) s_tosymbol }, + { "tosymbol", "symbol (const string)", (void*) s_tosymbol1 }, + { "tosymbol", "symbol (const integer)", (void*) s_tosymbol2 }, { 0 } }; Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/built... ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Sun Dec 21 21:11:51 2008 @@ -8,6 +8,10 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +tosymbol (69) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- tosymbol (nil) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-Symbol.ycp:14 Argument (nil) to tosymbol(...) is nil +[Interpreter] tests/builtin/Builtin-Symbol.ycp:15 Argument (nil) to tosymbol(...) is nil Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/built... ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Sun Dec 21 21:11:51 2008 @@ -1,3 +1,4 @@ ("** tosymbol **") (`test) +(`69) (nil) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/built... ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Sun Dec 21 21:11:51 2008 @@ -11,5 +11,6 @@ ("** tosymbol **") (tosymbol ("test")) +(tosymbol (69)) (tosymbol (nil)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org