From bf68638771857e5921129a20b4ac71570ba834a9 Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Mon, 6 Mar 2017 16:36:14 +0100
Subject: [PATCH] std.cfg: Improved support for string to
 (int|double|...)-functions.

---
 cfg/std.cfg | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 969caf51d..ce27cef23 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3615,23 +3615,13 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
     <arg nr="2"/>
   </function>
-  <!-- double stod (const string&  str, size_t* idx = 0); -->
-  <!-- double stod (const wstring& str, size_t* idx = 0); -->
   <!-- float stof (const string&  str, size_t* idx = 0); -->
   <!-- float stof (const wstring& str, size_t* idx = 0); -->
-  <!-- int stoi (const string&  str, size_t* idx = 0); -->
-  <!-- int stoi (const wstring& str, size_t* idx = 0); -->
-  <!-- long stol (const string&  str, size_t* idx = 0); -->
-  <!-- long stol (const wstring& str, size_t* idx = 0); -->
+  <!-- double stod (const string&  str, size_t* idx = 0); -->
+  <!-- double stod (const wstring& str, size_t* idx = 0); -->
   <!-- long double stold (const string&  str, size_t* idx = 0); -->
   <!-- long double stold (const wstring& str, size_t* idx = 0); -->
-  <!-- long long stoll (const string&  str, size_t* idx = 0); -->
-  <!-- long long stoll (const wstring& str, size_t* idx = 0); -->
-  <!-- unsigned long stoul (const string&  str, size_t* idx = 0); -->
-  <!-- unsigned long stoul (const wstring& str, size_t* idx = 0); -->
-  <!-- unsigned long long stoull (const string&  str, size_t* idx = 0); -->
-  <!-- unsigned long long stoull (const wstring& str, size_t* idx = 0); -->
-  <function name="std::stod,std::stof,std::stoi,std::stol,std::stold,std::stoll,std::stoul,std::stoull">
+  <function name="std::stod,std::stof,std::stold">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -3642,6 +3632,31 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- int stoi (const string&  str, size_t* idx = 0, int base = 10);
+       int stoi (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <!-- long stol (const string&  str, size_t* idx = 0, int base = 10);
+       long stol (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <!-- long long stoll (const string&  str, size_t* idx = 0, int base = 10);
+       long long stoll (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <!-- unsigned long stoul (const string&  str, size_t* idx = 0, int base = 10);
+       unsigned long stoul (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <!-- unsigned long long stoull (const string&  str, size_t* idx = 0, int base = 10);
+       unsigned long long stoull (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <function name="std::stoi,std::stol,std::stoll,std::stoul,std::stoull">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" default="10">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
   <!-- string to_string (int val); -->
   <!-- string to_string (long val); -->
   <!-- string to_string (long long val); -->