Changeset b686a59 in tol

Timestamp:

Apr 21, 2010, 4:21:39 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7881d14d

Parents:

8609eec

Message:

Fixes #894

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

Location:

tol

Files:

• OIS/oiscreator.cpp (modified) (1 diff)
• bparser/par.cpp (modified) (1 diff)
• btol/set_type/setgrainc.cpp (modified) (2 diffs)
• btol/set_type/tol_bsetgra.h (modified) (3 diffs)

tol/OIS/oiscreator.cpp

@@ -565 +565 @@
   if(!system)
   {
-    BText path = GetStandardAbsolutePath(v->SourcePath());
-    if(path.HasName())
-    {
-      allSourcePath_.AddUniqueSorted(path,BTextOrderCriterium);
+    const BSourcePath* sp = v->GetSourcePath();
+    if(sp)
+    { 
+      allSourcePath_.AddUniqueSorted(
+        GetStandardAbsolutePath(sp->Name()),BTextOrderCriterium);
+      for(int emb=0; emb<sp->embeded_.Size(); emb++)
+      {
+        allSourcePath_.AddUniqueSorted(
+          GetStandardAbsolutePath(sp->embeded_[emb]),BTextOrderCriterium);
+      }    
     }
   }

tol/bparser/par.cpp

@@ -1085 +1085 @@
       if(embedded)
       { 
+        BText absPath = GetStandardAbsolutePath(path);
+        BSourcePath::AddEmbed(absPath);
         Std(I2("Embedded file ",
                "Ha sido incrustado el archivo ")+
-            GetAbsolutePath(path)+"\n"); 
+            absPath+"\n"); 
       }
       delete childParser;

tol/btol/set_type/setgrainc.cpp

@@ -132 +132 @@
    BSourcePath::BSourcePath(const BSetFromFile* set, const BText& path)
 //--------------------------------------------------------------------
-: BSyntaxObject(path), set_(set)
+: BSyntaxObject(path), set_(set), embeded_()
 {
   TRACE_MEMORY_SHOW(this,"BSourcePath::BSourcePath");
@@ -150 +150 @@
   assert(pos<0);
   statusTable_.AddSorted(this,StatusTableCmp);
+}
+
+//--------------------------------------------------------------------
+  void BSourcePath::AddEmbed(const BText& txt)
+//--------------------------------------------------------------------
+{
+  assert(current_);
+  ((BSourcePath*)current_)->embeded_.Add(txt);
 }
 

tol/btol/set_type/tol_bsetgra.h

@@ -179 +179 @@
   static const BSourcePath* current_;
   const BSetFromFile* set_;
-
   void PutSet(const BSetFromFile* set) { set_ = set; }
 
 public:
+  BArray<BText> embeded_;
   BSourcePath(const BSetFromFile* set, const BText& path);
  ~BSourcePath() {}
@@ -189 +189 @@
         BGrammar* Grammar () const { return(GraAnything()); }
   const BSetFromFile* Set() const { return(set_); }
-
+  
   void SetDestroyed();
   static int GetItemNumber() { return(statusTable_.Size()); } 
@@ -198 +198 @@
   static const BSourcePath*     Find(const BText& path);
   static bool IsAlive(const BSourcePath* sp);
+  static void AddEmbed(const BText& txt);
   DeclareClassNewDelete(BSourcePath);
 };