Sync to TFS

Author: ras0219-msft

Release/include/cpprest/asyncrt_utils.h

@@ -170,6 +170,16 @@ namespace conversions
 
 namespace details
 {
+    /// <summary>
+    /// Our own implementation of alpha numeric instead of std::isalnum to avoid
+    /// taking global lock for performance reasons.
+    /// </summary>
+    inline bool __cdecl is_alnum(char ch)
+    {
+        return (ch >= '0' && ch <= '9')
+            || (ch >= 'A' && ch <= 'Z')
+            || (ch >= 'a' && ch <= 'z');
+    }
 
     /// <summary>
     /// Simplistic implementation of make_unique. A better implementation would be based on variadic templates

Release/include/cpprest/json.h

@@ -434,18 +434,46 @@ namespace web { namespace json
         CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, use operator[] instead.")
         value get(const utility::string_t &key) const;
 
+        /// <summary>
+        /// Accesses an element of a JSON array. Throws when index out of bounds.
+        /// </summary>
+        /// <param name="index">The index of an element in the JSON array.</param>
+        /// <returns>A reference to the value.</returns>
+        _ASYNCRTIMP json::value& at(size_t index);
+
+        /// <summary>
+        /// Accesses an element of a JSON array. Throws when index out of bounds.
+        /// </summary>
+        /// <param name="index">The index of an element in the JSON array.</param>
+        /// <returns>A reference to the value.</returns>
+        _ASYNCRTIMP const json::value& at(size_t index) const;
+
+        /// <summary>
+        /// Accesses an element of a JSON object. If the key doesn't exist, this method throws.
+        /// </summary>
+        /// <param name="key">The key of an element in the JSON object.</param>
+        /// <returns>If the key exists, a reference to the value.</returns>
+        _ASYNCRTIMP json::value& at(const utility::string_t& key);
+        
+        /// <summary>
+        /// Accesses an element of a JSON object. If the key doesn't exist, this method throws.
+        /// </summary>
+        /// <param name="key">The key of an element in the JSON object.</param>
+        /// <returns>If the key exists, a reference to the value.</returns>
+        _ASYNCRTIMP const json::value& at(const utility::string_t& key) const;
+
         /// <summary>
         /// Accesses a field of a JSON object.
         /// </summary>
         /// <param name="key">The name of the field</param>
-        /// <returns>A reference to the value kept in the field</returns>
+        /// <returns>A reference to the value kept in the field.</returns>
         _ASYNCRTIMP value & operator [] (const utility::string_t &key);
 
         /// <summary>
         /// Accesses a field of a JSON object.
         /// </summary>
         /// <param name="key">The name of the field</param>
-        /// <returns>A reference to the value kept in the field</returns>
+        /// <returns>A reference to the value kept in the field.</returns>
         _ASYNCRTIMP const value & operator [] (const utility::string_t &key) const;
 
 #ifdef _MS_WINDOWS
@@ -471,16 +499,9 @@ namespace web { namespace json
         /// Accesses an element of a JSON array.
         /// </summary>
         /// <param name="index">The index of an element in the JSON array.</param>
-        /// <returns>A reference to the value kept in the field</returns>
+        /// <returns>A reference to the value kept in the field.</returns>
         _ASYNCRTIMP value & operator [] (size_t index);
 
-        /// <summary>
-        /// Accesses an element of a JSON array.
-        /// </summary>
-        /// <param name="index">The index of an element in the JSON array.</param>
-        /// <returns>A reference to the value kept in the field</returns>
-        _ASYNCRTIMP const value & operator [] (size_t index) const;
-
     private:
         friend class web::json::details::_Object;
         friend class web::json::details::_Array;
@@ -512,6 +533,26 @@ namespace web { namespace json
 #endif
     };
 
+    /// <summary>
+    /// A single exception type to represent errors in parsing, converting, and accessing
+    /// elements of JSON values.
+    /// </summary>
+    class json_exception : public std::exception
+    { 
+    private:
+        std::string _message;
+    public:
+        json_exception() {}
+        json_exception(const utility::char_t * const &message) : _message(utility::conversions::to_utf8string(message)) { }
+
+        // Must be narrow string because it derives from std::exception
+        const char* what() const _noexcept
+        {
+            return _message.c_str();
+        }
+        ~json_exception() _noexcept {}
+    };
+
     /// <summary>
     /// A JSON array represented as a C++ class.
     /// </summary>
@@ -641,22 +682,44 @@ namespace web { namespace json
         }
 
         /// <summary>
-        /// Accesses an element of a JSON array.
+        /// Accesses an element of a JSON array. Throws when index out of bounds.
         /// </summary>
         /// <param name="index">The index of an element in the JSON array.</param>
-        /// <returns>A reference to the value kept in the field</returns>
-        json::value& operator[](size_type index)
+        /// <returns>A reference to the value kept in the field.</returns>
+        json::value& at(size_type index)
         {
+            if (index >= m_elements.size())
+                throw json_exception(_XPLATSTR("index out of bounds"));
+
+            return m_elements[index];
+        }
+
+        /// <summary>
+        /// Accesses an element of a JSON array. Throws when index out of bounds.
+        /// </summary>
+        /// <param name="index">The index of an element in the JSON array.</param>
+        /// <returns>A reference to the value kept in the field.</returns>
+        const json::value& at(size_type index) const
+        {
+            if (index >= m_elements.size())
+                throw json_exception(_XPLATSTR("index out of bounds"));
+
             return m_elements[index];
         }
 
         /// <summary>
         /// Accesses an element of a JSON array.
         /// </summary>
         /// <param name="index">The index of an element in the JSON array.</param>
-        /// <returns>A const reference to the value kept in the field</returns>
-        const json::value& operator[](size_type index) const
+        /// <returns>A reference to the value kept in the field.</returns>
+        json::value& operator[](size_type index)
         {
+            SafeInt<size_type> nMinSize(index);
+            nMinSize += 1;
+            SafeInt<size_type> nlastSize(m_elements.size());
+            if (nlastSize < nMinSize)
+                m_elements.resize(nMinSize);
+
             return m_elements[index];
         }
 
@@ -676,26 +739,6 @@ namespace web { namespace json
         template<typename CharType> friend class json::details::JSON_Parser;
     };
 
-    /// <summary>
-    /// A single exception type to represent errors in parsing, converting, and accessing
-    /// elements of JSON values.
-    /// </summary>
-    class json_exception : public std::exception
-    { 
-    private:
-        std::string _message;
-    public:
-        json_exception() {}
-        json_exception(const utility::char_t * const &message) : _message(utility::conversions::to_utf8string(message)) { }
-
-        // Must be narrow string because it derives from std::exception
-        const char* what() const _noexcept
-        {
-            return _message.c_str();
-        }
-        ~json_exception() _noexcept {}
-    };
-
     /// <summary>
     /// A JSON object represented as a C++ class.
     /// </summary>
@@ -832,10 +875,40 @@ namespace web { namespace json
             return m_elements.crend();
         }
 
+        /// <summary>
+        /// Accesses an element of a JSON object. If the key doesn't exist, this method throws.
+        /// </summary>
+        /// <param name="key">The key of an element in the JSON object.</param>
+        /// <returns>If the key exists, a reference to the value kept in the field.</returns>
+        json::value& at(const utility::string_t& key)
+        {
+            auto iter = std::lower_bound(m_elements.begin(), m_elements.end(), key, compare_with_key);
+
+            if (iter == m_elements.end() || key != (iter->first))
+                throw web::json::json_exception(_XPLATSTR("Key not found"));
+
+            return iter->second;
+        }
+        
+        /// <summary>
+        /// Accesses an element of a JSON object. If the key doesn't exist, this method throws.
+        /// </summary>
+        /// <param name="key">The key of an element in the JSON object.</param>
+        /// <returns>If the key exists, a reference to the value kept in the field.</returns>
+        const json::value& at(const utility::string_t& key) const
+        {
+            auto iter = std::lower_bound(m_elements.begin(), m_elements.end(), key, compare_with_key);
+
+            if (iter == m_elements.end() || key != (iter->first))
+                throw web::json::json_exception(_XPLATSTR("Key not found"));
+
+            return iter->second;
+        }
+        
         /// <summary>
         /// Accesses an element of a JSON object.
         /// </summary>
-        /// <param name="index">The key of an element in the JSON object.</param>
+        /// <param name="key">The key of an element in the JSON object.</param>
         /// <returns>If the key exists, a reference to the value kept in the field, otherwise a newly created null value that will be stored for the given key.</returns>
         json::value& operator[](const utility::string_t& key)
         {
@@ -851,7 +924,7 @@ namespace web { namespace json
         /// Gets an iterator to an element of a JSON object.
         /// </summary>
         /// <param name="key">The key of an element in the JSON object.</param>
-        /// <returns>A const iterator to the value kept in the field</returns>
+        /// <returns>A const iterator to the value kept in the field.</returns>
         const_iterator find(const utility::string_t& key) const
         {
             auto iter = std::lower_bound(m_elements.begin(), m_elements.end(), key, compare_with_key);
@@ -866,7 +939,7 @@ namespace web { namespace json
         /// Gets an iterator to an element of a JSON object.
         /// </summary>
         /// <param name="key">The key of an element in the JSON object.</param>
-        /// <returns>An iterator to the value kept in the field</returns>
+        /// <returns>An iterator to the value kept in the field.</returns>
         iterator find(const utility::string_t& key)
         {
             auto iter = std::lower_bound(m_elements.begin(), m_elements.end(), key, compare_with_key);
@@ -1483,30 +1556,8 @@ namespace web { namespace json
             virtual json::array& as_array() { return m_array; }
             virtual const json::array& as_array() const { return m_array; }
 
-            virtual value get_element(array::size_type index) const
-            {
-                SafeInt<array::size_type> idx(index);
-                SafeInt<array::size_type> size(m_array.size());
-               return (idx >= size) ? value() : m_array[index]; 
-            }
-
             virtual json::value &index(json::array::size_type index)
             {
-                SafeInt<json::array::size_type> nMinSize(index);
-                nMinSize += 1;
-                SafeInt<json::array::size_type> nlastSize(m_array.size());
-               if (nlastSize < nMinSize)
-                  m_array.m_elements.resize(nMinSize);
-
-                return m_array.m_elements[index];
-            }
-
-            virtual const json::value &cnst_index(array::size_type index) const
-            {
-                SafeInt<array::size_type> idx(index);
-                SafeInt<array::size_type> size(m_array.size());
-                if ( idx >= size )
-                    throw json_exception(_XPLATSTR("index out of bounds"));
                 return m_array[index];
             }
 

Release/include/cpprest/uri_parser.h

@@ -65,7 +65,7 @@ namespace web { namespace details
         /// </summary>
         static bool is_unreserved(int c)
         {
-            return std::isalnum((char)c, loc) || c == '-' || c == '.' || c == '_' || c == '~';
+            return ::utility::details::is_alnum((char)c) || c == '-' || c == '.' || c == '_' || c == '~';
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ namespace web { namespace details
         /// </summary> 
         static bool is_scheme_character(int c)
         {
-            return std::isalnum((char)c, loc) || c == '+' || c == '-' || c == '.';
+            return ::utility::details::is_alnum((char)c) || c == '+' || c == '-' || c == '.';
         }
 
         /// <summary>

Release/include/pplx/pplxlinux.h

@@ -1,12 +1,12 @@
 /***
 * ==++==
 *
-* Copyright (c) Microsoft Corporation. All rights reserved.
+* Copyright (c) Microsoft Corporation. All rights reserved. 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * http://www.apache.org/licenses/LICENSE-2.0
-*
+* 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -88,7 +88,7 @@ namespace platform
         static const unsigned int timeout_infinite = 0xFFFFFFFF;
 
         event_impl()
-            : _signaled(false)
+            : _signaled(false) 
         {
         }
 
@@ -217,7 +217,7 @@ namespace platform
                 _M_cs.lock();
                 _M_owner = id;
                 _M_recursionCount = 1;
-            }
+            }            
         }
 
         void unlock()
@@ -231,7 +231,7 @@ namespace platform
             {
                 _M_owner = -1;
                 _M_cs.unlock();
-            }
+            }           
         }
 
     private:
@@ -240,36 +240,12 @@ namespace platform
         volatile long _M_owner;
     };
 
-    class linux_timer;
-    class apple_timer;
-
-    class timer_impl
-    {
-    public:
-        timer_impl()
-        : m_timerImpl(nullptr)
-        {
-        }
-
-        ~timer_impl();
-
-        _PPLXIMP void start(unsigned int ms, bool repeat, TaskProc_t userFunc, _In_ void * context);
-        _PPLXIMP void stop(bool waitForCallbacks);
-
-    private:
-#if defined(__APPLE__)
-        apple_timer * m_timerImpl;
-#else
-        linux_timer * m_timerImpl;
-#endif
-    };
-
 #if defined(__APPLE__)
     class apple_scheduler : public pplx::scheduler_interface
     {
     public:
         _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
-
+        
         virtual ~apple_scheduler();
     };
 #else
@@ -279,12 +255,7 @@ namespace platform
         _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
     };
 #endif
-
-    /// <summary>
-    /// Timer
-    /// </summary>
-    typedef details::timer_impl timer_t;
-
+    
 } // namespace details
 
 /// <summary>
@@ -336,7 +307,7 @@ namespace extensibility
 #else
     typedef details::linux_scheduler default_scheduler_t;
 #endif
-
+    
 namespace details
 {
     /// <summary>