Changeset 1310 in Sophya for trunk/SophyaLib/BaseTools/mutyv.cc

Timestamp:

Nov 9, 2000, 4:39:19 PM (25 years ago)

Author:

ansari

Message:

Changement de codage du type ds MuTyV (en prevision d'introduction de
nouveaux types codes ds MuTyV + Modif ObjFIO<DVList> - Reza 9/11/2000

File:

• trunk/SophyaLib/BaseTools/mutyv.cc (modified) (7 diffs)

trunk/SophyaLib/BaseTools/mutyv.cc

@@ -38 +38 @@
 {
   typ = a.typ;  iv = a.iv;  dv = a.dv;  dv_im = a.dv_im; 
-  if (typ == 'S')  strv = new string(*(a.strv));
+  if (typ == MTVString)  strv = new string(*(a.strv));
   else strv = NULL;
 }
@@ -51 +51 @@
 MuTyV::MuTyV(char const* s)
 {
-  typ = 'S';
+  typ = MTVString;
   strv = new string(s);
   mutyv_decodestr(s, dv, dv_im);
@@ -60 +60 @@
 MuTyV::MuTyV(string const& s)
 {
-  typ = 'S';
+  typ = MTVString;
   strv = new string(s);
   mutyv_decodestr(s.c_str(), dv, dv_im);
@@ -70 +70 @@
 {
   typ = a.typ;  iv = a.iv;  dv = a.dv;  dv_im = a.dv_im; 
-  if (typ == 'S')  { 
+  if (typ == MTVString)  { 
     if (strv) *strv = *(a.strv);  
     else strv = new string(*(a.strv));
@@ -80 +80 @@
 char * MuTyV::operator= (char* s)
 {
-  typ = 'S';
+  typ = MTVString;
   if (strv) *strv = s;  
   else strv = new string(s);
@@ -91 +91 @@
 string & MuTyV::operator= (string& s)
 {
-  typ = 'S';
+  typ = MTVString;
   if (strv) *strv = s;  
   else strv = new string(s);
@@ -102 +102 @@
 MuTyV::operator string() const 
 {
-  if (typ == 'S')  return(*strv);
+  if (typ == MTVString)  return(*strv);
   else {
     char buff[96];
-    if (typ == 'I')  sprintf(buff,"%ld", (long)iv);
-    else if (typ == 'D') sprintf(buff,"%.20g", dv);
-    else if (typ == 'Z') sprintf(buff,"(%.20g , %.20g)", dv, dv_im);
+    if (typ == MTVInteger)  sprintf(buff,"%ld", (long)iv);
+    else if (typ == MTVFloat) sprintf(buff,"%.20g", dv);
+    else if (typ == MTVComplex) sprintf(buff,"(%.20g , %.20g)", dv, dv_im);
     else buff[0] = '\0';
     return(string(buff));