Changeset bc3127d

Timestamp:

Sep 1, 2017, 4:26:14 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

5809461, ba2a68b

Parents:

78a0b88

Message:

Handle user-defined literals in OperatorTable?, 0/1 from operator table

Location:

src

Files:

• CodeGen/OperatorTable.cc (modified) (3 diffs)
• Common/utility.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (1 diff)

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                     }
+                        {       "&&",           "&&",   "&&",                                                   OT_LABELADDRESS         }
                 };
 
@@ -86 +85 @@
                         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 {

src/Common/utility.h

@@ -222 +222 @@
         std::cerr << "Warning: ";
         warn_single( params... );
+}
+
+/// determines if `pref` is a prefix of `str`
+static inline bool isPrefix( const std::string & str, const std::string & pref ) {
+        if ( pref.size() > str.size() ) return false;
+        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
+        return its.first == pref.end();
 }
 

src/GenPoly/Box.cc

@@ -1298 +1298 @@
                 }
 
-                /// determines if `pref` is a prefix of `str`
-                bool isPrefix( const std::string & str, const std::string & pref ) {
-                        if ( pref.size() > str.size() ) return false;
-                        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
-                        return its.first == pref.end();
-                }
-
                 DeclarationWithType * Pass2::mutate( FunctionDecl *functionDecl ) {
                         functionDecl = safe_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );