Changeset 955 for cpp/frams/vm/classes/genoobj.cpp

Timestamp:

06/25/20 00:34:29 (4 years ago)

Author:

Maciej Komosinski

Message:

Genetic format ID becomes a string (no longer limited to a single character)

File:

• cpp/frams/vm/classes/genoobj.cpp (modified) (3 diffs)

cpp/frams/vm/classes/genoobj.cpp

@@ -86 +86 @@
 void GenoObj::get_format(ExtValue *ret)
 {
-        char format_as_string[2] = { getFormat(), 0 };
-        ret->setString(format_as_string);
+        ret->setString(getFormat());
 }
 
@@ -101 +100 @@
 }
 
-char GenoObj::formatFromExtValue(ExtValue& v)
+SString GenoObj::formatFromExtValue(ExtValue& v)
 {
         if (v.getType() == TInt)
-                return v.getInt();
+        {
+                char ch = v.getInt();
+                return SString(&ch,1);
+        }
         if (v.getType() == TString)
         {
-                SString s = v.getString();
-                if (s.len() == 1)
-                        return s.charAt(0);
+                return v.getString();
         }
         return Geno::INVALID_FORMAT;
@@ -198 +198 @@
                 SString n = vec->get(1) ? vec->get(1)->getString() : SString::empty();
                 SString c = vec->get(2) ? vec->get(2)->getString() : SString::empty();
-                *ret = makeDynamicObjectAndDecRef(new Geno(g, -1, n, c));
+                *ret = makeDynamicObjectAndDecRef(new Geno(g, Geno::UNKNOWN_FORMAT, n, c));
         }
         else