Changeset cc22003

Timestamp:

Aug 8, 2018, 10:57:58 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

3b2b37f

Parents:

b3763ca

Message:

second attempt to at extended for-ctrl

Location:

src/Parser

Files:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (12 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 : Wed Jun 20 09:08:28 2018
- * Update Count     : 682
+ * Last Modified On : Wed Aug  8 17:23:17 2018
+ * Update Count     : 685
  */
 
@@ -410 +410 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
+"~="                    { NAMEDOP_RETURN(Erange); }                             // CFA
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // 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 : Sat Aug  4 09:38:36 2018
-// Update Count     : 3986
+// Last Modified On : Wed Aug  8 17:50:07 2018
+// Update Count     : 3998
 //
 
@@ -186 +186 @@
 } // fieldDecl
 
-ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, ExpressionNode * comp, ExpressionNode * inc ) {
+ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
         return new ForCtrl(
                 distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
-                new ExpressionNode( build_binary_val( OperKinds::LThan, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
+                new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
                 new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
 } // forCtrl
@@ -227 +227 @@
         IfCtrl * ifctl;
         ForCtrl * fctl;
+        enum OperKinds compop;
         LabelNode * label;
         InitializerNode * in;
@@ -289 +290 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
+%token Erange                                                                                   // ~=
 %token ATassign                                                                                 // @=
 
@@ -311 +313 @@
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression
+%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
@@ -1135 +1138 @@
                                 $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
                         } else {
-                                $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), $1->clone(),
+                                $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $1->clone(),
                                                          new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
                         } // if
                 }
-        | constant_expression '~' constant_expression           // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | constant_expression '~' constant_expression '~' constant_expression // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $3, $5 ); }
+        | constant_expression inclexcl constant_expression      // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
         | comma_expression_opt ';' comma_expression                     // CFA
                 {
@@ -1151 +1154 @@
                         } else {
                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), $3->clone(),
+                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $3->clone(),
                                                                  new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
                                 } else {
@@ -1158 +1161 @@
                         } // if
                 }
-        | comma_expression_opt ';' constant_expression '~' constant_expression // CFA
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
                 {
                         if ( ! $1 ) {
@@ -1164 +1167 @@
                         } else {
                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
                                 } else {
                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
@@ -1170 +1173 @@
                         } // if
                 }
-        | comma_expression_opt ';' constant_expression '~' constant_expression '~' constant_expression // CFA
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
                 {
                         if ( ! $1 ) {
@@ -1176 +1179 @@
                         } else {
                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $5, $7 );
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
                                 } else {
                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
@@ -1186 +1189 @@
         | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
                 { $$ = new ForCtrl( $1, $2, $4 ); }
+        ;
+
+inclexcl:
+        '~'
+                { $$ = OperKinds::LThan; }
+        | Erange
+                { $$ = OperKinds::LEThan; }
         ;