C++: Big cleanup of declarations in the taint-tests to get rid of duplicated std::string declarations in 'azure.cpp' and 'bslx.cpp'.

Author: MathiasVP

cpp/ql/test/include/type_traits.h

@@ -1,9 +1,10 @@
 #if !defined(CODEQL_TYPE_TRAITS_H)
 #define CODEQL_TYPE_TRAITS_H
 
-typedef unsigned long size_t;
+using size_t = decltype(sizeof(0));
 
 namespace std {
+    using size_t = decltype(sizeof(0));
     template<class T>
     struct remove_const { typedef T type; };
 

cpp/ql/test/library-tests/dataflow/external-models/asio_streams.cpp

@@ -1,17 +1,10 @@
 
 // --- stub library headers ---
 
-#include "std_string.h"
+#include "../taint-tests/stl.h"
 
 #define SIZE_MAX 0xFFFFFFFF
 
-namespace std {
-	class string_view {
-	public:
-		string_view(const char* s);
-	};
-};
-
 namespace boost {
 	namespace system {
 		class error_code {

cpp/ql/test/library-tests/dataflow/external-models/azure.cpp

@@ -1,81 +1,11 @@
+#include "../taint-tests/stl.h"
 using uint16_t = unsigned short;
 using int64_t = long long;
 using size_t = unsigned long;
 using uint8_t = unsigned char;
 using int32_t = int;
 using uint32_t = unsigned int;
 
-namespace std
-{
-	template <class T1, class T2>
-	struct pair {
-		typedef T1 first_type;
-		typedef T2 second_type;
-
-		T1 first;
-		T2 second;
-		pair();
-		pair(const T1& x, const T2& y);
-		template<class U, class V> pair(const pair<U, V> &p);
-
-		void swap(pair& p) /*noexcept(...)*/;
-	};
-
-	template<class charT> struct char_traits;
-
-	typedef size_t streamsize;
-
-	template <class T> class allocator {
-	public:
-		allocator() throw();
-		typedef size_t size_type;
-	};
-
-	template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-	class basic_string {
-	public:
-		using value_type = charT;
-		using reference = value_type&;
-		using const_reference = const value_type&;
-		typedef typename Allocator::size_type size_type;
-
-    basic_string(const charT* s, const Allocator& a = Allocator());
-	};
-
-	typedef basic_string<char> string;
-
-  template <typename K, typename V>
-  class map
-  {
-  public:
-    using key_type = K;
-    using value_type = pair<const K, V>;
-    map();
-    ~map();
-
-    V& operator[](const key_type& key);
-  };
-
-  template <typename T>
-  class vector
-  {
-  public:
-    vector();
-    ~vector();
-
-    T& operator[](size_t);
-  };
-
-  template<typename T>
-  class unique_ptr {
-  public:
-    unique_ptr();
-    ~unique_ptr();
-
-    T* get();
-  };
-}
-
 namespace Azure
 {
   template <typename T>

cpp/ql/test/library-tests/dataflow/external-models/bslx.cpp

@@ -1,20 +1,4 @@
-
-// --- stub library headers ---
-
-namespace std {
-	typedef unsigned long size_t;
-	template <class T> class allocator {};
-	template<class charT> struct char_traits {};
-	template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-	class basic_string {
-	public:
-		basic_string();
-		basic_string(const charT* s, const Allocator& a = Allocator());
-		const charT* data() const;
-		size_t size() const;
-	};
-	typedef basic_string<char> string;
-}
+#include "../taint-tests/stl.h"
 
 // BDE spells the standard string as `bsl::string`; alias it onto the stub above.
 namespace bsl {

cpp/ql/test/library-tests/dataflow/external-models/flow.expected

@@ -1,19 +1,7 @@
 
 // --- stub library headers ---
 
-#include "std_string.h"
-
-namespace std {
-	class istream {
-	public:
-		istream();
-	};
-
-	class ostream {
-	public:
-		ostream();
-	};
-}
+#include "../taint-tests/stl.h"
 
 namespace absl {
 	class string_view {

cpp/ql/test/library-tests/dataflow/external-models/protobuf.cpp

@@ -1,5 +1,5 @@
-| asio_streams.cpp:122:29:122:39 | recv_buffer | remote-sink |
-| asio_streams.cpp:132:29:132:39 | send_buffer | remote-sink |
+| asio_streams.cpp:115:29:115:39 | recv_buffer | remote-sink |
+| asio_streams.cpp:125:29:125:39 | send_buffer | remote-sink |
 | test.cpp:12:10:12:10 | 0 | test-sink |
 | test.cpp:14:10:14:10 | x | test-sink |
 | test.cpp:18:10:18:10 | y | test-sink |

cpp/ql/test/library-tests/dataflow/external-models/sinks.expected

@@ -1,11 +1,11 @@
-| asio_streams.cpp:116:34:116:44 | read_until output argument | remote |
-| azure.cpp:286:48:286:60 | call to GetBodyStream | remote |
-| azure.cpp:306:52:306:61 | call to GetHeaders | remote |
-| azure.cpp:310:38:310:44 | call to GetBody | remote |
-| azure.cpp:314:68:314:84 | call to ExtractBodyStream | remote |
-| azure.cpp:323:32:323:40 | call to GetHeader | remote |
-| azure.cpp:327:58:327:67 | call to GetHeaders | remote |
-| azure.cpp:336:34:336:43 | call to GetHeaders | remote |
+| asio_streams.cpp:109:34:109:44 | read_until output argument | remote |
+| azure.cpp:216:48:216:60 | call to GetBodyStream | remote |
+| azure.cpp:236:52:236:61 | call to GetHeaders | remote |
+| azure.cpp:240:38:240:44 | call to GetBody | remote |
+| azure.cpp:244:68:244:84 | call to ExtractBodyStream | remote |
+| azure.cpp:253:32:253:40 | call to GetHeader | remote |
+| azure.cpp:257:58:257:67 | call to GetHeaders | remote |
+| azure.cpp:266:34:266:43 | call to GetHeaders | remote |
 | test.cpp:10:10:10:18 | call to ymlSource | local |
 | test.cpp:56:8:56:16 | call to ymlSource | local |
 | test.cpp:94:10:94:18 | call to ymlSource | local |