Changeset cd77422 in tol

Timestamp:

Sep 11, 2009, 2:52:34 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

da6cdaa

Parents:

e5f84e4

Message:

All classes must be predeclared in OIS

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

File:

• tol/OIS/oisloader.cpp (modified) (6 diffs)

tol/OIS/oisloader.cpp

@@ -475 +475 @@
       if(control_.oisEngine_.oisVersion_>="02.10") 
       {
-        ERead(isStatic        , stream);
+        ERead(isStatic, stream);
       }
       mbr->isMethod_ = isMethod!=0;
@@ -796 +796 @@
     else if(mode==BCLASSMODE) 
     { 
-      BClass* cls = new BClass;
-      cls->PutName(name);
-      BScanner::AddSymbol(new BTypeToken(name,BTypeToken::BCLASS));
-      BGrammar::AddObject(cls); 
+      BClass* cls = BClass::PredeclareClass(name);
       Ensure(Read(*cls,object_));
       return(readed_[found].PutObject(cls));
@@ -1018 +1015 @@
             str = (BStruct*)r;
           }
+          if(control_.oisEngine_.oisVersion_>="02.11")
+          {
+            int classForwardDeclarations = 0;
+            ERead(classForwardDeclarations, set_);
+            for(n=1; n<=classForwardDeclarations; n++)
+            {
+              BText className;
+              ERead(className, set_);
+              BClass::PredeclareClass(className);
+            }
+          }
           BSyntaxObject* r=NULL;
           for(n=1; n<=s; n++)
@@ -1065 +1073 @@
 
           BUserNameBlock* oldBuilding = BNameBlock::Building();
+        //const BNameBlock* oldCurrent = BNameBlock::Current();
           BGrammar::IncLevel();
           int stackPos = BGrammar::StackSize();
           BUserNameBlock* unb = new BGraContensP<BNameBlock>(name, new BNameBlock);
           BNameBlock::SetBuilding(unb);
+        //BNameBlock::SetCurrent(&unb->Contens());
           unb->PutDescription(description);
           assert(GraNameBlock()->FindLocal(name)==unb);
@@ -1095 +1105 @@
           x.Set().PutStruct (str); 
 /* */
+          if(control_.oisEngine_.oisVersion_>="02.11")
+          {
+            int classForwardDeclarations = 0;
+            ERead(classForwardDeclarations, set_);
+            for(n=1; n<=classForwardDeclarations; n++)
+            {
+              BText className;
+              ERead(className, set_);
+              BClass::PredeclareClass(className);
+            }
+          }
           BSyntaxObject* mem=NULL; 
           if(oldBuilding)
@@ -1131 +1152 @@
           } 
           BNameBlock::SetBuilding(oldBuilding);
+        //BNameBlock::SetCurrent(oldCurrent);
           BGrammar::DestroyStackUntil(stackPos, unb);    
           BGrammar::DecLevel();