Changeset f73f5f4 for src/Parser

Timestamp:

Jul 12, 2017, 10:14:15 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3268a58, 76f2bdcb

Parents:

f2b12406 (diff), 7812f1d1 (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/Parser

Files:

• StatementNode.cc (modified) (2 diffs)
• lex.ll (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:08:37 2017
-// Update Count     : 330
+// Last Modified On : Tue Jul 11 21:23:15 2017
+// Update Count     : 331
 //
 
@@ -93 +93 @@
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
-        assert( branches.size() >= 0 );                                         // size == 0 for switch (...) {}, i.e., no declaration or statements
+        // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
 }

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Wed Jun 28 21:03:45 2017
- * Update Count     : 529
+ * Last Modified On : Tue Jul 11 21:30:51 2017
+ * Update Count     : 534
  */
 
@@ -59 +59 @@
 }
 
+// Stop warning due to incorrectly generated flex code.
+#pragma GCC diagnostic ignored "-Wsign-compare"
 %}
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 30 15:38:00 2017
-// Update Count     : 2415
+// Last Modified On : Tus Jul 11 13:39:00 2017
+// Update Count     : 2416
 //
 
@@ -2176 +2176 @@
                 {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::linkageCheck( $2 );
+                        linkage = LinkageSpec::linkageUpdate( linkage, $2 );
                 }
           '{' external_definition_list_opt '}'