Changeset 45553f5

Timestamp:

Mar 5, 2025, 7:15:22 PM (7 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

88771d7

Parents:

ee8f72d (diff), ee22919 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• Common/Iterate.hpp (modified) (1 diff)
• Parser/lex.ll (modified) (3 diffs)

src/Common/Iterate.hpp ¶

@@ -208 +208 @@
         return group_iterate_t<Args...>( std::forward<Args>( args )... );
 }
-
-// -----------------------------------------------------------------------------
-// Helper struct and function to support
-// for ( val : lazy_map( container1, f ) ) {}
-// syntax to have a for each that iterates a container,
-// mapping each element by applying f.
-
-template< typename T, typename Func >
-struct lambda_iterate_t {
-        const T & ref;
-        std::function<Func> f;
-
-        struct iterator {
-                typedef decltype(begin(ref)) Iter;
-                Iter it;
-                std::function<Func> f;
-                iterator( Iter it, std::function<Func> f ) : it(it), f(f) {}
-                iterator & operator++() {
-                        ++it; return *this;
-                }
-                bool operator!=( const iterator &other ) const { return it != other.it; }
-                auto operator*() const -> decltype(f(*it)) { return f(*it); }
-        };
-
-        lambda_iterate_t( const T & ref, std::function<Func> f ) : ref(ref), f(f) {}
-
-        auto begin() const -> decltype(iterator(std::begin(ref), f)) { return iterator(std::begin(ref), f); }
-        auto end() const   -> decltype(iterator(std::end(ref), f)) { return iterator(std::end(ref), f); }
-};
-
-template< typename... Args >
-lambda_iterate_t<Args...> lazy_map( const Args &... args ) {
-        return lambda_iterate_t<Args...>( args...);
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //

src/Parser/lex.ll ¶

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Fri Jan 17 14:36:16 2025
- * Update Count     : 878
+ * Last Modified On : Mon Mar  3 09:21:33 2025
+ * Update Count     : 880
  */
 
@@ -240 +240 @@
 basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
-__SVBool_t              { KEYWORD_RETURN(SVBOOL); }                             // gcc (ARM)
+__SVBool_t              { KEYWORD_RETURN(BOOL); }                               // gcc (ARM)
 break                   { KEYWORD_RETURN(BREAK); }
 case                    { KEYWORD_RETURN(CASE); }
@@ -287 +287 @@
 _Float128               { FLOATXX(FLOAT128); }                                  // GCC
 _Float128x              { FLOATXX(FLOAT128X); }                                 // GCC
-__Float32x4_t   { FLOATXX(FLOAT32X4); }                                 // GCC (ARM)
-__Float64x2_t   { FLOATXX(FLOAT64X2); }                                 // GCC (ARM)
-__SVFloat32_t   { FLOATXX(SVFLOAT32); }                                 // GCC (ARM)
-__SVFloat64_t   { FLOATXX(SVFLOAT64); }                                 // GCC (ARM)
+__Float32x4_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__Float64x2_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__SVFloat32_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__SVFloat64_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
 for                             { KEYWORD_RETURN(FOR); }
 forall                  { KEYWORD_RETURN(FORALL); }                             // CFA