Changeset 333 for cpp/frams/param

Timestamp:

03/01/15 01:19:56 (9 years ago)

Author:

Maciej Komosinski

Message:

• use source/code mapping for line number and file information in vm error messages
• enum ExtValue::CompareResult? instead of int

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (4 diffs)
• multiparamload.h (modified) (1 diff)
• param.cpp (modified) (11 diffs)
• param.h (modified) (2 diffs)
• paramobj.h (modified) (2 diffs)

cpp/frams/param/multiparamload.cpp

@@ -21 +21 @@
 aborting=false;
 emptyparam.setParamTab(empty_paramtab);
+linenum=0;
 }
 
@@ -99 +100 @@
                 Param tmp_param;
                 ParamInterface *pi=lastobject.getParamInterface(tmp_param);
-                pi->load(file,true,&aborting);
+                pi->load(file,true,&aborting,&linenum);
                 if ((status!=Finished) && maybeBreak(AfterObject))
                         break;
@@ -120 +121 @@
                         continue;
                 }
+        linenum++;
         if (buf[0]=='#')
                 {
@@ -245 +247 @@
 Param tmp_param;
 ParamInterface *pi=o.getParamInterface(tmp_param);
-pi->load(file,warn_unknown_fields,&aborting);
+pi->load(file,warn_unknown_fields,&aborting,&linenum);
 status=AfterObject;
 return 0;

cpp/frams/param/multiparamload.h

@@ -46 +46 @@
 Param emptyparam;
 bool aborting;
+int linenum;
 
 void init();

cpp/frams/param/param.cpp

@@ -37 +37 @@
 static const char *strchrlimit(const char *t, int ch, const char *limit)
 {
-        if (limit<t) return NULL;
-        return (const char*)memchr((const void*)t,ch,limit-t);
+        if (limit < t) return NULL;
+        return (const char*)memchr((const void*)t, ch, limit - t);
 }
 
@@ -392 +392 @@
 }
 
-int ParamInterface::load(VirtFILE* f, bool warn_unknown_fields, bool *abortable)
+int ParamInterface::load(VirtFILE* f, bool warn_unknown_fields, bool *abortable, int *linenum)
 {
         SString buf;
@@ -402 +402 @@
         while (((!abortable) || (!*abortable)) && loadSStringLine(f, buf))
         {
+                if (linenum) (*linenum)++;
                 const char* t = (const char*)buf;
                 p0 = t; while ((*p0 == ' ') || (*p0 == '\t')) p0++;
@@ -417 +418 @@
                                         SString s;
                                         czytdotyldy(f, s);
+                                        int lfcount = 1;
+                                        const char* tmp = s;
+                                        while (tmp)
+                                                if ((tmp = strchr(tmp, '\n')))
+                                                {
+                                                lfcount++; tmp++;
+                                                }
                                         removeCR(s);
                                         int ch; while ((ch = fgetc(f)) != EOF) if (ch == '\n') break;
                                         unquoteTilde(s);
+                                        if (linenum && (flags(i)&PARAM_LINECOMMENT))
+                                                s = SString::sprintf("@line %d\n", *linenum + 1) + s;
                                         set(i, (const char*)s);
+                                        if (linenum)
+                                                (*linenum) += lfcount;
                                 }
                                 else
@@ -440 +452 @@
                         SString s;
                         czytdotyldy(f, s);
+                        if (linenum)
+                        {
+                                const char* tmp = s;
+                                int lfcount = 1;
+                                while (tmp)
+                                        if ((tmp = strchr(tmp, '\n')))
+                                        {
+                                        lfcount++; tmp++;
+                                        }
+                                (*linenum) += lfcount;
+                        }
                         int ch; while ((ch = fgetc(f)) != EOF) if (ch == '\n') break;
                 }
@@ -453 +476 @@
 switch (*(t=type(i)))
 {
-        case 'd':
-        {
-                for (i=atol(get(i));i>=0;i--) if (t) t=strchr(t+1,'~');
-                if (t)
-                {
-                        t++;
-                        char *t2=strchr(t,'~');
-                        if (!t2) t2=t+strlen(t);
-                        SString str;
-                        strncpy(str.directWrite(t2-t),t,t2-t);
-                        str.endWrite(t2-t);
-                        return str;
-                }
-        }
+case 'd':
+{
+for (i=atol(get(i));i>=0;i--) if (t) t=strchr(t+1,'~');
+if (t)
+{
+t++;
+char *t2=strchr(t,'~');
+if (!t2) t2=t+strlen(t);
+SString str;
+strncpy(str.directWrite(t2-t),t,t2-t);
+str.endWrite(t2-t);
+return str;
+}
+}
 }
 return get(i);
@@ -502 +525 @@
 {
         paInt value;
-        if (!ExtValue::parseInt(str,value,false,true))
+        if (!ExtValue::parseInt(str, value, false, true))
         {
                 paInt mn, mx, def;
@@ -517 +540 @@
 {
         double value;
-        if (!ExtValue::parseDouble(str,value,true))
+        if (!ExtValue::parseDouble(str, value, true))
         {
                 double mn, mx, def;
@@ -538 +561 @@
                 {
                         if (v.type == TObj)
+                        {
                                 FMprintf("ParamInterface", "set", FMLV_WARN, "Getting integer value from object reference (%s)", (const char*)v.getString());
-                        return setInt(i, (const char*)v.getString());
+                                return 0;
+                        }
+                        else
+                                return setInt(i, (const char*)v.getString());
                 }
         case 'f':
@@ -546 +573 @@
                 {
                         if (v.type == TObj)
+                        {
                                 FMprintf("ParamInterface", "set", FMLV_WARN, "Getting floating point value from object reference (%s)", (const char*)v.getString());
-                        return setDouble(i, (const char*)v.getString());
+                                return 0;
+                        }
+                        else
+                                return setDouble(i, (const char*)v.getString());
                 }
         case 's': { SString t = v.getString(); return setString(i, t); }
@@ -995 +1026 @@
 
                 field_end = strchrlimit(t, ',', end); if (!field_end) field_end = end;
-                next_field=field_end;
+                next_field = field_end;
                 while ((field_end>t) && isblank(field_end[-1])) field_end--;
                 quote = strchrlimit(t, '\"', field_end);

cpp/frams/param/param.h

@@ -32 +32 @@
 #define PARAM_NOISOLATION 4096  //< don't use proxy object in master/slave interactions
 #define PARAM_DEPRECATED  8192  //< this member is deprecated
+#define PARAM_LINECOMMENT 16384 //< Param::load() adds "@line ..." comment when loading multiline (internal use)
 
 typedef int32_t paInt;
@@ -160 +161 @@
         int save(VirtFILE*, const char* altname = NULL, bool force = 0);
         int saveprop(VirtFILE*, int i, const char* p, bool force = 0);
-        int load(VirtFILE*,bool warn_unknown_fields=true,bool *abortable=NULL);///< @return the number of fields loaded
+        int load(VirtFILE*, bool warn_unknown_fields = true, bool *abortable = NULL, int *linenum = NULL);///< @return the number of fields loaded
         int load2(const SString &, int &);///< @return the number of fields loaded
 

cpp/frams/param/paramobj.h

@@ -15 +15 @@
         int numfields;
         Param par;
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4200) //Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array
+#endif
         ExtValue fields[0];
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
         ParamObject() { numfields = 0; }
         ~ParamObject();
@@ -21 +28 @@
         void* operator new(size_t s, int numfields){ return ::operator new(s + sizeof(ExtValue)*numfields); }
         void* operator new(size_t s){ return ::operator new(s); }
+        void operator delete(void* ptr, int numfields) { ::operator delete(ptr); }
+        void operator delete(void* ptr) { ::operator delete(ptr); }
         ParamObject *clone();
         static void p_new(void* obj, ExtValue *args, ExtValue *ret);