Changeset 9a1e509 for src/Common

Timestamp:

Jul 13, 2017, 3:57:23 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

bf30ab3

Parents:

1d776fd (diff), 3d4b23fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into references

Location:

src/Common

Files:

• Assert.cc (modified) (1 diff)
• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (1 diff)
• utility.h (modified) (5 diffs)

src/Common/Assert.cc

@@ -14 +14 @@
 //
 
-#include <assert.h>
-#include <cstdarg>                                                                              // varargs
-#include <cstdio>                                                                               // fprintf
-#include <cstdlib>                                                                              // abort
+#include <cstdarg>  // for va_end, va_list, va_start
+#include <cstdio>   // for fprintf, stderr, vfprintf
+#include <cstdlib>  // for abort
 
 extern const char * __progname;                                                 // global name of running executable (argv[0])

src/Common/SemanticError.cc

@@ -14 +14 @@
 //
 
-#include <iostream>
-#include <list>
-#include <string>
-#include <algorithm>
-#include <iterator>
+#include <cstdio>            // for fileno, stderr
+#include <unistd.h>          // for isatty
+#include <iostream>          // for basic_ostream, operator<<, ostream
+#include <list>              // for list, _List_iterator
+#include <string>            // for string, operator<<, operator+, to_string
 
+#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
-
-#include <unistd.h>
 
 inline const std::string& error_str() {

src/Common/SemanticError.h

@@ -17 +17 @@
 #define SEMANTICERROR_H
 
-#include <exception>
-#include <string>
-#include <sstream>
-#include <list>
-#include <iostream>
+#include <exception>  // for exception
+#include <iostream>   // for ostream
+#include <list>       // for list
+#include <string>     // for string
 
-#include "utility.h"
+#include "utility.h"  // for CodeLocation, toString
 
 struct error {

src/Common/utility.h

@@ -25 +25 @@
 #include <sstream>
 #include <string>
+#include <type_traits>
 
 #include <cassert>
@@ -305 +306 @@
 // for ( val : group_iterate( container1, container2, ... ) ) {}
 // syntax to have a for each that iterates multiple containers of the same length
-// TODO: update to use variadic arguments, perfect forwarding
+// TODO: update to use variadic arguments
 
 template< typename T1, typename T2 >
@@ -314 +315 @@
 
         struct iterator {
-                typedef std::tuple<typename T1::value_type, typename T2::value_type> value_type;
-                typedef typename T1::iterator T1Iter;
-                typedef typename T2::iterator T2Iter;
+                typedef typename std::remove_reference<T1>::type T1val;
+                typedef typename std::remove_reference<T2>::type T2val;
+                typedef std::tuple<typename T1val::value_type &, typename T2val::value_type &> value_type;
+                typedef typename T1val::iterator T1Iter;
+                typedef typename T2val::iterator T2Iter;
                 typedef std::tuple<T1Iter, T2Iter> IterTuple;
                 IterTuple it;
@@ -324 +327 @@
                 }
                 bool operator!=( const iterator &other ) const { return it != other.it; }
-                value_type operator*() const { return std::make_tuple( *std::get<0>(it), *std::get<1>(it) ); }
+                value_type operator*() const { return std::tie( *std::get<0>(it), *std::get<1>(it) ); }
         };
         iterator begin() { return iterator( std::get<0>(args).begin(), std::get<1>(args).begin() ); }
@@ -334 +337 @@
 
 template< typename... Args >
-group_iterate_t<Args...> group_iterate( const Args &... args ) {
-        return group_iterate_t<Args...>(args...);
+group_iterate_t<Args...> group_iterate( Args &&... args ) {
+        return group_iterate_t<Args...>(std::forward<Args>( args )...);
 }