Changeset 4117761 for src

Timestamp:

Jun 29, 2024, 5:02:49 AM (6 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

115ac1ce

Parents:

5ccc733 (diff), 3c55fcd (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/Stats/Heap.cpp (modified) (1 diff)
• Parser/lex.ll (modified) (2 diffs)
• Parser/parser.yy (modified) (8 diffs)

src/Common/Stats/Heap.cpp

@@ -21 +21 @@
 #include <iostream>
 
-#if defined(__has_feature)
+// Most of the other statistics features are deactivated only by defining
+// NO_STATISTICS (or their NO_%_STATISTICS macro). However the heap has some
+// other compatability concerns and will disable itself in some cases.
+//
+// I do not claim to understand these cases. But TCMALLOC is often defined by
+// default and you can pass --disable-gprofiler to configure to remove it.
+
+#if defined(NO_STATISTICS) || defined(TCMALLOC) || defined(__SANITIZE_ADDRESS__)
+        #define NO_HEAP_STATISTICS
+#elif defined(__has_feature)
         #if __has_feature(address_sanitizer)
-                #define NO_HEAP_STATISTICS
-        # endif
-#endif
-
-#if defined( NO_STATISTICS ) || defined( TCMALLOC ) || defined(__SANITIZE_ADDRESS__)
-        #if !defined(NO_HEAP_STATISTICS)
                 #define NO_HEAP_STATISTICS
         #endif

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jun 20 16:54:05 2024
- * Update Count     : 778
+ * Last Modified On : Thu Jun 27 14:38:27 2024
+ * Update Count     : 780
  */
 
@@ -458 +458 @@
 
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
+"+~"                    { NAMEDOP_RETURN(ErangeUp); }                   // CFA
 "~="                    { NAMEDOP_RETURN(ErangeUpEq); }                 // CFA
+"+~="                   { NAMEDOP_RETURN(ErangeUpEq); }                 // CFA
 "-~"                    { NAMEDOP_RETURN(ErangeDown); }                 // CFA
 "-~="                   { NAMEDOP_RETURN(ErangeDownEq); }               // CFA

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 26 09:37:28 2024
-// Update Count     : 6700
+// Last Modified On : Thu Jun 27 14:45:57 2024
+// Update Count     : 6705
 //
 
@@ -224 +224 @@
 #define UPDOWN( compop, left, right ) (compop == OperKinds::LThan || compop == OperKinds::LEThan ? left : right)
 #define MISSING_ANON_FIELD "illegal syntax, missing loop fields with an anonymous loop index is meaningless as loop index is unavailable in loop body."
-#define MISSING_LOW "illegal syntax, missing low value for up-to range so index is uninitialized."
-#define MISSING_HIGH "illegal syntax, missing high value for down-to range so index is uninitialized."
+#define MISSING_LOW "illegal syntax, missing low value for ascanding range so index is uninitialized."
+#define MISSING_HIGH "illegal syntax, missing high value for descending range so index is uninitialized."
 
 static ForCtrl * makeForCtrl( const CodeLocation & location, DeclarationNode * init, OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
@@ -409 +409 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
-%token ErangeUpEq       ErangeDown      ErangeDownEq                    // ~=   -~      -~=
+%token ErangeUp         ErangeUpEq      ErangeDown      ErangeDownEq // +~      +~=/~=  -~      -~=
 %token ATassign                                                                                 // @=
 
@@ -1526 +1526 @@
                 }
         | comma_expression ';' '@' updowneq '@'                         // CFA, invalid syntax rule
-                { SemanticError( yylloc, "illegal syntax, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; }
+                { SemanticError( yylloc, "illegal syntax, missing low/high value for ascending/descending range so index is uninitialized." ); $$ = nullptr; }
 
         | comma_expression ';' comma_expression updowneq comma_expression '~' comma_expression // CFA
@@ -1555 +1555 @@
                 }
         | comma_expression ';' '@' updowneq '@' '~' '@' // CFA
-                { SemanticError( yylloc, "illegal syntax, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; }
+                { SemanticError( yylloc, "illegal syntax, missing low/high value for ascending/descending range so index is uninitialized." ); $$ = nullptr; }
 
         | declaration comma_expression                                          // CFA
@@ -1603 +1603 @@
                 }
         | declaration '@' updowneq '@' '~' '@'                          // CFA, invalid syntax rule
-                { SemanticError( yylloc, "illegal syntax, missing low/high value for up/down-to range so index is uninitialized." ); $$ = nullptr; }
+                { SemanticError( yylloc, "illegal syntax, missing low/high value for ascending/descending range so index is uninitialized." ); $$ = nullptr; }
 
         | comma_expression ';' enum_key                                         // CFA, enum type
@@ -1632 +1632 @@
 // it is not possible to just remove the '='. The entire '~=' must be removed.
 downupdowneq:
-        ErangeDown
+        ErangeUp
+                { $$ = OperKinds::LThan; }
+        | ErangeDown
                 { $$ = OperKinds::GThan; }
         | ErangeUpEq
@@ -1641 +1643 @@
 
 updown:
-        '~'
+        '~'                                                                                                     // shorthand 0 ~ 10 => 0 +~ 10
+                { $$ = OperKinds::LThan; }
+        | ErangeUp
                 { $$ = OperKinds::LThan; }
         | ErangeDown