Changeset 565acf59 for src

Timestamp:

Feb 12, 2021, 12:27:38 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

eb24cec0

Parents:

da3963a (diff), 52f6250 (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:

• Parser/parser.yy (modified) (8 diffs)
• main.cc (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 : Tue Jan 26 11:18:19 2021
-// Update Count     : 4674
+// Last Modified On : Wed Feb  3 18:30:12 2021
+// Update Count     : 4700
 //
 
@@ -41 +41 @@
 
 %{
-#define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
+#define YYDEBUG_LEXER_TEXT( yylval )                                    // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
 #define YYERROR_VERBOSE                                                                 // more information in syntax errors
@@ -187 +187 @@
         ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->expr.get());
         if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
-        type = new ExpressionNode( new CastExpr( maybeMoveBuild<Expression>(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
+                type = new ExpressionNode( new CastExpr( maybeMoveBuild<Expression>(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
         } // if
         return new ForCtrl(
@@ -618 +618 @@
 postfix_expression:
         primary_expression
+        | postfix_expression '[' assignment_expression ',' comma_expression ']'
+                // { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, new ExpressionNode( build_binary_val( OperKinds::Index, $3, $5 ) ) ) ); }
+                { SemanticError( yylloc, "New array subscript is currently unimplemented." ); $$ = nullptr; }
         | postfix_expression '[' assignment_expression ']'
                 // CFA, comma_expression disallowed in this context because it results in a common user error: subscripting a
@@ -1247 +1250 @@
                 { $$ = 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
+        | fall_through_name ';'                                                         // CFA
                 { $$ = new StatementNode( build_branch( BranchStmt::FallThrough ) ); }
-    | fall_through_name identifier_or_type_name ';'             // CFA
+        | fall_through_name identifier_or_type_name ';'         // CFA
                 { $$ = new StatementNode( build_branch( $2, BranchStmt::FallThrough ) ); }
         | fall_through_name DEFAULT ';'                                         // CFA
@@ -1739 +1742 @@
 
 enum_specifier_nobody:                                                                  // type specifier - {...}
-                // Preclude SUE declarations in restricted scopes:
-                //
-                //    int f( struct S { int i; } s1, Struct S s2 ) { struct S s3; ... }
-                //
-                // because it is impossible to call f due to name equivalence.
+                // Preclude SUE declarations in restricted scopes (see type_specifier_nobody)
         basic_type_specifier
         | sue_type_specifier_nobody
@@ -2461 +2460 @@
                 {
                         typedefTable.addToScope( *$2, TYPEDEFname, "9" );
-                        if ( $1 == TypeDecl::Otype ) { SemanticError( yylloc, "otype keyword is deprecated" ); }
-                        if ( $1 == TypeDecl::Dtype ) { SemanticError( yylloc, "dtype keyword is deprecated" ); }
-                        if ( $1 == TypeDecl::Ttype ) { SemanticError( yylloc, "ttype keyword is deprecated" ); }
+                        if ( $1 == TypeDecl::Otype ) { SemanticError( yylloc, "otype keyword is deprecated, use T " ); }
+                        if ( $1 == TypeDecl::Dtype ) { SemanticError( yylloc, "dtype keyword is deprecated, use T &" ); }
+                        if ( $1 == TypeDecl::Ttype ) { SemanticError( yylloc, "ttype keyword is deprecated, use T ..." ); }
                 }
           type_initializer_opt assertion_list_opt
@@ -3191 +3190 @@
         | '[' ']' multi_array_dimension
                 { $$ = DeclarationNode::newArray( 0, 0, false )->addArray( $3 ); }
+        | '[' push assignment_expression pop ',' comma_expression ']'
+                { $$ = DeclarationNode::newArray( $3, 0, false )->addArray( DeclarationNode::newArray( $6, 0, false ) ); }
+                // { SemanticError( yylloc, "New array dimension is currently unimplemented." ); $$ = nullptr; }
         | multi_array_dimension
         ;

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec  7 15:29:00 2020
-// Update Count     : 639
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Feb  8 21:10:16 2021
+// Update Count     : 642
 //
 
@@ -492 +492 @@
 
 static const char * description[] = {
-        "diagnostic color: never, always, or auto.",            // -c
+        "diagnostic color: never, always, auto",                        // -c
         "wait for gdb to attach",                                                       // -g
-        "print help message",                                                           // -h
+        "print translator help message",                                        // -h
         "generate libcfa.c",                                                            // -l
         "generate line marks",                                                          // -L
@@ -500 +500 @@
         "do not generate line marks",                                           // -N
         "do not read prelude",                                                          // -n
-        "generate prototypes for prelude functions",            // -p
+        "do not generate prelude prototypes => prelude not printed", // -p
         "only print deterministic output",                  // -d
         "Use the old-ast",                                                                      // -O
@@ -506 +506 @@
         "print",                                                                                        // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
-        "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
+        "<option-list> enable profiling information: counters, heap, time, all, none", // -S
         "building cfa standard lib",                                            // -t
         "",                                                                                                     // -w