Changes in / [2ad4b49:f77dbc0]

Location:

src

Files:

• Parser/parser.yy (modified) (4 diffs)
• tests/sum.c (modified) (4 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  1 17:59:57 2018
-// Update Count     : 3476
+// Last Modified On : Sat Jun  2 17:18:40 2018
+// Update Count     : 3487
 //
 
@@ -1331 +1331 @@
         c_declaration ';'
         | cfa_declaration ';'                                                           // CFA
-        | static_assert
+        | static_assert                                                                         // C11
         ;
 
@@ -1337 +1337 @@
         STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
                 { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
+        | STATICASSERT '(' constant_expression ')' ';'          // CFA
+                { $$ = DeclarationNode::newStaticAssert( $3, build_constantStr( *new string( "" ) ) ); }
 
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
@@ -1881 +1883 @@
 
 field_declaration:
-        cfa_field_declaring_list ';'                                            // CFA, new style field declaration
+        type_specifier field_declaring_list ';'
+                { $$ = distAttr( $1, $2 ); }
+        | EXTENSION type_specifier field_declaring_list ';'     // GCC
+                { distExt( $3 ); $$ = distAttr( $2, $3 ); }             // mark all fields in list
+        | typedef_declaration ';'                                                       // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
+        | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
-                {
-                        distExt( $2 );                                                          // mark all fields in list
-                        $$ = $2;
-                }
-        | type_specifier field_declaring_list ';'
-                {
-                        $$ = distAttr( $1, $2 ); }
-        | EXTENSION type_specifier field_declaring_list ';'     // GCC
-                {
-                        distExt( $3 );                                                          // mark all fields in list
-                        $$ = distAttr( $2, $3 );
-                }
-        | static_assert
+                { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
+        | cfa_typedef_declaration ';'                                           // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
+        | static_assert                                                                         // C11
         ;
 

src/tests/sum.c

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 17 11:49:17 2018
-// Update Count     : 273
+// Last Modified On : Sun Jun  3 19:23:41 2018
+// Update Count     : 278
 //
 
@@ -18 +18 @@
 #include <stdlib>
 
-void ?{}( int & c, zero_t ) { c = 0; }
+void ?{}( int & c, zero_t ) { c = 0; }                                  // not in prelude
 
 trait sumable( otype T ) {
-        void ?{}( T &, zero_t );                                                        // constructor from 0 literal
+        void ?{}( T &, zero_t );                                                        // 0 literal constructor
         T ?+?( T, T );                                                                          // assortment of additions
         T ?+=?( T &, T );
@@ -29 +29 @@
 
 forall( otype T | sumable( T ) )                                                // use trait
-T sum( unsigned int size, T a[] ) {
-        T total = 0;                                                                            // instantiate T from 0 by calling constructor
-        for ( unsigned int i = 0; i < size; i += 1 )
+T sum( size_t size, T a[] ) {
+        T total = 0;                                                                            // initialize by 0 constructor
+        for ( size_t i = 0; i < size; i += 1 )
                 total += a[i];                                                                  // select appropriate +
         return total;
@@ -111 +111 @@
         for ( int i = 0; i < size; i += 1, v += 1 ) {
                 s += (int)v;
-                gs.x[i] = (int)v;                                                               // set filed array in generic type
+                gs.x[i] = (int)v;                                                               // set field array in generic type
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                 | sum( size, gs.x ) | ", check" | (int)s | endl; // add filed array in generic type
+                 | sum( size, gs.x ) | ", check" | (int)s | endl; // add field array in generic type
 } // main