Changeset 754 for cpp/frams/param

Timestamp:

03/02/18 18:46:54 (7 years ago)

Author:

Maciej Komosinski

Message:

More strict rules for Param type descriptions and "unlimited range value" and "unlimited string length": "d 0 -1", "f 0 -1", "s 0 0", "s 1 0" (see formatspec.html)

File:

• cpp/frams/param/param.cpp (modified) (2 diffs)

cpp/frams/param/param.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -801 +801 @@
         {
         case 'd':
-        {paInt a, b, c; if (getMinMaxIntFromTypeDef(t, a, b, c) == 1) return false; }
+        {
+                paInt a, b, c;
+                int have = getMinMaxIntFromTypeDef(t, a, b, c);
+                if (have == 1) return false;
+                if ((have >= 2) && (b < a) && (a != 0) && (b != -1)) return false; // max<min meaning 'undefined' is only allowed as "d 0 -1"
+        }
                 break;
         case 'f':
-        {double a, b, c; if (getMinMaxDoubleFromTypeDef(t, a, b, c) == 1) return false; }
+        {
+                double a, b, c;
+                int have = getMinMaxDoubleFromTypeDef(t, a, b, c);
+                if (have == 1) return false;
+                if ((have >= 2) && (b < a) && (a != 0) && (b != -1)) return false; // max<min meaning 'undefined' is only allowed as "f 0 -1"
+        }
+                break;
+        case 's':
+        {
+                int a, b; SString c;
+                int have = getMinMaxStringFromTypeDef(t, a, b, c);
+                //if (have == 1) return false; //not sure?
+                if ((have >= 1) && (!((a == 0) || (a == 1)))) return false; // 'min' for string (single/multi) can be only 0 or 1
+                if ((have >= 2) && (b < 0)) return false; // max=0 means unlimited, max<0 is not allowed
+        }
                 break;
         }