Changeset 235b41f for src/CodeGen/OperatorTable.cc

Timestamp:

Sep 5, 2017, 3:41:04 PM (7 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:

416cc86

Parents:

800d275 (diff), 3f8dd01 (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

File:

• src/CodeGen/OperatorTable.cc (modified) (3 diffs)

src/CodeGen/OperatorTable.cc

@@ -19 +19 @@
 
 #include "OperatorTable.h"
+#include "Common/utility.h"
 
 namespace CodeGen {
@@ -65 +66 @@
                         {       "?^=?",         "^=",   "_operator_bitxorassign",               OT_INFIXASSIGN          },
                         {       "?|=?",         "|=",   "_operator_bitorassign",                OT_INFIXASSIGN          },
-                        {       "&&",           "&&",   "&&",                                                   OT_LABELADDRESS         },
-                        {       "0",            "0",    "_constant_zero",                               OT_CONSTANT                     },
-                        {       "1",            "1",    "_constant_one",                                OT_CONSTANT                     }
                 };
 
@@ -86 +84 @@
                         initialize();
                 } // if
+
                 std::map< std::string, OperatorInfo >::const_iterator i = table.find( funcName );
                 if ( i == table.end() ) {
+                        if ( isPrefix( funcName, "?`" ) ) {
+                                // handle literal suffixes, which are user-defined postfix operators
+                                info.inputName = funcName;
+                                info.symbol = funcName.substr(2);
+                                info.outputName = toString( "__operator_literal_", info.symbol );
+                                info.type = OT_POSTFIX;
+                                return true;
+                        }
                         return false;
                 } else {