moved implementation of LangStringList and StringsArray into lang.cpp

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3722 212acab6-be3b-0410-9dea-997c60f758d6

Source/lang.cpp

@@ -120,6 +120,165 @@ struct {
   {"^RTL", "0", NONE_STATIC}
 };
 
+// ==============
+// LangStringList
+// ==============
+
+LangStringList::LangStringList() {
+  count = 0;
+}
+
+int LangStringList::add(const char *name, int *sn/*=0*/)
+{
+  int pos = SortedStringListND<struct langstring>::add(name);
+  if (pos == -1) return -1;
+
+  ((struct langstring*)gr.get())[pos].sn = count;
+  if (sn) *sn = count;
+  count++;
+  ((struct langstring*)gr.get())[pos].index = -1;
+  ((struct langstring*)gr.get())[pos].uindex = -1;
+  ((struct langstring*)gr.get())[pos].process = 1;
+
+  return pos;
+}
+
+int LangStringList::get(char *name, int *sn/*=0*/, int *index/*=0*/, int *uindex/*=0*/, int *process/*=0*/)
+{
+  if (index) *index = -1;
+  if (uindex) *uindex = -1;
+  if (sn) *sn = -1;
+  int v=find(name);
+  if (v==-1) return -1;
+  if (index) *index = ((struct langstring*)gr.get())[v].index;
+  if (uindex) *uindex = ((struct langstring*)gr.get())[v].uindex;
+  if (sn) *sn = ((struct langstring*)gr.get())[v].sn;
+  if (process) *process = ((struct langstring*)gr.get())[v].process;
+  return v;
+}
+
+void LangStringList::set(int pos, int index/*=-1*/, int uindex/*=-1*/, int process/*=-1*/)
+{
+  if ((unsigned int)pos > (gr.getlen() / sizeof(struct langstring)))
+    return;
+
+  struct langstring *data=(struct langstring *)gr.get();
+
+  if (index >= 0)
+    data[pos].index = index;
+  if (uindex >= 0)
+    data[pos].uindex = uindex;
+  if (process >= 0)
+    data[pos].process = process;
+}
+
+void LangStringList::set(char *name, int index, int uindex/*=-1*/, int process/*=-1*/)
+{
+  set(get(name), index, uindex, process);
+}
+
+const char* LangStringList::pos2name(int pos)
+{
+  struct langstring *data=(struct langstring *)gr.get();
+
+  if ((unsigned int)pos > (gr.getlen() / sizeof(struct langstring)))
+    return 0;
+
+  return ((const char*)strings.get() + data[pos].name);
+}
+
+const char* LangStringList::offset2name(int name)
+{
+  if ((unsigned int)name > (unsigned int)strings.getlen())
+    return 0;
+
+  return (const char*)strings.get() + name;
+}
+
+int LangStringList::getnum()
+{
+  return gr.getlen() / sizeof(struct langstring);
+}
+
+int LangStringList::compare_index(const void *item1, const void *item2)
+{
+  struct langstring *ls1 = (struct langstring *)item1;
+  struct langstring *ls2 = (struct langstring *)item2;
+
+  return ls1->index - ls2->index;
+}
+
+langstring* LangStringList::sort_index(int *num)
+{
+  if (!num) return 0;
+  sortbuf.resize(0);
+  sortbuf.add(gr.get(), gr.getlen());
+  *num = sortbuf.getlen() / sizeof(struct langstring);
+  qsort(sortbuf.get(), *num, sizeof(struct langstring), compare_index);
+  return (struct langstring*) sortbuf.get();
+}
+
+int LangStringList::compare_uindex(const void *item1, const void *item2)
+{
+  struct langstring *ls1 = (struct langstring *)item1;
+  struct langstring *ls2 = (struct langstring *)item2;
+
+  return ls1->uindex - ls2->uindex;
+}
+
+langstring* LangStringList::sort_uindex(int *num)
+{
+  if (!num) return 0;
+  sortbuf.resize(0);
+  sortbuf.add(gr.get(), gr.getlen());
+  *num = sortbuf.getlen() / sizeof(struct langstring);
+  qsort(sortbuf.get(), *num, sizeof(struct langstring), compare_uindex);
+  return (struct langstring*) sortbuf.get();
+}
+
+// ============
+// StringsArray
+// ============
+
+StringsArray::StringsArray()
+{
+  offsets.set_zeroing(1);
+
+  strings.add("", sizeof(""));
+}
+
+void StringsArray::resize(int num)
+{
+  offsets.resize(num * sizeof(int));
+}
+
+int StringsArray::set(int idx, char *str)
+{
+  if (idx < 0)
+    return 0;
+
+  if (idx >= (int)(offsets.getlen() / sizeof(int)))
+    resize(idx+1);
+
+  int old = ((int*)offsets.get())[idx];
+
+  ((int*)offsets.get())[idx] = strings.add(str, strlen(str) + 1);
+
+  return old;
+}
+
+const char* StringsArray::get(int idx)
+{
+  if ((unsigned int)idx >= (offsets.getlen() / sizeof(int)))
+    return 0;
+
+  return (const char *)strings.get() + ((int*)offsets.get())[idx];
+}
+
+// =========
+// CEXEBuild
+// =========
+
 void CEXEBuild::InitLangTables() {
   keep_ref = false;
 

Source/lang.h

@@ -21,118 +21,19 @@ struct langstring {
 class LangStringList : public SortedStringListND<struct langstring>
 {
   public:
-    LangStringList() {
+    LangStringList();
-      count = 0;
-    }
-    ~LangStringList() { }
 
-    int add(const char *name, int *sn=0)
+    int add(const char *name, int *sn=0);
-    {
+    int get(char *name, int *sn=0, int *index=0, int *uindex=0, int *process=0);
-      int pos = SortedStringListND<struct langstring>::add(name);
+    void set(int pos, int index=-1, int uindex=-1, int process=-1);
-      if (pos == -1) return -1;
+    void set(char *name, int index, int uindex=-1, int process=-1);
-
+    const char *pos2name(int pos);
-      ((struct langstring*)gr.get())[pos].sn = count;
+    const char *offset2name(int name);
-      if (sn) *sn = count;
+    int getnum();
-      count++;
+    static int compare_index(const void *item1, const void *item2);
-      ((struct langstring*)gr.get())[pos].index = -1;
+    langstring *sort_index(int *num);
-      ((struct langstring*)gr.get())[pos].uindex = -1;
+    static int compare_uindex(const void *item1, const void *item2);
-      ((struct langstring*)gr.get())[pos].process = 1;
+    langstring *sort_uindex(int *num);
-
-      return pos;
-    }
-
-    int get(char *name, int *sn=0, int *index=0, int *uindex=0, int *process=0)
-    {
-      if (index) *index = -1;
-      if (uindex) *uindex = -1;
-      if (sn) *sn = -1;
-      int v=find(name);
-      if (v==-1) return -1;
-      if (index) *index = ((struct langstring*)gr.get())[v].index;
-      if (uindex) *uindex = ((struct langstring*)gr.get())[v].uindex;
-      if (sn) *sn = ((struct langstring*)gr.get())[v].sn;
-      if (process) *process = ((struct langstring*)gr.get())[v].process;
-      return v;
-    }
-
-    void set(int pos, int index=-1, int uindex=-1, int process=-1)
-    {
-      if ((unsigned int)pos > (gr.getlen() / sizeof(struct langstring)))
-        return;
-
-      struct langstring *data=(struct langstring *)gr.get();
-
-      if (index >= 0)
-        data[pos].index = index;
-      if (uindex >= 0)
-        data[pos].uindex = uindex;
-      if (process >= 0)
-        data[pos].process = process;
-    }
-
-    void set(char *name, int index, int uindex=-1, int process=-1)
-    {
-      set(get(name), index, uindex, process);
-    }
-
-    const char *pos2name(int pos)
-    {
-      struct langstring *data=(struct langstring *)gr.get();
-
-      if ((unsigned int)pos > (gr.getlen() / sizeof(struct langstring)))
-        return 0;
-
-      return ((const char*)strings.get() + data[pos].name);
-    }
-
-    const char *offset2name(int name)
-    {
-      if ((unsigned int)name > (unsigned int)strings.getlen())
-        return 0;
-
-      return (const char*)strings.get() + name;
-    }
-
-    int getnum()
-    {
-      return gr.getlen() / sizeof(struct langstring);
-    }
-
-    static int compare_index(const void *item1, const void *item2)
-    {
-      struct langstring *ls1 = (struct langstring *)item1;
-      struct langstring *ls2 = (struct langstring *)item2;
-
-      return ls1->index - ls2->index;
-    }
-
-    struct langstring *sort_index(int *num)
-    {
-      if (!num) return 0;
-      sortbuf.resize(0);
-      sortbuf.add(gr.get(), gr.getlen());
-      *num = sortbuf.getlen() / sizeof(struct langstring);
-      qsort(sortbuf.get(), *num, sizeof(struct langstring), compare_index);
-      return (struct langstring*) sortbuf.get();
-    }
-
-    static int compare_uindex(const void *item1, const void *item2)
-    {
-      struct langstring *ls1 = (struct langstring *)item1;
-      struct langstring *ls2 = (struct langstring *)item2;
-
-      return ls1->uindex - ls2->uindex;
-    }
-
-    struct langstring *sort_uindex(int *num)
-    {
-      if (!num) return 0;
-      sortbuf.resize(0);
-      sortbuf.add(gr.get(), gr.getlen());
-      *num = sortbuf.getlen() / sizeof(struct langstring);
-      qsort(sortbuf.get(), *num, sizeof(struct langstring), compare_uindex);
-      return (struct langstring*) sortbuf.get();
-    }
 
   private:
     int count;
@@ -141,47 +42,16 @@ class LangStringList : public SortedStringListND<struct langstring>
 
 class StringsArray
 {
+  public:
+    StringsArray();
+
+    void resize(int num);
+    int set(int idx, char *str);
+    const char *get(int idx);
+
   private:
     TinyGrowBuf offsets;
     GrowBuf strings;
-
-  public:
-    StringsArray()
-    {
-      offsets.set_zeroing(1);
-
-      strings.add("", sizeof(""));
-    }
-
-    ~StringsArray() { }
-
-    void resize(int num)
-    {
-      offsets.resize(num * sizeof(int));
-    }
-
-    int set(int idx, char *str)
-    {
-      if (idx < 0)
-        return 0;
-
-      if (idx >= (int)(offsets.getlen() / sizeof(int)))
-        resize(idx+1);
-
-      int old = ((int*)offsets.get())[idx];
-
-      ((int*)offsets.get())[idx] = strings.add(str, strlen(str) + 1);
-
-      return old;
-    }
-
-    const char *get(int idx)
-    {
-      if ((unsigned int)idx >= (offsets.getlen() / sizeof(int)))
-        return 0;
-
-      return (const char *)strings.get() + ((int*)offsets.get())[idx];
-    }
 };
 
 #define NLF_VERSION 6