Changeset 764db43

Timestamp:

Jul 24, 2017, 8:52:12 PM (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:

ea91c42

Parents:

637ff81 (diff), 72457b6 (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:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (4 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Jul 18 07:11:48 2017
- * Update Count     : 544
+ * Last Modified On : Mon Jul 24 08:27:23 2017
+ * Update Count     : 545
  */
 
@@ -271 +271 @@
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
 __builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC
+virtual                 { KEYWORD_RETURN(VIRTUAL); }                    // CFA
 void                    { KEYWORD_RETURN(VOID); }
 volatile                { KEYWORD_RETURN(VOLATILE); }

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 17 12:17:00 2017
-// Update Count     : 2455
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jul 24 09:01:14 2017
+// Update Count     : 2463
 //
 
@@ -118 +118 @@
 %token RESTRICT                                                                                 // C99
 %token ATOMIC                                                                                   // C11
-%token FORALL LVALUE MUTEX                                                              // CFA
-%token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED ZERO_T ONE_T
+%token FORALL LVALUE MUTEX VIRTUAL                                              // CFA
+%token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
+%token BOOL COMPLEX IMAGINARY                                                   // C99
+%token ZERO_T ONE_T                                                                             // CFA
 %token VALIST                                                                                   // GCC
-%token BOOL COMPLEX IMAGINARY                                                   // C99
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
@@ -570 +571 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
+                // VIRTUAL cannot be opt because of look ahead issues
+        | '(' VIRTUAL ')' cast_expression
+                { $$ = new ExpressionNode( build_cast( nullptr, $4 ) ); }
+        | '(' VIRTUAL type_no_function ')' cast_expression
+                { $$ = new ExpressionNode( build_cast( $3, $5 ) ); }
 //      | '(' type_no_function ')' tuple
 //              { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
@@ -1515 +1521 @@
         | IMAGINARY                                                                                     // C99
                 { $$ = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
-        | VALIST                                                                                        // GCC, __builtin_va_list
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         | ZERO_T
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
         | ONE_T
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
+        | VALIST                                                                                        // GCC, __builtin_va_list
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         ;