Author: aschnell
Date: Fri May 6 11:05:14 2011
New Revision: 63918
URL: http://svn.opensuse.org/viewcvs/yast?rev=63918&view=rev
Log:
- backported isempty and tosymbol builtins needed by storage
Added:
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp
Modified:
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h
branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out
branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp
branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am Fri May 6 11:05:14 2011
@@ -45,7 +45,7 @@
YCPBuiltinList.cc YCPBuiltinBoolean.cc \
YCPBuiltinString.cc YCPBuiltinTerm.cc \
YCPBuiltinVoid.cc YCPBuiltinMap.cc \
- YCPBuiltinMisc.cc \
+ YCPBuiltinMisc.cc YCPBuiltinSymbol.cc \
YCPBuiltinMultiset.cc \
YSymbolEntry.cc \
TypeStatics.cc \
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc Fri May 6 11:05:14 2011
@@ -53,6 +53,9 @@
#include "ycp/YCPBuiltinMultiset.h"
static YCPBuiltinMultiset builtin_multiset; // trigger constructor
+#include "ycp/YCPBuiltinSymbol.h"
+static YCPBuiltinSymbol builtin_symbol; // trigger constructor
+
#include "ycp/YCPBuiltinMap.h"
static YCPBuiltinMap builtin_map; // trigger constructor
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc Fri May 6 11:05:14 2011
@@ -914,6 +914,27 @@
}
+static YCPValue
+l_isempty(const YCPList& l)
+{
+ /**
+ * @builtin isempty
+ * @id isempty-list
+ * @short Returns whether the list <tt>l</tt> is empty.
+ * @param list l List
+ * @return boolean Emptiness of list <tt>l</tt>
+ *
+ * @description
+ * Notice that the list <tt>l</tt> must not be nil.
+ *
+ * @usage isempty([]) -> true
+ * @usage isempty([19, 29]) -> false
+ */
+
+ return YCPBoolean(l->isEmpty());
+}
+
+
// parameter is YCPValue because we accept 'nil'
static YCPValue
l_size (const YCPValue &list)
@@ -1352,6 +1373,7 @@
{ "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX|DECL_NIL },
{ "+", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX },
{ "+", "list <any> (const list <any>, any)", (void *)l_add },
+ { "isempty", "boolean (const list <any>)", (void *)l_isempty },
{ "size", "integer (const list <any>)", (void *)l_size, DECL_NIL },
{ "remove", "list <flex> (const list <flex>, const integer)", (void *)l_remove, DECL_FLEX },
{ "select", "flex (const list <flex>, integer, flex)", (void *)l_select, DECL_NIL|DECL_FLEX },
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc Fri May 6 11:05:14 2011
@@ -361,6 +361,27 @@
}
+static YCPValue
+m_isempty(const YCPMap& m)
+{
+ /**
+ * @builtin isempty
+ * @id isempty-map
+ * @short Returns whether the map <tt>m</tt> is empty.
+ * @param map m Map
+ * @return boolean Emptiness of map <tt>m</tt>
+ *
+ * @description
+ * Notice that the map <tt>m</tt> must not be nil.
+ *
+ * @usage isempty($[]) -> true
+ * @usage isempty($[ `host : "pandora" ]) -> false
+ */
+
+ return YCPBoolean(m->isEmpty());
+}
+
+
// parameter is YCPValue because we accept 'nil'
static YCPValue
m_size (const YCPValue &map)
@@ -547,6 +568,7 @@
{ "+", "map (const map , const map )", (void *)m_unionmap },
{ "add", "map (const map , const flex1, const flex2)", (void *)m_addmap, DECL_FLEX },
{ "change", "map (const map , const flex1, const flex2)", (void *)m_changemap,DECL_FLEX|DECL_DEPRECATED },
+ { "isempty", "boolean (const map )", (void *)m_isempty },
{ "size", "integer (const map )", (void *)m_size, DECL_NIL },
{ "foreach","flex1 (variable <flex2>, variable <flex3>, const map , const block <flex1>)", (void *)m_foreach, DECL_LOOP|DECL_SYMBOL|DECL_FLEX },
{ "tomap", "map (const any)", (void *)m_tomap, DECL_FLEX },
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc Fri May 6 11:05:14 2011
@@ -58,6 +58,27 @@
static YCPValue
+s_isempty(const YCPString& s)
+{
+ /**
+ * @builtin isempty
+ * @id isempty-string
+ * @short Returns whether the string <tt>s</tt> is empty.
+ * @param string s String
+ * @return boolean Emptiness of string <tt>s</tt>
+ *
+ * @description
+ * Notice that the string <tt>s</tt> must not be nil.
+ *
+ * @usage isempty("") -> true
+ * @usage isempty("test") -> false
+ */
+
+ return YCPBoolean(s->isEmpty());
+}
+
+
+static YCPValue
s_size (const YCPString &s)
{
/**
@@ -1562,6 +1583,7 @@
{ "tostring", "string (any)", (void *)s_tostring },
{ "tohexstring", "string (integer)", (void *)s_tohexstring1 },
{ "tohexstring", "string (integer, integer)", (void *)s_tohexstring2 },
+ { "isempty", "boolean (string)", (void *)s_isempty },
{ "size", "integer (string)", (void *)s_size },
{ "find", "integer (string, string)", (void *)s_find, DECL_DEPRECATED },
{ "search", "integer (string, string)", (void *)s_search },
Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc?rev=63918&view=auto
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc (added)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc Fri May 6 11:05:14 2011
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE Linux AG |
+\----------------------------------------------------------------------/
+
+ File: YCPBuiltinSymbol.cc
+ Summary: YCP Symbol Builtins
+
+ Authors: Arvin Schnell
+ Maintainer: Arvin Schnell
+
+/-*/
+
+#include "ycp/YCPBuiltinSymbol.h"
+#include "ycp/YCPSymbol.h"
+#include "ycp/YCPString.h"
+#include "ycp/YCPInteger.h"
+#include "ycp/YCPVoid.h"
+#include "ycp/YCPBoolean.h"
+#include "ycp/YCPCode.h"
+#include "ycp/YCPCodeCompare.h"
+#include "ycp/StaticDeclaration.h"
+
+#include "ycp/y2log.h"
+
+extern StaticDeclaration static_declarations;
+
+
+static YCPValue
+s_tosymbol (const YCPString& v)
+{
+ /* @builtin tosymbol
+ * @short Converts a string to a symbol.
+ *
+ * @param string VALUE
+ * @return symbol
+ *
+ * @usage tosymbol("test") -> `test
+ */
+
+ return YCPSymbol(v->value());
+}
+
+
+YCPBuiltinSymbol::YCPBuiltinSymbol ()
+{
+ // must be static, registerDeclarations saves a pointer to it!
+ static declaration_t declarations[] = {
+ { "tosymbol", "symbol (const string)", (void*) s_tosymbol },
+ { 0 }
+ };
+
+ static_declarations.registerDeclarations ("YCPBuiltinSymbol", declarations);
+}
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc Fri May 6 11:05:14 2011
@@ -113,6 +113,13 @@
}
+bool
+YCPMapRep::isEmpty() const
+{
+ return stl_map.empty();
+}
+
+
long
YCPMapRep::size() const
{
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc Fri May 6 11:05:14 2011
@@ -33,6 +33,14 @@
{
}
+
+bool
+YCPStringRep::isEmpty() const
+{
+ return v.empty();
+}
+
+
string
YCPStringRep::value() const
{
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am Fri May 6 11:05:14 2011
@@ -19,7 +19,7 @@
YCPDebugger.h \
Type.h TypePtr.h \
YCPBuiltinBoolean.h YCPBuiltinFloat.h \
- YCPBuiltinByteblock.h \
+ YCPBuiltinByteblock.h YCPBuiltinSymbol.h \
YCPBuiltinInteger.h YCPBuiltinList.h \
YCPBuiltinMap.h YCPBuiltinMisc.h \
YCPBuiltinPath.h YCPBuiltinString.h \
Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h?rev=63918&view=auto
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h (added)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h Fri May 6 11:05:14 2011
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YCPBuiltinSymbol.h
+
+ Author: Arvin Schnell
+ Maintainer: Arvin Schnell
+
+/-*/
+// -*- c++ -*-
+
+
+#ifndef YCPBuiltinSymbol_h
+#define YCPBuiltinSymbol_h
+
+class YCPBuiltinSymbol
+{
+
+public:
+ YCPBuiltinSymbol();
+
+};
+
+
+#endif // YCPBuiltinSymbol_h
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h Fri May 6 11:05:14 2011
@@ -82,6 +82,11 @@
void remove(const YCPValue& key);
/**
+ * Returns true, iff this map is empty.
+ */
+ bool isEmpty() const;
+
+ /**
* Returns the number of key/value pairs.
*/
long size() const;
@@ -212,6 +217,7 @@
void add(const YCPValue& key, const YCPValue& value) { ELEMENT->add (key,value); }
YCPMap functionalAdd(const YCPValue& key, const YCPValue& value) const { return CONST_ELEMENT-> functionalAdd (key,value); }
void remove(const YCPValue& key) { ELEMENT-> remove (key); }
+ bool isEmpty() const { return CONST_ELEMENT->isEmpty(); }
long size() const { return CONST_ELEMENT-> size (); }
YCPValue value(const YCPValue& key) const { return CONST_ELEMENT-> value (key); }
YCPMapIterator begin() const { return CONST_ELEMENT-> begin (); }
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h Fri May 6 11:05:14 2011
@@ -53,6 +53,12 @@
YCPStringRep(string s);
public:
+
+ /**
+ * Returns true, iff this string is empty.
+ */
+ bool isEmpty() const;
+
/**
* Returns the value of this object in form of a C++
* string value.
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err Fri May 6 11:05:14 2011
@@ -124,6 +124,23 @@
----------------------------------------------------------------------
Parsed:
----------------------------------------------------------------------
+"** isempty **"
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty ([])
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty ([1, 2, 3])
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty (nil)
+----------------------------------------------------------------------
+[Interpreter] tests/builtin/Builtin-List2.ycp:72 Argument (nil) to isempty(...) is nil
+Parsed:
+----------------------------------------------------------------------
"** size **"
----------------------------------------------------------------------
Parsed:
@@ -166,12 +183,12 @@
----------------------------------------------------------------------
"** change **"
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:90 Warning: change(...) is deprecated, please fix
+[Parser] tests/builtin/Builtin-List2.ycp:97 Warning: change(...) is deprecated, please fix
Parsed:
----------------------------------------------------------------------
change ([1, 4], 8)
----------------------------------------------------------------------
-[libycp] tests/builtin/Builtin-List2.ycp:90 Change does not work as expected! The argument is not passed by reference.
+[libycp] tests/builtin/Builtin-List2.ycp:97 Change does not work as expected! The argument is not passed by reference.
Parsed:
----------------------------------------------------------------------
"** remove **"
@@ -184,34 +201,34 @@
----------------------------------------------------------------------
remove ([], 0)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-List2.ycp:96 Index 0 for remove () out of range
+[Interpreter] tests/builtin/Builtin-List2.ycp:103 Index 0 for remove () out of range
Parsed:
----------------------------------------------------------------------
"** select **"
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:101 Warning: 'select ()' is deprecated
+[Parser] tests/builtin/Builtin-List2.ycp:108 Warning: 'select ()' is deprecated
Parsed:
----------------------------------------------------------------------
[1, 2][-1]:42
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:102 Warning: 'select ()' is deprecated
+[Parser] tests/builtin/Builtin-List2.ycp:109 Warning: 'select ()' is deprecated
Parsed:
----------------------------------------------------------------------
[1, 2][0]:42
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:103 Warning: 'select ()' is deprecated
+[Parser] tests/builtin/Builtin-List2.ycp:110 Warning: 'select ()' is deprecated
Parsed:
----------------------------------------------------------------------
[1, 2][1]:42
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:104 Warning: 'select ()' is deprecated
+[Parser] tests/builtin/Builtin-List2.ycp:111 Warning: 'select ()' is deprecated
Parsed:
----------------------------------------------------------------------
[1, 2][3]:42
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-List2.ycp:105 Warning: 'select ()' is deprecated
+[Parser] tests/builtin/Builtin-List2.ycp:112 Warning: 'select ()' is deprecated
Parsed:
----------------------------------------------------------------------
/* any -> string */[1, "two"][0]:"wrong type"
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-List2.ycp:96 Can't convert value '1' to type 'string'
+[Interpreter] tests/builtin/Builtin-List2.ycp:103 Can't convert value '1' to type 'string'
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out Fri May 6 11:05:14 2011
@@ -27,6 +27,10 @@
([true, 1, 1, 2])
([8, 6, 3, 2])
([8, 6, 3, 2])
+("** isempty **")
+(true)
+(false)
+(nil)
("** size **")
(0)
(3)
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp Fri May 6 11:05:14 2011
@@ -65,6 +65,13 @@
(sort (`x, `y, [ 3, 6, 2, 8 ], ``(x>y)))
+("** isempty **")
+
+(isempty ([]))
+(isempty ([1, 2, 3]))
+(isempty ((list) nil))
+
+
("** size **")
(size ([]))
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp Fri May 6 11:05:14 2011
@@ -75,6 +75,13 @@
(add ($[`a: 17, `b: 11], `b, nil))
+("** isempty **")
+
+(isempty ($[]))
+(isempty ($[1:"a", 2:"b"]))
+(isempty ((map) nil))
+
+
("** size **")
(size ($[]))
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err Fri May 6 11:05:14 2011
@@ -1,5 +1,22 @@
Parsed:
----------------------------------------------------------------------
+"** isempty **"
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty ("")
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty ("linux")
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+isempty (nil)
+----------------------------------------------------------------------
+[Interpreter] tests/builtin/Builtin-String.ycp:15 Argument (nil) to isempty(...) is nil
+Parsed:
+----------------------------------------------------------------------
"** size **"
----------------------------------------------------------------------
Parsed:
@@ -94,7 +111,7 @@
----------------------------------------------------------------------
substring ("some text", 42)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-String.ycp:48 Substring index out of range
+[Interpreter] tests/builtin/Builtin-String.ycp:55 Substring index out of range
Parsed:
----------------------------------------------------------------------
substring ("some text", 5, 2)
@@ -103,7 +120,7 @@
----------------------------------------------------------------------
substring ("some text", 42, 2)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-String.ycp:51 Substring index out of range
+[Interpreter] tests/builtin/Builtin-String.ycp:58 Substring index out of range
Parsed:
----------------------------------------------------------------------
"** lsubstring **"
@@ -116,7 +133,7 @@
----------------------------------------------------------------------
lsubstring ("some text", 42)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-String.ycp:57 Substring index out of range
+[Interpreter] tests/builtin/Builtin-String.ycp:64 Substring index out of range
Parsed:
----------------------------------------------------------------------
lsubstring ("ÄÅ¡ÄÅžýáÃ", 5)
@@ -129,7 +146,7 @@
----------------------------------------------------------------------
lsubstring ("some text", 42, 2)
----------------------------------------------------------------------
-[Interpreter] tests/builtin/Builtin-String.ycp:61 Substring index out of range
+[Interpreter] tests/builtin/Builtin-String.ycp:68 Substring index out of range
Parsed:
----------------------------------------------------------------------
lsubstring ("ÄÅ¡ÄÅžýáÃ", 5, 2)
@@ -146,9 +163,9 @@
----------------------------------------------------------------------
mergestring (["abc", "dev", "ghi", ""], "/")
----------------------------------------------------------------------
-[Parser] tests/builtin/Builtin-String.ycp:69 No match for 'mergestring : <unspec> (list, string)'
-[Parser] tests/builtin/Builtin-String.ycp:69 Please fix parameter types to match one of:
-[Parser] tests/builtin/Builtin-String.ycp:69 'mergestring : string (const list <string>, string)'
-[Parser] tests/builtin/Builtin-String.ycp:69 Wrong parameters in call to mergestring(...)
-[Parser] tests/builtin/Builtin-String.ycp:69 Expected '(const list <string>, string)', seen '(list, string)'.
+[Parser] tests/builtin/Builtin-String.ycp:76 No match for 'mergestring : <unspec> (list, string)'
+[Parser] tests/builtin/Builtin-String.ycp:76 Please fix parameter types to match one of:
+[Parser] tests/builtin/Builtin-String.ycp:76 'mergestring : string (const list <string>, string)'
+[Parser] tests/builtin/Builtin-String.ycp:76 Wrong parameters in call to mergestring(...)
+[Parser] tests/builtin/Builtin-String.ycp:76 Expected '(const list <string>, string)', seen '(list, string)'.
runycp: parser error
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out Fri May 6 11:05:14 2011
@@ -1,3 +1,7 @@
+("** isempty **")
+(true)
+(false)
+(nil)
("** size **")
(0)
(5)
Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp Fri May 6 11:05:14 2011
@@ -8,6 +8,13 @@
# ---------------------------------------------------------
+("** isempty **")
+
+(isempty (""))
+(isempty ("linux"))
+(isempty ((string) nil))
+
+
("** size **")
(size (""))
Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err?rev=63918&view=auto
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (added)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Fri May 6 11:05:14 2011
@@ -0,0 +1,13 @@
+Parsed:
+----------------------------------------------------------------------
+"** tosymbol **"
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+tosymbol ("test")
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+tosymbol (nil)
+----------------------------------------------------------------------
+[Interpreter] tests/builtin/Builtin-Symbol.ycp:14 Argument (nil) to tosymbol(...) is nil
Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out?rev=63918&view=auto
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (added)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Fri May 6 11:05:14 2011
@@ -0,0 +1,3 @@
+("** tosymbol **")
+(`test)
+(nil)
Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp?rev=63918&view=auto
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (added)
+++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Fri May 6 11:05:14 2011
@@ -0,0 +1,15 @@
+
+# ---------------------------------------------------------
+#
+# Filename: Builtin-Symbol.ycp
+#
+# Purpose: test cases for all symbol builtins
+#
+# ---------------------------------------------------------
+
+
+("** tosymbol **")
+
+(tosymbol ("test"))
+(tosymbol (nil))
+
Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes?rev=63918&r1=63917&r2=63918&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original)
+++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Fri May 6 11:05:14 2011
@@ -2,6 +2,7 @@
Thu May 05 17:24:04 CEST 2011 - aschnell@suse.de
- backported multiset builtins needed by storage and iscsi
+- backported isempty and tosymbol builtins needed by storage
- 2.17.37
-------------------------------------------------------------------
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org