diff options
author | Alexis211 <alexis211@gmail.com> | 2009-10-23 17:28:25 +0200 |
---|---|---|
committer | Alexis211 <alexis211@gmail.com> | 2009-10-23 17:28:25 +0200 |
commit | f0556ed7f051fb101dc68752526696365bf79a11 (patch) | |
tree | 61345fbadbf76c6f12b36b48a9dfadd744f6cbbd /Source/Library/Common | |
parent | df179c18baab4b5d85a283924fb23dfee7ea7fdb (diff) | |
download | Melon-f0556ed7f051fb101dc68752526696365bf79a11.tar.gz Melon-f0556ed7f051fb101dc68752526696365bf79a11.zip |
More work on syscalls and shell
Diffstat (limited to 'Source/Library/Common')
-rw-r--r-- | Source/Library/Common/BasicString.class.cpp | 8 | ||||
-rw-r--r-- | Source/Library/Common/BasicString.class.h | 1 | ||||
-rw-r--r-- | Source/Library/Common/SimpleList.class.h | 1 | ||||
-rw-r--r-- | Source/Library/Common/WChar.class.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/Source/Library/Common/BasicString.class.cpp b/Source/Library/Common/BasicString.class.cpp index b8f7eea..f3a6164 100644 --- a/Source/Library/Common/BasicString.class.cpp +++ b/Source/Library/Common/BasicString.class.cpp @@ -151,6 +151,14 @@ void BasicString<T>::clear() { } template <typename T> +bool BasicString<T>::contains(const T& chr) const { + for (u32int i = 0; i < m_length; i++) { + if (m_string[i] == chr) return true; + } + return false; +} + +template <typename T> Vector< BasicString<T> > BasicString<T>::split(T sep) const { Vector< BasicString<T> > ret; ret.push(BasicString<T>()); diff --git a/Source/Library/Common/BasicString.class.h b/Source/Library/Common/BasicString.class.h index 17055e8..21041e8 100644 --- a/Source/Library/Common/BasicString.class.h +++ b/Source/Library/Common/BasicString.class.h @@ -43,6 +43,7 @@ class BasicString { u32int size() const { return m_length; } void clear(); bool empty() const { return m_length == 0; } + bool contains(const T& chr) const; Vector< BasicString<T> > split(T sep) const; BasicString<T> substr(s32int start, u32int size); diff --git a/Source/Library/Common/SimpleList.class.h b/Source/Library/Common/SimpleList.class.h index 7b731db..8fcd834 100644 --- a/Source/Library/Common/SimpleList.class.h +++ b/Source/Library/Common/SimpleList.class.h @@ -48,6 +48,7 @@ class SimpleList { } SimpleList<T>* removeOnce(const T& value) { + if (this == 0) return 0; if (value == m_value) return delThis(); for (SimpleList<T> *iter = this; iter->next() != 0; iter = iter->next()) { if (iter->next()->v() == value) { diff --git a/Source/Library/Common/WChar.class.h b/Source/Library/Common/WChar.class.h index 3eca3d3..5d6d26b 100644 --- a/Source/Library/Common/WChar.class.h +++ b/Source/Library/Common/WChar.class.h @@ -83,7 +83,7 @@ struct WChar { return v; } - inline operator u32int () { return value; } + inline operator u32int () const { return value; } }; #endif |