Mailinglist Archive: yast-commit (595 mails)

< Previous Next >
[yast-commit] r54325 - in /trunk/core/libycp: src/YCPBuiltinSymbol.cc testsuite/tests/builtin/Builtin-Symbol.err testsuite/tests/builtin/Builtin-Symbol.out testsuite/tests/builtin/Builtin-Symbol.ycp
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Mon, 22 Dec 2008 11:48:13 -0000
  • Message-id: <E1LEjGf-0007j1-QH@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Mon Dec 22 12:48:13 2008
New Revision: 54325

URL: http://svn.opensuse.org/viewcvs/yast?rev=54325&view=rev
Log:
- removed conversion of integer to symbol again - it's plain wrong since `1 is
not valid

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.cc?rev=54325&r1=54324&r2=54325&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPBuiltinSymbol.cc (original)
+++ trunk/core/libycp/src/YCPBuiltinSymbol.cc Mon Dec 22 12:48:13 2008
@@ -33,10 +33,9 @@


static YCPValue
-s_tosymbol1 (const YCPString& v)
+s_tosymbol (const YCPString& v)
{
/* @builtin tosymbol
- * @id tosymbol-string
* @short Converts a string to a symbol.
*
* @param string VALUE
@@ -49,29 +48,11 @@
}


-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_tosymbol1 },
- { "tosymbol", "symbol (const integer)",
(void*) s_tosymbol2 },
+ { "tosymbol", "symbol (const string)",
(void*) s_tosymbol },
{ 0 }
};


Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err?rev=54325&r1=54324&r2=54325&view=diff
==============================================================================
--- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (original)
+++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Mon Dec 22
12:48:13 2008
@@ -8,10 +8,6 @@
----------------------------------------------------------------------
Parsed:
----------------------------------------------------------------------
-tosymbol (69)
-----------------------------------------------------------------------
-Parsed:
-----------------------------------------------------------------------
tosymbol (nil)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-Symbol.ycp:15 Argument (nil) to
tosymbol(...) is nil
+[Interpreter] tests/builtin/Builtin-Symbol.ycp:14 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/builtin/Builtin-Symbol.out?rev=54325&r1=54324&r2=54325&view=diff
==============================================================================
--- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (original)
+++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Mon Dec 22
12:48:13 2008
@@ -1,4 +1,3 @@
("** 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/builtin/Builtin-Symbol.ycp?rev=54325&r1=54324&r2=54325&view=diff
==============================================================================
--- trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (original)
+++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Mon Dec 22
12:48:13 2008
@@ -11,6 +11,5 @@
("** tosymbol **")

(tosymbol ("test"))
-(tosymbol (69))
(tosymbol (nil))


--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages