Changeset 8e90fd6 for src

Timestamp:

Jan 18, 2025, 3:46:06 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d0b6712

Parents:

fa59c40 (diff), df56e25 (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:

• AST/Expr.cpp (modified) (1 diff)
• AST/Stmt.hpp (modified) (2 diffs)
• CodeGen/CodeGenerator.cpp (modified) (2 diffs)
• Parser/StatementNode.cpp (modified) (2 diffs)
• Parser/lex.ll (modified) (2 diffs)
• Parser/parser.yy (modified) (4 diffs)

src/AST/Expr.cpp

@@ -122 +122 @@
 
 bool VariableExpr::get_lvalue() const {
-        // It isn't always an lvalue, but it is never an rvalue.
+        // Special case for enumeration labels (more literals than variables):
         if(dynamic_cast<const ast::EnumInstType *>(var->get_type())) return !var->isMember;
+        // The remaining uses are either actual variables (lvalues) or function
+        // names which are a special value catagory that can be treated as
+        // lvalues in the places we are worried about.
         return true;
 }

src/AST/Stmt.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May  8 13:00:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr  5 10:34:00 2023
-// Update Count     : 37
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jan 17 14:18:56 2025
+// Update Count     : 38
 //
 
@@ -280 +280 @@
 };
 
-// Branch control flow statement: goto ... or break or continue or fallthru
+// Branch control flow statement: goto ... or break or continue or fallthrough
 class BranchStmt final : public Stmt {
   public:

src/CodeGen/CodeGenerator.cpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Tue Oct 17 15:54:00 2023
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Oct 25 18:28:00 2023
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jan 17 14:19:22 2025
+// Update Count     : 1
 //
 
@@ -1092 +1092 @@
         case ast::BranchStmt::FallThrough:
         case ast::BranchStmt::FallThroughDefault:
-                assertf( !options.genC, "fallthru should not reach code generation." );
-                output << "fallthru";
+                assertf( !options.genC, "fallthrough should not reach code generation." );
+                output << "fallthrough";
                 break;
         default:
                 assertf( false, "Bad BranchStmt value." );
         }
-        // Print branch target for labelled break/continue/fallthru in debug mode.
+        // Print branch target for labelled break/continue/fallthrough in debug mode.
         if ( !options.genC && stmt->kind != ast::BranchStmt::Goto ) {
                 if ( !stmt->target.empty() ) {

src/Parser/StatementNode.cpp

@@ -10 +10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 23 22:50:35 2024
-// Update Count     : 432
+// Last Modified By : Kyoung Seo
+// Last Modified On : Thd Jan 16 13:05:00 2025
+// Update Count     : 433
 //
 
@@ -351 +351 @@
         delete targetExpr;
 
-        existing->clauses.insert( existing->clauses.begin(), clause );
+        existing->clauses.insert( existing->clauses.end(), clause );
 
         return existing;

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sun Dec 15 17:23:46 2024
- * Update Count     : 877
+ * Last Modified On : Fri Jan 17 14:36:16 2025
+ * Update Count     : 878
  */
 
@@ -273 +273 @@
 extern                  { KEYWORD_RETURN(EXTERN); }
 fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
-fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 finally                 { QKEYWORD_RETURN(FINALLY); }                   // CFA
 fixup                   { QKEYWORD_RETURN(FIXUP); }                             // 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 : Sun Dec 15 21:30:38 2024
-// Update Count     : 6933
+// Last Modified On : Fri Jan 17 14:35:08 2025
+// Update Count     : 6935
 //
 
@@ -377 +377 @@
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA
+%token CHOOSE FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL   // CFA
 %token CORUN COFOR
 %token DISABLE ENABLE TRY THROW THROWRESUME AT                  // CFA
@@ -1680 +1680 @@
                 // whereas normal operator precedence yields goto (*i)+3;
                 { $$ = new StatementNode( build_computedgoto( $3 ) ); }
-                // A semantic check is required to ensure fallthru appears only in the body of a choose statement.
-        | fall_through_name ';'                                                         // CFA
+                // A semantic check is required to ensure fallthrough appears only in the body of a choose statement.
+        | FALLTHROUGH ';'                                                                       // CFA
                 { $$ = new StatementNode( build_branch( yylloc, ast::BranchStmt::FallThrough ) ); }
-        | fall_through_name identifier_or_type_name ';'         // CFA
+        | FALLTHROUGH identifier_or_type_name ';'                       // CFA
                 { $$ = new StatementNode( build_branch( yylloc, $2, ast::BranchStmt::FallThrough ) ); }
-        | fall_through_name DEFAULT ';'                                         // CFA
+        | FALLTHROUGH DEFAULT ';'                                                       // CFA
                 { $$ = new StatementNode( build_branch( yylloc, ast::BranchStmt::FallThroughDefault ) ); }
         | CONTINUE ';'
@@ -1723 +1723 @@
         | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
                 { $$ = new StatementNode( build_resume_at( $2, $4 ) ); }
-        ;
-
-fall_through_name:                                                                              // CFA
-        FALLTHRU
-        | FALLTHROUGH
         ;