1 files changed, 47 insertions, 64 deletions

diff --git a/source/core/array-view.h b/source/core/array-view.h
index 193aedbbb..ad9673e2e 100644
--- a/source/core/array-view.h
+++ b/source/core/array-view.h
@@ -1,7 +1,7 @@
 #ifndef CORE_LIB_ARRAY_VIEW_H
 #define CORE_LIB_ARRAY_VIEW_H
 
-#include "exception.h"
+#include "common.h"
 
 namespace Slang
 {
@@ -9,104 +9,87 @@ namespace Slang
 	class ArrayView
 	{
 	private:
-		T * _buffer;
-		int _count;
-		int stride;
+		T* m_buffer;
+		int m_count;
 	public:
-		T* begin() const
-		{
-			return _buffer;
-		}
-		T* end() const
-		{
-			return (T*)((char*)_buffer + _count*stride);
-		}
+        const T* begin() const { return m_buffer; }
+        T* begin() { return m_buffer; }
+
+        const T* end() const { return m_buffer + m_count; }
+        T* end() { return m_buffer + m_count; }
+        
 	public:
-		ArrayView()
-		{
-			_buffer = 0;
-			_count = 0;
-		}
-		ArrayView(const T & singleObj)
-		{
-			SetData((T*)&singleObj, 1, sizeof(T));
-		}
-		ArrayView(T * buffer, int count)
-		{
-			SetData(buffer, count, sizeof(T));
+		ArrayView():
+			m_buffer(nullptr),
+			m_count(0)
+        {
 		}
-		ArrayView(void * buffer, int count, int _stride)
-		{
-			SetData(buffer, count, _stride);
-		}
-		void SetData(void * buffer, int count, int _stride)
-		{
-			this->_buffer = (T*)buffer;
-			this->_count = count;
-			this->stride = _stride;
-		}
-		inline int GetCapacity() const
-		{
-			return _count;
+		ArrayView(T& singleObj):
+            m_buffer(&singleObj),
+            m_count(1)
+        {
 		}
-		inline int Count() const
+		ArrayView(T* buffer, int size):
+            m_buffer(buffer),
+            m_count(size)
 		{
-			return _count;
 		}
+		
+		inline int getCount() const { return m_count; }
 
-		inline T & operator [](int id) const
+		inline const T& operator [](int idx) const
 		{
-#if _DEBUG
-			if (id >= _count || id < 0)
-				throw IndexOutofRangeException("Operator[]: Index out of Range.");
-#endif
-			return *(T*)((char*)_buffer+id*stride);
+            SLANG_ASSERT(idx >= 0 && idx <= m_count);
+            return m_buffer[idx];
 		}
+        inline T& operator [](int idx)
+        {
+            SLANG_ASSERT(idx >= 0 && idx <= m_count);
+            return m_buffer[idx];
+        }
 
-		inline T* Buffer() const
-		{
-			return _buffer;
-		}
+        inline const T* getBuffer() const { return m_buffer; }
+        inline T* getBuffer() { return m_buffer; }
 
 		template<typename T2>
-		int IndexOf(const T2 & val) const
+		int indexOf(const T2 & val) const
 		{
-			for (int i = 0; i < _count; i++)
+			for (int i = 0; i < m_count; i++)
 			{
-				if (*(T*)((char*)_buffer + i*stride) == val)
+				if (m_buffer[i] == val)
 					return i;
 			}
 			return -1;
 		}
 
 		template<typename T2>
-		int LastIndexOf(const T2 & val) const
+		int lastIndexOf(const T2 & val) const
 		{
-			for (int i = _count - 1; i >= 0; i--)
+			for (int i = m_count - 1; i >= 0; i--)
 			{
-				if (*(T*)((char*)_buffer + i*stride) == val)
+				if (m_buffer[i] == val)
 					return i;
 			}
 			return -1;
 		}
 
 		template<typename Func>
-		int FindFirst(const Func & predicate) const
+		int findFirstIndex(const Func& predicate) const
 		{
-			for (int i = 0; i < _count; i++)
+			for (int i = 0; i < m_count; i++)
 			{
-				if (predicate(_buffer[i]))
+				if (predicate(m_buffer[i]))
 					return i;
 			}
 			return -1;
 		}
 
 		template<typename Func>
-		int FindLast(const Func & predicate) const
+		int findLastIndex(const Func& predicate) const
 		{
-			for (int i = _count - 1; i >= 0; i--)
+			for (int i = m_count - 1; i >= 0; i--)
 			{
-				if (predicate(_buffer[i]))
+				if (predicate(m_buffer[i]))
 					return i;
 			}
 			return -1;
@@ -114,16 +97,16 @@ namespace Slang
 	};
 
 	template<typename T>
-	ArrayView<T> MakeArrayView(const T & obj)
+	ArrayView<T> makeArrayView(T& obj)
 	{
 		return ArrayView<T>(obj);
 	}
 		
 	template<typename T>
-	ArrayView<T> MakeArrayView(T * buffer, int count)
+	ArrayView<T> makeArrayView(T* buffer, int count)
 	{
 		return ArrayView<T>(buffer, count);
 	}
 }
 
-#endif
\ No newline at end of file
+#endif