Various changes for pimiento

diff --git a/ecere/src/sys/Date.ec b/ecere/src/sys/Date.ec
index c869d55..cb541d0 100644 (file)
--- a/ecere/src/sys/Date.ec
+++ b/ecere/src/sys/Date.ec
@@ -92,6 +92,17 @@ public struct Date
    Month month;
    int day;
 
+   int OnCompare(Date b)
+   {
+      if(year > b.year) return 1;
+      if(year < b.year) return -1;
+      if(month > b.month) return 1;
+      if(month < b.month) return -1;
+      if(day > b.day) return 1;
+      if(day < b.day) return -1;
+      return 0;
+   }
+
    const char * OnGetString(char * stringOutput, void * fieldData, bool * needClass)
    {
       if(stringOutput)

diff --git a/ecere/src/sys/JSON.ec b/ecere/src/sys/JSON.ec
index a6bebd7..0562846 100644 (file)
--- a/ecere/src/sys/JSON.ec
+++ b/ecere/src/sys/JSON.ec
@@ -38,7 +38,7 @@ public:
 
    void SkipEmpty()
    {
-      while(!f.Eof() && (!ch || ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t'))
+      while(!f.Eof() && (!ch || ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '/'))
       {
          f.Getc(&ch);
       }

diff --git a/eda/drivers/sqlite/EDASQLite.ec b/eda/drivers/sqlite/EDASQLite.ec
index 68d3ab2..19f9c1d 100644 (file)
--- a/eda/drivers/sqlite/EDASQLite.ec
+++ b/eda/drivers/sqlite/EDASQLite.ec
@@ -40,6 +40,11 @@ extern int __ecereVMethodID_class_OnUnserialize;
 extern int __ecereVMethodID_class_OnFree;
 private:
 
+static SerialBuffer collationBuffer1 { };
+static SerialBuffer collationBuffer2 { };
+static char storage1[512];
+static char storage2[512];
+
 int CollationCompare(Class type, int count1, const void * data1, int count2, const void * data2)
 {
    if(type.type == normalClass || type.type ==  noHeadClass)
@@ -66,11 +71,30 @@ int CollationCompare(Class type, int count1, const void * data1, int count2, con
    {
       void * inst1, * inst2;
       int result;
-      SerialBuffer buffer1 { size = count1, count = count1, buffer = (byte *)data1 };
-      SerialBuffer buffer2 { size = count2, count = count2, buffer = (byte *)data2 };
-
-      inst1 = new0 byte[type.structSize];
-      inst2 = new0 byte[type.structSize];
+      //SerialBuffer buffer1 { size = count1, count = count1, buffer = (byte *)data1 };
+      //SerialBuffer buffer2 { size = count2, count = count2, buffer = (byte *)data2 };
+
+      SerialBuffer buffer1 = collationBuffer1;
+      SerialBuffer buffer2 = collationBuffer2;
+      buffer1.buffer = (byte*)data1;
+      buffer1.size = count1;
+      buffer1.count = count1;
+      buffer1.pos = 0;
+      buffer2.buffer = (byte*)data2;
+      buffer2.size = count2;
+      buffer2.count = count2;
+      buffer2.pos = 0;
+
+      if(type.structSize > 512)
+      {
+         inst1 = new0 byte[type.structSize];
+         inst2 = new0 byte[type.structSize];
+      }
+      else
+      {
+         inst1 = storage1;
+         inst2 = storage2;
+      }
       ((void (*)(void *, void *, void *))(void *)type._vTbl[__ecereVMethodID_class_OnUnserialize])(type, inst1, buffer1);
       ((void (*)(void *, void *, void *))(void *)type._vTbl[__ecereVMethodID_class_OnUnserialize])(type, inst2, buffer2);
 
@@ -78,10 +102,13 @@ int CollationCompare(Class type, int count1, const void * data1, int count2, con
 
       buffer1.buffer = null;
       buffer2.buffer = null;
-      delete buffer1;
-      delete buffer2;
-      delete inst1;
-      delete inst2;
+      //delete buffer1;
+      //delete buffer2;
+      if(type.structSize > 512)
+      {
+         delete inst1;
+         delete inst2;
+      }
       return result;
    }
    else
@@ -836,7 +863,7 @@ class SQLiteTable : Table
             result = sqlite3_create_collation_v2(db.db, type.fullName, SQLITE_UTF8, type, CollationCompare, null);
          }
       }
-      if(sqliteType != SQLITE_BLOB && eClass_IsDerived(type, class(eda::Id)))
+      if(sqliteType != SQLITE_BLOB && eClass_IsDerived(type, class(eda::Id)) && type != class(eda::Id))
       {
          Table * table = (Table *)(intptr)eClass_GetProperty(type, "table");
          if(table) refTable = *table;
@@ -1830,6 +1857,7 @@ class SQLiteRow : DriverRow
       if(updateStatement)
          sqlite3_finalize(updateStatement);
       sprintf(command, "UPDATE `%s` SET `%s` = ? WHERE ROWID = ?;", tbl.name, sqlFld.name);
+      // TODO: Shouldn't we cache those update statements per field?
       result = sqlite3_prepare_v2(tbl.db.db, command, -1, &updateStatement, null);
       sqlite3_bind_int64(updateStatement, 2, (sqlite3_int64)rowID);
       BindData(updateStatement, 1, (SQLiteField)fld, data, null);

diff --git a/eda/libeda/src/gui.ec b/eda/libeda/src/gui.ec
index d097213..1b19d49 100644 (file)
--- a/eda/libeda/src/gui.ec
+++ b/eda/libeda/src/gui.ec
@@ -94,7 +94,10 @@ String GetNameString(Row r, Field nameField)
       if(type.type == structClass)
          data = (int64)(intptr)new0 byte[type.structSize];
       ((bool (*)())(void *)r.GetData)(r, nameField, type, (type.type == structClass) ? (void *)(intptr)data : &data);
-      s = CopyString(((char *(*)(void *, void *, char *, void *, bool *))(void *)type._vTbl[__ecereVMethodID_class_OnGetString])(type, (void *)(intptr)data, tempString, null, null));
+      if(type.type == systemClass || type.type == enumClass || type.type == bitClass)
+         s = CopyString(((char *(*)(void *, void *, char *, void *, bool *))(void *)type._vTbl[__ecereVMethodID_class_OnGetString])(type, &data, tempString, null, null));
+      else
+         s = CopyString(((char *(*)(void *, void *, char *, void *, bool *))(void *)type._vTbl[__ecereVMethodID_class_OnGetString])(type, (void *)(intptr)data, tempString, null, null));
       ((void (*)(void *, void *))(void *)type._vTbl[__ecereVMethodID_class_OnFree])(type, (void *)(intptr)data);
       if(type.type == structClass)
       {
@@ -363,6 +366,9 @@ public class FieldDataBox : DataBox
    anchor = { left = 110, right = shadowS + sgs * 2 };
    borderStyle = deep;
 
+   // TOCHECK: Testing this for GenericEditor performance issue?
+   keepEditor = true;
+
 public:
    property Row row
    {
@@ -725,7 +731,8 @@ public:
    {
       if(listSection.fldId && listSection.fldName)
       {
-         bool stringName = !strcmp(listSection.fldName.type.dataTypeString, "char *");
+         Class type = listSection.fldName.type;
+         bool stringName = !strcmp(type.dataTypeString, "char *");
          while(r.Next())
          {
             Id id = 0;
@@ -734,7 +741,10 @@ public:
             if(stringName)
                r.GetData(listSection.fldName, s);
             else
-               s = PrintString("Entry ", id);
+            {
+               s = GetNameString(r, listSection.fldName);
+               // s = PrintString("Entry ", id);
+            }
             listSection.list.AddString(s).tag = id;
             delete s;
          }

diff --git a/extras/CSVParser.ec b/extras/CSVParser.ec
index 938820a..87f9db3 100644 (file)
--- a/extras/CSVParser.ec
+++ b/extras/CSVParser.ec
@@ -2,6 +2,39 @@
 
 public import "ecere"
 
+public int UnescapeString(char * d, char * s, int len)
+{
+   int j = 0, k = 0;
+   char ch;
+   while(j < len && (ch = s[j]))
+   {
+      switch(ch)
+      {
+         case '\\':
+            switch((ch = s[++j]))
+            {
+               case 'n': d[k] = '\n'; break;
+               case 't': d[k] = '\t'; break;
+               case 'a': d[k] = '\a'; break;
+               case 'b': d[k] = '\b'; break;
+               case 'f': d[k] = '\f'; break;
+               case 'r': d[k] = '\r'; break;
+               case 'v': d[k] = '\v'; break;
+               case '\\': d[k] = '\\'; break;
+               case '\"': d[k] = '\"'; break;
+               case '\'': d[k] = '\''; break;
+               default: d[k] = '\\'; d[k] = ch;
+            }
+            break;
+         default:
+            d[k] = ch;
+      }
+      j++, k++;
+   }
+   d[k] = '\0';
+   return k;
+}
+
 // to be moved in ecere?
 public class FileHandler
 {
@@ -19,6 +52,8 @@ public struct CSVParserParameters
    char valueQuotes;
    int expectedFieldCount;
    bool tolerateNewLineInValues;
+   bool escaped;
+   bool lastFieldEndsWithNewLine;
    //bool checkNulls;
    //bool checkCurlies;
 };
@@ -63,13 +98,14 @@ public:
    virtual void Process()
    {
       bool quoted = false, status = true;
+      bool escaped = false;
       Array<String> values { };
       bool started = false;
       int start = 0, end = 0;
       int readCount = 0;
       Array<char> buffer { minAllocSize = 4096 };
 
-      //info.charNum = 0;
+      info.charNum = 0;
       info.lineNum = 0;
       info.rowNum = 0;
       info.fieldNum = 0;
@@ -94,11 +130,21 @@ public:
             char ch = buffer[c];
             if(quoted)
             {
-               if(ch == options.valueQuotes)
+               // For Git import...
+               bool inTextQuote = false;
+
+               if(options.lastFieldEndsWithNewLine && info.fieldNum == options.expectedFieldCount - 1 && ch == '\"' && info.charNum > 0)
+                  inTextQuote = true;
+
+               if(!inTextQuote && !escaped && ch == options.valueQuotes)
                {
                   quoted = false;
                   end = c;
                }
+               if(options.escaped && ch == '\\')
+                  escaped = true;
+               else
+                  escaped = false;
             }
             else
             {
@@ -116,8 +162,13 @@ public:
                   {
                      int len = started ? (end-start) : 0;
                      String value = new char[len+1];
-                     memcpy(value, &buffer[start], len);
-                     value[len] = 0;
+                     if(options.escaped)
+                        UnescapeString(value, &buffer[start], len);
+                     else
+                     {
+                        memcpy(value, &buffer[start], len);
+                        value[len] = 0;
+                     }
                      values.Add(value);
                   }
                   start = end = 0;
@@ -129,7 +180,6 @@ public:
                      info.rowNum++;
                      status = OnRowStrings(values);
                      values.Free();
-                     //info.charNum = 0;
                      info.fieldNum = 0;
                   }
                }
@@ -144,15 +194,24 @@ public:
                   end = c+1;
                }
             }
-            //info.charNum++;
+            if(ch == '\r' || ch == '\n')
+               info.charNum = 0;
+            else
+               info.charNum++;
          }
       }
       if(end > start)
       {
          int len = end-start;
+
          String value = new char[len+1];
-         memcpy(value, &buffer[start], len);
-         value[len] = 0;
+         if(options.escaped)
+            UnescapeString(value, &buffer[start], len);
+         else
+         {
+            memcpy(value, &buffer[start], len);
+            value[len] = 0;
+         }
          values.Add(value);
       }
       if(values.count && status)

diff --git a/extras/gui/genericEditor.ec b/extras/gui/genericEditor.ec
index a2dcc89..a67aa71 100644 (file)
--- a/extras/gui/genericEditor.ec
+++ b/extras/gui/genericEditor.ec
@@ -5,6 +5,7 @@ class GenericEditor : Window
    text = " ";
    tabCycle = true;
    size = { 800, 600 };
+   fullRender = true;
 
    Array<FieldDataBox> dataBoxes { };
    Array<Label> labels { };
@@ -37,13 +38,19 @@ class GenericEditor : Window
          {
             if(strcmpi(f.name, "ID"))
             {
-               FieldDataBox box { editor = editor, field = f, text = f.name, size = { 200, 20 }, position = { 20, y + 16} };
+               int h = 20;
+               FieldDataBox box { editor = editor, field = f, text = f.name, size = { h = h }, anchor = { left = 20, top = y + 16, right = 20 } };
                Label label { editor.editArea, position = { 20, y }, labeledWindow = box };
+               if(eClass_IsDerived(f.type, class(DataList)) || eClass_IsDerived(f.type, class(IdList)) || eClass_IsDerived(f.type, class(MultiLineString)))
+               {
+                  h = 70;
+                  box.size.h = h;
+               }
                incref box;
                incref label;
                dataBoxes.Add(box);
                labels.Add(label);
-               y += 40;
+               y += 20 + h;
             }
          }
       }