Changeset e5f2a67

Timestamp:

Jul 15, 2017, 7:34:05 PM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

dc2b4d6

Parents:

478b1d0

Message:

second attempt add exponential operator

Location:

src

Files:

• CodeGen/OperatorTable.cc (modified) (3 diffs)
• Parser/ExpressionNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (2 diffs)
• Parser/lex.ll (modified) (3 diffs)
• Parser/parser.yy (modified) (4 diffs)

src/CodeGen/OperatorTable.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 13 14:33:05 2016
-// Update Count     : 10
+// Last Modified On : Sat Jul 15 17:12:22 2017
+// Update Count     : 15
 //
 
@@ -35 +35 @@
                         {       "++?",          "++",   "_operator_preincr",                    OT_PREFIXASSIGN         },
                         {       "--?",          "--",   "_operator_predecr",                    OT_PREFIXASSIGN         },
+                        {       "?\\?",         "\\",   "_operator_exponential",                OT_INFIX                        },
                         {       "?*?",          "*",    "_operator_multiply",                   OT_INFIX                        },
                         {       "?/?",          "/",    "_operator_divide",                             OT_INFIX                        },
@@ -52 +53 @@
                         {       "?|?",          "|",    "_operator_bitor",                              OT_INFIX                        },
                         {       "?=?",          "=",    "_operator_assign",                             OT_INFIXASSIGN          },
+                        {       "?\\=?",        "\\=",  "_operator_expassign",                  OT_INFIXASSIGN          },
                         {       "?*=?",         "*=",   "_operator_multassign",                 OT_INFIXASSIGN          },
                         {       "?/=?",         "/=",   "_operator_divassign",                  OT_INFIXASSIGN          },

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:08:15 2017
-// Update Count     : 542
+// Last Modified On : Sat Jul 15 16:09:04 2017
+// Update Count     : 549
 //
 
@@ -231 +231 @@
 }
 
+// Must harmonize with OperKinds.
 static const char *OperName[] = {
         // diadic
-        "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&",
+        "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?\\?", "?*?", "?/?", "?%?", "||", "&&",
         "?|?", "?&?", "?^?", "Cast", "?<<?", "?>>?", "?<?", "?>?", "?<=?", "?>=?", "?==?", "?!=?",
-        "?=?", "?@=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
+        "?=?", "?@=?", "?\\=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
         "?[?]", "...",
         // monadic

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:56:00 2017
-// Update Count     : 780
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 15 16:00:48 2017
+// Update Count     : 785
 //
 
@@ -141 +141 @@
 };
 
+// Must harmonize with OperName.
 enum class OperKinds {
         // diadic
-        SizeOf, AlignOf, OffsetOf, Plus, Minus, Mul, Div, Mod, Or, And,
+        SizeOf, AlignOf, OffsetOf, Plus, Minus, Exp, Mul, Div, Mod, Or, And,
         BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
-        Assign, AtAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
+        Assign, AtAssn, ExpAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
         Index, Range,
         // monadic

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Jul 15 08:31:47 2017
- * Update Count     : 541
+ * Last Modified On : Sat Jul 15 15:46:34 2017
+ * Update Count     : 542
  */
 
@@ -337 +337 @@
 "-"                             { ASCIIOP_RETURN(); }
 "*"                             { ASCIIOP_RETURN(); }
+"\\"                    { ASCIIOP_RETURN(); }                                   // CFA, exponentiation
 "/"                             { ASCIIOP_RETURN(); }
 "%"                             { ASCIIOP_RETURN(); }
-"\\"                    { ASCIIOP_RETURN(); }                                   // CFA, exponentiation
 "^"                             { ASCIIOP_RETURN(); }
 "~"                             { ASCIIOP_RETURN(); }
@@ -362 +362 @@
 "+="                    { NAMEDOP_RETURN(PLUSassign); }
 "-="                    { NAMEDOP_RETURN(MINUSassign); }
+"\\="                   { NAMEDOP_RETURN(EXPassign); }                  // CFA, exponentiation
 "*="                    { NAMEDOP_RETURN(MULTassign); }
 "/="                    { NAMEDOP_RETURN(DIVassign); }
 "%="                    { NAMEDOP_RETURN(MODassign); }
-"\\="                   { NAMEDOP_RETURN(MODassign); }                  // CFA, exponentiation
 "&="                    { NAMEDOP_RETURN(ANDassign); }
 "|="                    { NAMEDOP_RETURN(ORassign); }

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 Jul 15 09:46:26 2017
-// Update Count     : 2451
+// Last Modified On : Sat Jul 15 15:59:50 2017
+// Update Count     : 2454
 //
 
@@ -151 +151 @@
 %token ELLIPSIS                                                                                 // ...
 
-%token MULTassign       DIVassign       MODassign                               // *=   /=      %=/
+%token EXPassign        MULTassign      DIVassign       MODassign       // \=   *=      /=      %=
 %token PLUSassign       MINUSassign                                                     // +=   -=
 %token LSassign         RSassign                                                        // <<=  >>=
@@ -577 +577 @@
         cast_expression
         | exponential_expression '\\' cast_expression
-                { $$ = new ExpressionNode( build_binary_val( OperKinds::Mod, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Exp, $1, $3 ) ); }
         ;
 
@@ -685 +685 @@
         '='                                                                                     { $$ = OperKinds::Assign; }
         | ATassign                                                                      { $$ = OperKinds::AtAssn; }
+        | EXPassign                                                                     { $$ = OperKinds::ExpAssn; }
         | MULTassign                                                            { $$ = OperKinds::MulAssn; }
         | DIVassign                                                                     { $$ = OperKinds::DivAssn; }