Merged 1.075 frontend.

dmd/root/stringtable.h

@@ -1,3 +1,4 @@
+
 // Copyright (c) 1999-2011 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
@@ -15,34 +16,56 @@
 #endif
 
 #include "root.h"
-#include "dchar.h"
-#include "lstring.h"
 
+struct StringEntry;
+
+// StringValue is a variable-length structure as indicated by the last array
+// member with unspecified size.  It has neither proper c'tors nor a factory
+// method because the only thing which should be creating these is StringTable.
 struct StringValue
 {
     union
-    {   int intvalue;
+    {
         void *ptrvalue;
-        dchar *string;
+        char *string;
     };
-    Lstring lstring;
+private:
+    unsigned length;
+
+#ifndef IN_GCC
+    // Disable warning about nonstandard extension
+    #pragma warning (disable : 4200)
+#endif
+    char lstring[];
+
+public:
+    unsigned len() const { return length; }
+    const char *toDchars() const { return lstring; }
+
+private:
+    friend struct StringEntry;
+    StringValue();  // not constructible
+    // This is more like a placement new c'tor
+    void ctor(const char *p, unsigned length);
 };
 
 struct StringTable
 {
+private:
     void **table;
     unsigned count;
     unsigned tabledim;
 
+public:
     void init(unsigned size = 37);
     ~StringTable();
 
-    StringValue *lookup(const dchar *s, unsigned len);
-    StringValue *insert(const dchar *s, unsigned len);
-    StringValue *update(const dchar *s, unsigned len);
+    StringValue *lookup(const char *s, unsigned len);
+    StringValue *insert(const char *s, unsigned len);
+    StringValue *update(const char *s, unsigned len);
 
 private:
-    void **search(const dchar *s, unsigned len);
+    void **search(const char *s, unsigned len);
 };
 
 #endif