Changes For Bug 352

[oota-llvm.git] / include / llvm / ADT / StringExtras.h

diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index e67e25ced51761761fbe663a6854ce8ac6b41ce7..7e25f654d8fd1ac4de0584a98eecfd86b09b6aaa 100644 (file)
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -1,17 +1,45 @@
-//===-- Support/StringExtras.h - Useful string functions ---------*- C++ -*--=//
+//===-- llvm/ADT/StringExtras.h - Useful string functions -------*- C++ -*-===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This file contains some functions that are useful when dealing with strings.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STRING_EXTRAS_H
-#define SUPPORT_STRING_EXTRAS_H
+#ifndef LLVM_ADT_STRINGEXTRAS_H
+#define LLVM_ADT_STRINGEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
+#include <cctype>
+#include <cstdio>
 #include <string>
-#include <stdio.h>
 
-static inline string utostr(uint64_t X, bool isNeg = false) {
+namespace llvm {
+
+static inline std::string utohexstr(uint64_t X) {
+  char Buffer[40];
+  char *BufPtr = Buffer+39;
+
+  *BufPtr = 0;                  // Null terminate buffer...
+  if (X == 0) *--BufPtr = '0';  // Handle special case...
+
+  while (X) {
+    unsigned char Mod = (unsigned char)X & 15;
+    if (Mod < 10)
+      *--BufPtr = '0' + Mod;
+    else
+      *--BufPtr = 'A' + Mod-10;
+    X >>= 4;
+  }
+  return std::string(BufPtr);
+}
+
+static inline std::string utostr(unsigned long long X, bool isNeg = false) {
   char Buffer[40];
   char *BufPtr = Buffer+39;
 
@@ -19,24 +47,19 @@ static inline string utostr(uint64_t X, bool isNeg = false) {
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    *--BufPtr = '0' + (X % 10);
+    *--BufPtr = '0' + char(X % 10);
     X /= 10;
   }
 
   if (isNeg) *--BufPtr = '-';   // Add negative sign...
-
-  return string(BufPtr);
+  return std::string(BufPtr);
 }
 
-static inline string itostr(int64_t X) {
-  if (X < 0) 
-    return utostr((uint64_t)-X, true);
-  else
-    return utostr((uint64_t)X);
+static inline std::string utostr(unsigned long X, bool isNeg = false) {
+  return utostr(static_cast<unsigned long long>(X), isNeg);
 }
 
-
-static inline string utostr(unsigned X, bool isNeg = false) {
+static inline std::string utostr(unsigned X, bool isNeg = false) {
   char Buffer[20];
   char *BufPtr = Buffer+19;
 
@@ -44,26 +67,59 @@ static inline string utostr(unsigned X, bool isNeg = false) {
   if (X == 0) *--BufPtr = '0';  // Handle special case...
 
   while (X) {
-    *--BufPtr = '0' + (X % 10);
+    *--BufPtr = '0' + char(X % 10);
     X /= 10;
   }
 
   if (isNeg) *--BufPtr = '-';   // Add negative sign...
 
-  return string(BufPtr);
+  return std::string(BufPtr);
+}
+
+static inline std::string itostr(long long X) {
+  if (X < 0) 
+    return utostr(static_cast<uint64_t>(-X), true);
+  else
+    return utostr(static_cast<uint64_t>(X));
+}
+  
+static inline std::string itostr(long X) {
+  if (X < 0) 
+    return utostr(static_cast<uint64_t>(-X), true);
+  else
+    return utostr(static_cast<uint64_t>(X));
 }
 
-static inline string itostr(int X) {
+static inline std::string itostr(int X) {
   if (X < 0) 
-    return utostr((unsigned)-X, true);
+    return utostr(static_cast<unsigned>(-X), true);
   else
-    return utostr((unsigned)X);
+    return utostr(static_cast<unsigned>(X));
 }
 
-static inline string ftostr(double V) {
+static inline std::string ftostr(double V) {
   char Buffer[200];
-  snprintf(Buffer, 200, "%e", V);
+  sprintf(Buffer, "%20.6e", V);
   return Buffer;
 }
 
+static inline std::string LowercaseString(const std::string &S) { 
+  std::string result(S);
+  for (unsigned i = 0; i < S.length(); ++i)
+    if (isupper(result[i]))
+      result[i] = (char)tolower(result[i]);
+  return result;
+}
+
+/// getToken - This function extracts one token from source, ignoring any
+/// leading characters that appear in the Delimiters string, and ending the
+/// token at any of the characters that appear in the Delimiters string.  If
+/// there are no tokens in the source string, an empty string is returned.
+/// The Source source string is updated in place to remove the returned string
+/// and any delimiter prefix from it.
+std::string getToken(std::string &Source,
+                     const char *Delimiters = " \t\n\v\f\r");
+
+} // End llvm namespace
+
 #endif