Changeset e57e582 in tol

Timestamp:

Sep 1, 2009, 8:42:27 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

63537ac

Parents:

e8bbd63

Message:

Handling with static methods and members
Class names must be stored as FullName

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1298 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/OIS

Files:

• oiscreator.cpp (modified) (2 diffs)
• oisloader.cpp (modified) (6 diffs)

tol/OIS/oiscreator.cpp

@@ -420 +420 @@
     {
       char isMethod = mbr.isMethod_;
+      char isStatic = mbr.isStatic_;
       Ensure(WriteTree(mbr.branch_, stream));
       EWrite(mbr.declaration_     , stream);
       EWrite(mbr.definition_      , stream);
       EWrite(isMethod             , stream);
+      EWrite(isStatic             , stream);      
     }
   }
@@ -848 +850 @@
   if(hasClass)
   {
-    Ensure(Write(nb.Class()->Name(), object_));
+    Ensure(Write(nb.Class()->FullName(), object_));
   }
   return(true);

tol/OIS/oisloader.cpp

@@ -465 +465 @@
     {
       char isMethod;
+      char isStatic=0;
       mbr = new BMember;
       mbr->parent_ = &cls;
@@ -472 +473 @@
       ERead(mbr->definition_  , stream);
       ERead(isMethod          , stream);
+      if(control_.oisEngine_.oisVersion_>="02.10") 
+      {
+        ERead(isStatic        , stream);
+      }
       mbr->isMethod_ = isMethod!=0;
+      mbr->isStatic_ = isStatic!=0;
       mbr->isGood_ = true;
       mbr->BuildMethod();
+      mbr->BuildStatic();
     }
     else
@@ -792 +799 @@
       cls->PutName(name);
       BScanner::AddSymbol(new BTypeToken(name,BTypeToken::BCLASS));
+      BGrammar::AddObject(cls); 
       Ensure(Read(*cls,object_));
-      BGrammar::AddObject(cls); 
       return(readed_[found].PutObject(cls));
     }
@@ -1066 +1073 @@
           readed_[found].PutObject(unb);
           BNameBlock& x = unb->Contens(); 
+          x.Set().PutSubType(BSet::BSubType(sbt));
           x.Set().PutNameBlock(&x);
-          if(oldBuilding)
-          {
-            int oldLevel = oldBuilding->Level();
-            if(oldLevel == level-1)
-            { 
-              oldBuilding->Contens().AddElement(unb, true);
-            }
-          } 
-          x.Set().PutSubType(BSet::BSubType(sbt));
           x.PutName(fullName);
           if(control_.oisEngine_.oisVersion_>="02.07")
@@ -1095 +1094 @@
           }
           x.Set().PutStruct (str); 
+/* */
+          BSyntaxObject* mem=NULL; 
+          if(oldBuilding)
+          {
+            int oldLevel = oldBuilding->Level();
+            if(oldLevel == level-1)
+            { 
+              mem = oldBuilding->Contens().Member(unb->Name());
+              if(!mem)
+              {
+                oldBuilding->Contens().AddElement(unb, true);
+              }
+            }
+          } 
+/* */
           BSyntaxObject* r=NULL;
           x.Set().PrepareStore(s);
@@ -1106 +1120 @@
             { 
               return(NullError("BOisLoader::ReadNextObject: NULL element of set ")); 
-            } 
-            if(r) 
+            }
+            else 
             {
-              x.AddElement(r, true); 
+              mem = x.Member(r->Name());
+              if(!mem)
+              {
+                x.AddElement(r, true); 
+              }
             }
           }