Changeset 904521e in tol

Timestamp:

Feb 24, 2012, 11:45:43 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

eb21277

Parents:

6eef720

Message:

Fixes #1448 in v3.2

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

Location:

tol

Files:

• btol/set_type/setgrainc.cpp (modified) (7 diffs)
• btol/set_type/tol_bsetgra.h (modified) (2 diffs)
• lang/language.cpp (modified) (1 diff)

tol/btol/set_type/setgrainc.cpp

@@ -67 +67 @@
 BList*      BSetFromFile::compiled_     = NIL;
 BInt          BSetFromFile::nSetFromFile_ = 0;
+BInt          BSetFromFile::nSetFromFileGlobal_ = 0;
+
 BTerminator BSetFromFile::terminator_   = NIL;
 
@@ -284 +286 @@
   if(BGrammar::Level()==0)
   {
+    nSetFromFileGlobal_++;
     compiled_ = Cons(this, compiled_);
     DecNRefs();
@@ -312 +315 @@
   if(BGrammar::Level()==0)
   {
+    nSetFromFileGlobal_++;
     compiled_ = Cons(this, compiled_);
     DecNRefs();
@@ -336 +340 @@
   if(Level()==0)
   {
+    nSetFromFileGlobal_--;
     IncNRefs();
     compiled_=LstRemoveAtom(compiled_,this);
@@ -1831 +1836 @@
     BText expression = BText("Include(\"")+path+"\")";
     BSetFromFile* set= (BSetFromFile*)(GraSet()->EvaluateExpr(expression));
-    
     return(set);
 }
@@ -1844 +1848 @@
   static BSyntaxObject* show_msg_included_so = NULL;
   static bool show_msg_included = true;
+  int nErr0 = (int)TOLErrorNumber().Value();
   if(!show_msg_including_so)
   {
@@ -1931 +1936 @@
       Std(ok+I2(" file ", " el fichero ")+p+" ["+BDat((double)tm.MSec()/1000.0).Format("%.3lf")+" sec.]\n");
     }
+  }
+  int nErr1 = (int)TOLErrorNumber().Value();
+  BSetFromFile* sff = (BSetFromFile*)result;
+  if(sff && (!sff->Contens().Card()) && (nErr1>nErr0))
+  {
+    DESTROY(result);
   }
   return(result);

tol/btol/set_type/tol_bsetgra.h

@@ -215 +215 @@
   static BList*       compiled_;
   static BInt           nSetFromFile_;
+  static BInt           nSetFromFileGlobal_;
   BText  tolPath_;
 #if defined(_MSC_VER)
@@ -246 +247 @@
 
   static BInt NSetFromFile() { return(nSetFromFile_); }
+  static BInt NSetFromFileGlobal() { return(nSetFromFileGlobal_); }
+
   const BText& TolPath() const { return(tolPath_); }
   BBool     Open       ();

tol/lang/language.cpp

@@ -1333 +1333 @@
 //--------------------------------------------------------------------
 {
-    BText fileName = Text(Arg(1));
-    contens_ = fileName;
-    ofstream out;
-    if(fileName!="Std") { out.open(fileName.String()); }
-    WriteFileOrStd(fileName,out,(I2("Name~   Path~   Elements~",
-            "Nombre~ Camino~ Elementos~")+"\n"));
-    
-    for(BInt n=1; n<=BSetFromFile::NSetFromFile(); n++)
-    {
-  BSetFromFile* file = (BSetFromFile*)BSetFromFile::FindCompiled(n);
-  BSet& set = file->Contens();
-  WriteFileOrStd
+  BText fileName = Text(Arg(1));
+  contens_ = fileName;
+  ofstream out;
+  if(fileName!="Std") { out.open(fileName.String()); }
+  WriteFileOrStd(fileName,out,
+  (I2("Name~   Path~   Elements~",
+      "Nombre~ Camino~ Elementos~")+"\n"));
+  int size = BSetFromFile::NSetFromFileGlobal();
+  for(BInt n=1; n<=size; n++)
+  {
+    BSetFromFile* file = (BSetFromFile*)BSetFromFile::FindCompiled(n);
+    if(file)
+    {
+      BSet& set = file->Contens();
+      WriteFileOrStd
       (
-    fileName,out,
-    (
-        file->Identify() + "~" +
-        file->TolPath()      + "~" +
-        set.Card()   + "~" + "\n"
+        fileName,out,
+        (
+          file->Identify() + "~" +
+          file->TolPath()      + "~" +
+          set.Card()   + "~" + "\n"
         )
-    );
-    }
+      );
+    }
+  }
     
 //    if(fileName!="Std") { BSys::EditTable(fileName, BSTFILE); }
-    if(fileName!="Std") { out.close(); }
+  if(fileName!="Std") { out.close(); }
 }